Skip to content

Commit 723d7a6

Browse files
Merge branch 'release/1.2.1'
2 parents 3432f84 + 17b77a2 commit 723d7a6

6 files changed

Lines changed: 9 additions & 6 deletions

File tree

Serializer.lvproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
</Item>
1919
<Item Name="PlainText" Type="Folder">
2020
<Item Name="Test Serializer.Text.vi" Type="VI" URL="../_unittests/Serializer.Text/Test Serializer.Text.vi"/>
21+
<Item Name="Test Serializer.Text.issue5.vi" Type="VI" URL="../_unittests/Serializer.Text/Test Serializer.Text.issue5.vi"/>
22+
<Item Name="Test Serializer.Text.issue10.vi" Type="VI" URL="../_unittests/Serializer.Text/Test Serializer.Text.issue10.vi"/>
2123
</Item>
2224
<Item Name="PlainText.INI" Type="Folder">
2325
<Item Name="Test_Attribute.vi" Type="VI" URL="../_unittests/Serializer.Text.INI/Test_Attribute.vi"/>

Serializer.vipb

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<VI_Package_Builder_Settings Version="2018" Created_Date="2018-06-04 19:50:03" Modified_Date="2022-01-16 17:35:20" Creator="Francois Normandin" Comments="" ID="3bc88ce8930bd98109ae53b469b06b73">
1+
<VI_Package_Builder_Settings Version="2018" Created_Date="2018-06-04 19:50:03" Modified_Date="2022-01-19 20:52:50" Creator="Francois Normandin" Comments="" ID="38634f79a0bbc46bcd47861db99e925c">
22
<Library_General_Settings>
33
<Package_File_Name>LabVIEW_Open_Source_lib_Serializer</Package_File_Name>
4-
<Library_Version>1.2.0.16</Library_Version>
4+
<Library_Version>1.2.1.17</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>source</Library_Source_Folder>
77
<Library_Output_Folder>_built-packages</Library_Output_Folder>
@@ -47,7 +47,8 @@ Examples of other serializers could be Serializer.JSON, Serializer.XML, etc.</D
4747
<Release_Notes>[Fix #5] Unmarshalling of arrays and clusters with nested arrays now work for non-matching datatypes
4848
[Fix #7] Serializing decimal points to enforce dot notation even for non-US systems (similar to JSON convention)
4949
[Fix #8] Numerics of decimal types serialize with at least one decimal point after dot
50-
[Fix #9] PlainText Cluster and Arrays deserialize decimal numbers correctly with enforcement of non-system decimal notation on non-US systems</Release_Notes>
50+
[Fix #9] PlainText Cluster and Arrays deserialize decimal numbers correctly with enforcement of non-system decimal notation on non-US systems
51+
[Fix #10] PlainText Serializer now correctly unmarshalls deeply nested clusters/arrays that contain multiple ] or } characters</Release_Notes>
5152
</Description>
5253
<Destinations>
5354
<Toolkit_VIs>
@@ -338,7 +339,7 @@ Examples of other serializers could be Serializer.JSON, Serializer.XML, etc.</D
338339
<Path>source\Serializer.INI</Path>
339340
<VI_Title/>
340341
</Items_Data>
341-
<GUID>BCA7EEEA54D7E217525EC7A35C5F11EF</GUID>
342+
<GUID>CBAE8A2C33324F2649B8A2F70092C5D4</GUID>
342343
</Functions_Palette_Data>
343344
<Functions_Palette_Data>
344345
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -415,7 +416,7 @@ Examples of other serializers could be Serializer.JSON, Serializer.XML, etc.</D
415416
<Path>source\Serializer.INI\INIstringToVariant (Standard).vi</Path>
416417
<VI_Title/>
417418
</Items_Data>
418-
<GUID>C2448396752495A274240A20C9F8D817</GUID>
419+
<GUID>3AAD5AD8593E15AE41393C7A027B7A46</GUID>
419420
</Functions_Palette_Data>
420421
<Functions_Palette_Data>
421422
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -520,7 +521,7 @@ Examples of other serializers could be Serializer.JSON, Serializer.XML, etc.</D
520521
<Path>source\Serializer.PlainText\Escape String.vi</Path>
521522
<VI_Title/>
522523
</Items_Data>
523-
<GUID>74F47AE7E96D588EDF1F2A11297E8DBE</GUID>
524+
<GUID>50F0D6F40C69ACB81ACFCAEB490EBBDF</GUID>
524525
</Functions_Palette_Data>
525526
</Library_Palette_Definition>
526527
</VI_Package_Builder_Settings>
980 Bytes
Binary file not shown.
19.4 KB
Binary file not shown.
25.3 KB
Binary file not shown.
3.53 KB
Binary file not shown.

0 commit comments

Comments
 (0)