Skip to content

Commit 8b36785

Browse files
author
Tanner Blair
committed
Merge branch 'release/2.1.0.67'
2 parents 3dfb3e1 + c50dc4b commit 8b36785

22 files changed

+51
-134
lines changed

‎LVJSON Build Specification.vipb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<VI_Package_Builder_Settings Version="2017" Created_Date="2017-08-08 12:01:46" Modified_Date="2018-02-01 12:27:25" Creator="tblair" Comments="" ID="5dbff7d1cf29026f06d697b165f8b6d1">
1+
<VI_Package_Builder_Settings Version="2017" Created_Date="2017-08-08 12:01:46" Modified_Date="2018-02-01 18:05:44" Creator="tblair" Comments="" ID="aa89afed0b1a99d2996594660fad5b11">
22
<Library_General_Settings>
33
<Package_File_Name>NI_lib_LVJSON</Package_File_Name>
4-
<Library_Version>2.1.0.67</Library_Version>
4+
<Library_Version>2.1.0.68</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>Source</Library_Source_Folder>
77
<Library_Output_Folder>Builds</Library_Output_Folder>
@@ -326,7 +326,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
326326
<Path>Source\JSON Value\Helper Methods</Path>
327327
<VI_Title/>
328328
</Items_Data>
329-
<GUID>8B05EFBFF96CE411FA9351B3AF908990</GUID>
329+
<GUID>FFC68ECDAF9CCFB0BC3FC0815369DE80</GUID>
330330
</Functions_Palette_Data>
331331
<Functions_Palette_Data>
332332
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -529,7 +529,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
529529
<Path>Source\JSON Value\Array\Get Array Values.vi</Path>
530530
<VI_Title/>
531531
</Items_Data>
532-
<GUID>B32E7BBA33490A8F3BCEC101D0DC266A</GUID>
532+
<GUID>D97B0F793B83181F5C2DB9A8256F8459</GUID>
533533
</Functions_Palette_Data>
534534
<Functions_Palette_Data>
535535
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -606,7 +606,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
606606
<Path>Source\JSON Value\Object\Remove Value.vi</Path>
607607
<VI_Title/>
608608
</Items_Data>
609-
<GUID>1D46F078ABB309345816B65FF9485620</GUID>
609+
<GUID>B55AA9AAA371ED398A82C478BCAC9CFE</GUID>
610610
</Functions_Palette_Data>
611611
<Functions_Palette_Data>
612612
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -652,7 +652,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
652652
<Column>1</Column>
653653
</Position>
654654
<Icon>00000000</Icon>
655-
<Path>Source\JSON Value\Helper Methods\To Variant.vi</Path>
655+
<Path>Source\JSON Value\Variant Support\To Variant.vi</Path>
656656
<VI_Title/>
657657
</Items_Data>
658658
<Items_Data>
@@ -666,7 +666,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
666666
<Column>2</Column>
667667
</Position>
668668
<Icon>00000000</Icon>
669-
<Path>Source\JSON Value\Helper Methods\From Variant.vi</Path>
669+
<Path>Source\JSON Value\Variant Support\From Variant.vi</Path>
670670
<VI_Title/>
671671
</Items_Data>
672672
<Items_Data>
@@ -683,7 +683,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
683683
<Path>Source\JSON Value\Helper Methods\To File.vi</Path>
684684
<VI_Title/>
685685
</Items_Data>
686-
<GUID>B9C2C6D7F7EAD641319BA394B4F1A7F4</GUID>
686+
<GUID>E927C0E454C92F1ED4893027BF68CBB9</GUID>
687687
</Functions_Palette_Data>
688688
<Functions_Palette_Data>
689689
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -746,7 +746,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
746746
<Path>Source\JSON Value\By Pointer\Set(path).vi</Path>
747747
<VI_Title/>
748748
</Items_Data>
749-
<GUID>4B17EFDA0C9FAA7C51EBCEC14F4D5678</GUID>
749+
<GUID>7B5162AD2BFF38AA5C8DE3DACB5999B6</GUID>
750750
</Functions_Palette_Data>
751751
</Library_Palette_Definition>
752752
</VI_Package_Builder_Settings>

‎Source/JSON Parsing.lvproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
1313
<Property Name="specify.custom.address" Type="Bool">false</Property>
1414
<Item Name="JSON Value.lvclass" Type="LVClass" URL="../JSON Value/JSON Value.lvclass"/>
15+
<Item Name="JSFL Variant Support.lvlib" Type="Library" URL="../JSON Value/Variant Support/JSFL Variant Support.lvlib"/>
1516
<Item Name="Dependencies" Type="Dependencies">
1617
<Item Name="vi.lib" Type="Folder">
17-
<Item Name="NI_Data Type.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/Data Type/NI_Data Type.lvlib"/>
18-
<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
19-
<Item Name="LVNumericRepresentation.ctl" Type="VI" URL="/&lt;vilib&gt;/numeric/LVNumericRepresentation.ctl"/>
2018
<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
2119
<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
20+
<Item Name="NI_Data Type.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/Data Type/NI_Data Type.lvlib"/>
21+
<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
22+
<Item Name="LVNumericRepresentation.ctl" Type="VI" URL="/&lt;vilib&gt;/Numeric/LVNumericRepresentation.ctl"/>
2223
</Item>
2324
</Item>
2425
<Item Name="Build Specifications" Type="Build"/>

‎Source/JSON Value/Cast To Variant/Cast To Variant (Array).vi‎

-20.2 KB
Binary file not shown.

‎Source/JSON Value/Cast To Variant/Cast To Variant (Object).vi‎

-22 KB
Binary file not shown.

‎Source/JSON Value/Helper Methods/To Variant.vi‎

-42.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)