Merge branch 'release/v3.0.0+alpha'

Author: Tanner Blair

Docs/.gitignore .gitignoreDocs/.gitignore renamed to .gitignore

@@ -1,7 +1,7 @@
-<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">
+<VI_Package_Builder_Settings Version="2017" Created_Date="2017-08-08 12:01:46" Modified_Date="2018-05-16 11:59:14" Creator="tblair" Comments="" ID="70716760d342d564bde64d43382e2ba2">
   <Library_General_Settings>
     <Package_File_Name>NI_lib_LVJSON</Package_File_Name>
-    <Library_Version>2.1.3.73</Library_Version>
+    <Library_Version>3.0.0.70</Library_Version>
     <Auto_Increment_Version>false</Auto_Increment_Version>
     <Library_Source_Folder>Source</Library_Source_Folder>
     <Library_Output_Folder>Builds</Library_Output_Folder>
@@ -32,7 +32,8 @@
       <Copyright/>
       <Packager>NI Systems Engineering</Packager>
       <URL/>
-      <Release_Notes>hotfix for pretty string on empty objects and arrays</Release_Notes>
+      <Release_Notes>!!!BREAKING CHANGE!!!
+Revamped variant support. Untested at this point, upgrading is not recommended.</Release_Notes>
     </Description>
     <Destinations>
       <Toolkit_VIs>
@@ -115,7 +116,7 @@
         <Path>JSON Parsing.lvproj</Path>
       </Exclusions>
     </Source_Files>
-    <License_Agreement_Filepath>Docs\license.txt</License_Agreement_Filepath>
+    <License_Agreement_Filepath>license.txt</License_Agreement_Filepath>
     <Licensing_and_Activation>
       <License_LF_file_path/>
       <Licensed_library_file_path/>
@@ -325,7 +326,7 @@
         <Path>Source\JSON Value\Helper Methods</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>F8E5C42241236DDBA2E193082DEA2FC7</GUID>
+      <GUID>E784BEF2A78C47789D30473A75F43C3D</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -528,7 +529,7 @@
         <Path>Source\JSON Value\Array\Get Array Values.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>9D9770D801B497060A694FDB970A4872</GUID>
+      <GUID>6639092A1E6FB67601D2F47ACE33A8C5</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -605,7 +606,7 @@
         <Path>Source\JSON Value\Object\Remove Value.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>B7035122BB31594664B9AB83D5D2992D</GUID>
+      <GUID>CCB135A0DAB9832E98919B2988EC43B2</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -643,46 +644,46 @@
       <Items_Data>
         <Type>Item</Type>
         <Sub_Palette_Index>-1</Sub_Palette_Index>
-        <NameSub_Menu_Name>To Variant.vi</NameSub_Menu_Name>
+        <NameSub_Menu_Name>To File.vi</NameSub_Menu_Name>
         <Short_Name/>
         <is_Merge_VI>false</is_Merge_VI>
         <Position>
-          <Row>2</Row>
+          <Row>1</Row>
           <Column>1</Column>
         </Position>
         <Icon>00000000</Icon>
-        <Path>Source\JSON Value\Variant Support\To Variant.vi</Path>
+        <Path>Source\JSON Value\Helper Methods\To File.vi</Path>
         <VI_Title/>
       </Items_Data>
       <Items_Data>
         <Type>Item</Type>
         <Sub_Palette_Index>-1</Sub_Palette_Index>
-        <NameSub_Menu_Name>From Variant.vi</NameSub_Menu_Name>
+        <NameSub_Menu_Name>json to variant.vi</NameSub_Menu_Name>
         <Short_Name/>
         <is_Merge_VI>false</is_Merge_VI>
         <Position>
           <Row>2</Row>
-          <Column>2</Column>
+          <Column>1</Column>
         </Position>
         <Icon>00000000</Icon>
-        <Path>Source\JSON Value\Variant Support\From Variant.vi</Path>
+        <Path>Source\JSON Variant Support\json to variant.vi</Path>
         <VI_Title/>
       </Items_Data>
       <Items_Data>
         <Type>Item</Type>
         <Sub_Palette_Index>-1</Sub_Palette_Index>
-        <NameSub_Menu_Name>To File.vi</NameSub_Menu_Name>
+        <NameSub_Menu_Name>variant to json.vi</NameSub_Menu_Name>
         <Short_Name/>
         <is_Merge_VI>false</is_Merge_VI>
         <Position>
-          <Row>1</Row>
-          <Column>1</Column>
+          <Row>2</Row>
+          <Column>2</Column>
         </Position>
         <Icon>00000000</Icon>
-        <Path>Source\JSON Value\Helper Methods\To File.vi</Path>
+        <Path>Source\JSON Variant Support\variant to json.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>50B214AFF4ECCA54569616A6CF06804E</GUID>
+      <GUID>ED7940A2B5316A571F93996403840CBE</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -745,7 +746,7 @@
         <Path>Source\JSON Value\By Pointer\Set(path).vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>3A8D9564C52401F4E025E618DAC6CC53</GUID>
+      <GUID>314987ABC8AECD187AAF396B578A95AA</GUID>
     </Functions_Palette_Data>
   </Library_Palette_Definition>
 </VI_Package_Builder_Settings>

Docs/CODE_OF_CONDUCT.md

@@ -0,0 +1 @@
+# JSON-Support-for-LabVIEW

Docs/CONTRIBUTING.md

@@ -1,3 +1,11 @@
 [ProjectWindow_Data]
-ProjectExplorer.ClassicPosition[String] = "37,1313,642,1747"
+ProjectExplorer.ClassicPosition[String] = "209,979,815,1413"
+
+[AB_Cache_{160B96C6-FD29-4031-AEE5-0D464B27D3F3}]
+Cache_Path[Path] Line0001 = "/C/Users/Tanner Blair/AppData/Local/Temp/AB_Cache_"
+Cache_Path[Path] Line0002 = "{160B96C6-FD29-4031-AEE5-0D464B27D3F3}.txt"
+
+[AB_Cache_{01328221-D2AE-4C36-9791-776C11B1BB77}]
+Cache_Path[Path] Line0001 = "/C/Users/Tanner Blair/AppData/Local/Temp/AB_Cache_"
+Cache_Path[Path] Line0002 = "{01328221-D2AE-4C36-9791-776C11B1BB77}.txt"