Merge branch 'hotfix/v2.1.3'

Author: Tanner Blair

LVJSON Build Specification.vipb

@@ -1,7 +1,7 @@
-<VI_Package_Builder_Settings Version="2017" Created_Date="2017-08-08 12:01:46" Modified_Date="2018-05-07 16:39:20" Creator="tblair" Comments="" ID="afe0837301084e74b9825a69af5e41df">
+<VI_Package_Builder_Settings Version="2017" Created_Date="2017-08-08 12:01:46" Modified_Date="2018-05-11 10:56:06" Creator="tblair" Comments="" ID="487fa99944d9b8b618f01913d245ee0b">
   <Library_General_Settings>
     <Package_File_Name>NI_lib_LVJSON</Package_File_Name>
-    <Library_Version>2.1.2.71</Library_Version>
+    <Library_Version>2.1.3.73</Library_Version>
     <Auto_Increment_Version>false</Auto_Increment_Version>
     <Library_Source_Folder>Source</Library_Source_Folder>
     <Library_Output_Folder>Builds</Library_Output_Folder>
@@ -32,8 +32,7 @@
       <Copyright/>
       <Packager>NI Systems Engineering</Packager>
       <URL/>
-      <Release_Notes>2.1.2
-hotfix for assert in "get value"</Release_Notes>
+      <Release_Notes>hotfix for pretty string on empty objects and arrays</Release_Notes>
     </Description>
     <Destinations>
       <Toolkit_VIs>
@@ -326,7 +325,7 @@ hotfix for assert in "get value"</Release_Notes>
         <Path>Source\JSON Value\Helper Methods</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>BBAEFF1A6526D019578629AC046E1877</GUID>
+      <GUID>F8E5C42241236DDBA2E193082DEA2FC7</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -529,7 +528,7 @@ hotfix for assert in "get value"</Release_Notes>
         <Path>Source\JSON Value\Array\Get Array Values.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>3575C52FFDAC19BD47CF314884A2DE19</GUID>
+      <GUID>9D9770D801B497060A694FDB970A4872</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -606,7 +605,7 @@ hotfix for assert in "get value"</Release_Notes>
         <Path>Source\JSON Value\Object\Remove Value.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>4A5D1C59CED57EA3A5B774CE4CCD61BF</GUID>
+      <GUID>B7035122BB31594664B9AB83D5D2992D</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -683,7 +682,7 @@ hotfix for assert in "get value"</Release_Notes>
         <Path>Source\JSON Value\Helper Methods\To File.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>A82BEB16E0BA2361AE9723376E67044D</GUID>
+      <GUID>50B214AFF4ECCA54569616A6CF06804E</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -746,7 +745,7 @@ hotfix for assert in "get value"</Release_Notes>
         <Path>Source\JSON Value\By Pointer\Set(path).vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>C16FD0A6B97CEAF5726F30613BF3D9C6</GUID>
+      <GUID>3A8D9564C52401F4E025E618DAC6CC53</GUID>
     </Functions_Palette_Data>
   </Library_Palette_Definition>
 </VI_Package_Builder_Settings>

Source/JSON Parsing.aliases

@@ -1,5 +1,5 @@
 [My Computer]
-My Computer = "172.28.64.220"
+My Computer = "172.28.64.210"
 
 [RT PXI Target]
 RT PXI Target = "0.0.0.0"

Source/JSON Parsing.lvproj

@@ -21,8 +21,6 @@
 				<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
 				<Item Name="LVNumericRepresentation.ctl" Type="VI" URL="/&lt;vilib&gt;/numeric/LVNumericRepresentation.ctl"/>
 			</Item>
-			<Item Name="Cast To Variant (Array).vi" Type="VI" URL="../JSON Value/Variant Support/Cast To Variant/Cast To Variant (Array).vi"/>
-			<Item Name="Cast To Variant (Object).vi" Type="VI" URL="../JSON Value/Variant Support/Cast To Variant/Cast To Variant (Object).vi"/>
 		</Item>
 		<Item Name="Build Specifications" Type="Build"/>
 	</Item>

Source/JSON Value/Variant Support/Create From Variant/Create From Variant (Null).vi

@@ -4,6 +4,18 @@
 	<Property Name="NI.Lib.SourceVersion" Type="Int">369131520</Property>
 	<Property Name="NI.Lib.Version" Type="Str">1.0.0.0</Property>
 	<Property Name="NI.LV.All.SourceOnly" Type="Bool">false</Property>
+	<Item Name="Cast To Variant" Type="Folder">
+		<Item Name="Cast To Variant (Array).vi" Type="VI" URL="../Cast To Variant/Cast To Variant (Array).vi"/>
+		<Item Name="Cast To Variant (Object).vi" Type="VI" URL="../Cast To Variant/Cast To Variant (Object).vi"/>
+	</Item>
+	<Item Name="Create From Variant" Type="Folder">
+		<Item Name="Create From Variant (Array).vi" Type="VI" URL="../Create From Variant/Create From Variant (Array).vi"/>
+		<Item Name="Create From Variant (Boolean).vi" Type="VI" URL="../Create From Variant/Create From Variant (Boolean).vi"/>
+		<Item Name="Create From Variant (Null).vi" Type="VI" URL="../Create From Variant/Create From Variant (Null).vi"/>
+		<Item Name="Create From Variant (Numeric).vi" Type="VI" URL="../Create From Variant/Create From Variant (Numeric).vi"/>
+		<Item Name="Create From Variant (Object).vi" Type="VI" URL="../Create From Variant/Create From Variant (Object).vi"/>
+		<Item Name="Create From Variant (String).vi" Type="VI" URL="../Create From Variant/Create From Variant (String).vi"/>
+	</Item>
 	<Item Name="cluster to array.vi" Type="VI" URL="../cluster to array.vi"/>
 	<Item Name="From Variant.vi" Type="VI" URL="../From Variant.vi"/>
 	<Item Name="get all paths in variant.vi" Type="VI" URL="../get all paths in variant.vi"/>