Version 4.4.1

peteroupc · Apr 27, 2021 · aa0fa7f · aa0fa7f
1 parent dbdc8da
commit aa0fa7f
Show file tree

Hide file tree

Showing 6 changed files with 407 additions and 383 deletions.
diff --git a/CBOR.nuspec b/CBOR.nuspec
@@ -1,10 +1,14 @@
 <package
-><metadata><version>4.4.0</version><id>PeterO.Cbor</id><requireLicenseAcceptance>false</requireLicenseAcceptance><releaseNotes>Version 4.4:
+><metadata><version>4.4.1</version><id>PeterO.Cbor</id><requireLicenseAcceptance>false</requireLicenseAcceptance><releaseNotes>Version 4.4.1:
+
+- Fix bugs when parsing JSON with the JSON option &apos;numberconversion=double&apos;
+
+Version 4.4:
 
 - Boolean constructors of PODOptions and CBOREncodeOptions were obsolete
 - Float64 option of CBOREncodeOptions for encoding floating-point values as 64-bit only
 - CBORDateConverter made public and expanded to enable conversion between various
   date/time formats and CBOR objects
 - Added CanFitInUInt64 and CanTruncatedIntFitInUInt64 methods
 - Bug fixes</releaseNotes><summary></summary><license type='expression'>CC0-1.0</license><projectUrl>https://github.com/peteroupc/CBOR</projectUrl><authors>Peter Occil</authors><description>A C# implementation of Concise Binary Object Representation (CBOR), a general-purpose binary data format defined in RFC 8949.</description><owners>Peter Occil</owners><title>CBOR (Concise Binary Object Representation)</title><tags>cbor data serialization binary json</tags><dependencies><group targetFramework='.NETStandard1.0'><dependency id='PeterO.URIUtility' version='1.0.0' /><dependency id='PeterO.Numbers' version='1.7.4' /></group><group targetFramework='.NETFramework2.0'><dependency id='PeterO.URIUtility' version='1.0.0' /><dependency id='PeterO.Numbers' version='1.7.4' /></group><group targetFramework='.NETFramework4.0'><dependency id='PeterO.URIUtility' version='1.0.0' /><dependency id='PeterO.Numbers' version='1.7.4' /></group></dependencies></metadata><files><file src='CBOR/bin/Release/netstandard1.0/CBOR.dll' target='/lib/netstandard1.0' /><file src='CBOR/bin/Release/netstandard1.0/CBOR.xml' target='/lib/netstandard1.0' /><file src='CBOR20/bin/Release/CBOR.dll' target='/lib/net20' /><file src='CBOR20/bin/Release/CBOR.xml' target='/lib/net20' /><file src='CBOR40/bin/Release/CBOR.dll' target='/lib/net40' /><file src='CBOR40/bin/Release/CBOR.xml' target='/lib/net40' /></files></package
->
+>
diff --git a/CBOR/PeterO/Cbor/CBORJson2.cs b/CBOR/PeterO/Cbor/CBORJson2.cs
@@ -337,7 +337,7 @@ private CBORObject NextJSONNegativeNumber(
             numberEndIndex - numberStartIndex,
             this.options);
         #if DEBUG
-        if (this.options.NumberConversion == JSONOptions.ConversionMode.Full&&
+        if (this.options.NumberConversion == JSONOptions.ConversionMode.Full &&
 (
   (EDecimal)obj.ToObject(
   typeof(EDecimal))).CompareToValue(EDecimal.FromString(this.bytes,
@@ -440,13 +440,8 @@ private CBORObject NextJSONNonnegativeNumber(int c, int[] nextChar) {
            numberStartIndex,
            numberEndIndex - numberStartIndex,
            this.options);
-        /*
-        DebugUtility.Log("ParseJSONNumber
-{0}->{1}",EDecimal.FromString(this.bytes,
-           numberStartIndex,
-           numberEndIndex - numberStartIndex), obj);
-        */ #if DEBUG
-        if (this.options.NumberConversion == JSONOptions.ConversionMode.Full&&
+        #if DEBUG
+        if (this.options.NumberConversion == JSONOptions.ConversionMode.Full &&
 (
   (EDecimal)obj.ToObject(
   typeof(EDecimal))).CompareToValue(EDecimal.FromString(this.bytes,

diff --git a/CBOR20/Properties/AssemblyInfo.cs b/CBOR20/Properties/AssemblyInfo.cs
@@ -1,8 +1,8 @@
 using System.Reflection;
 [assembly: System.CLSCompliant(true)]
-[assembly: AssemblyInformationalVersion("4.4.0")]
-[assembly: AssemblyVersion("4.4.0.0")]
-[assembly: AssemblyFileVersion("4.4.0.0")]
+[assembly: AssemblyInformationalVersion("4.4.1")]
+[assembly: AssemblyVersion("4.4.1.0")]
+[assembly: AssemblyFileVersion("4.4.1.0")]
 [assembly: AssemblyProduct("CBOR (Concise Binary Object Representati" +
 "on)")]
 [assembly: AssemblyTitle("CBOR (Concise Binary Object Representati" +

diff --git a/CBOR40/Properties/AssemblyInfo.cs b/CBOR40/Properties/AssemblyInfo.cs
@@ -1,8 +1,8 @@
 using System.Reflection;
 [assembly: System.CLSCompliant(true)]
-[assembly: AssemblyInformationalVersion("4.4.0")]
-[assembly: AssemblyVersion("4.4.0.0")]
-[assembly: AssemblyFileVersion("4.4.0.0")]
+[assembly: AssemblyInformationalVersion("4.4.1")]
+[assembly: AssemblyVersion("4.4.1.0")]
+[assembly: AssemblyFileVersion("4.4.1.0")]
 [assembly: AssemblyProduct("CBOR (Concise Binary Object Representati" +
 "on)")]
 [assembly: AssemblyTitle("CBOR (Concise Binary Object Representati" +