Support for .NET 5.0 (Preview 7)

Author: Michaël Catanzariti

.github/workflows/BuildAndTest.yml

@@ -19,7 +19,7 @@ on:
       - '*.*.*'        
 
 jobs:
-  build:
+  build_and_test:
 
     runs-on: ubuntu-16.04
 
@@ -35,12 +35,18 @@ jobs:
     - name: setup .net core 3.1.100
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.100
+        dotnet-version: 3.1.100        
+ 
+    - name: setup .net core 5.0.100-preview.7.20366.6
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.100-preview.7.20366.6
 
 # workaround for using multiple dotnet core installs
     - name: setup multiple sdks
       run: |
-        rsync -a ${DOTNET_ROOT/3.1.100/2.2.207}/* $DOTNET_ROOT/
+        rsync -a ${DOTNET_ROOT/5.0.100-preview.7.20366.6/2.2.207}/* $DOTNET_ROOT/
+        rsync -a ${DOTNET_ROOT/5.0.100-preview.7.20366.6/3.1.100}/* $DOTNET_ROOT/
         dotnet --info
     
     - name: build

.github/workflows/Deploy.yml

@@ -16,7 +16,7 @@ jobs:
     - name: setup
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.100
+        dotnet-version: 5.0.100-preview.6.20318.15
 
     - name: build
       run: dotnet pack -p:Version=${GITHUB_REF##*/} -p:FileVersion=${GITHUB_REF##*/} -p:AssemblyVersion=${GITHUB_REF##*/} -c Release src/Dahomey.Cbor

README.md

@@ -5,6 +5,12 @@ High-performance [CBOR](https://cbor.io/) serialization framework for .Net (C#)
 ![](https://github.com/dahomey-technologies/Dahomey.Cbor/workflows/Build%20and%20Test/badge.svg)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE.txt)
 
+## Supported .NET versions
+* .NET Standard 2.0
+* .NET Core 3.0
+* .NET Core 3.1
+* .NET 5.0 (preview 7)
+
 ## Features
 * Serialization/Deserialization from/to Streams, byte buffer
 * Object Model

src/Dahomey.Cbor.Tests/CborReaderTests.cs

@@ -2,6 +2,7 @@
 using Xunit;
 using System;
 using Dahomey.Cbor.Util;
+using System.Globalization;
 
 namespace Dahomey.Cbor.Tests
 {
@@ -151,14 +152,20 @@ public void ReadUInt64(string hexBuffer, ulong expectedValue, Type expectedExcep
         [InlineData("F90001", 5.960464477539063e-8f, null)]
         [InlineData("F90400", 0.00006103515625f, null)]
         [InlineData("F9C400", -4f, null)]
-        [InlineData("F97E00", float.NaN, null)]
         [InlineData("F97C00", float.PositiveInfinity, null)]
         [InlineData("F9FC00", float.NegativeInfinity, null)]
         public void ReadHalf(string hexBuffer, float expectedValue, Type expectedExceptionType)
         {
             Helper.TestRead(nameof(CborReader.ReadHalf), hexBuffer, (Half)expectedValue, expectedExceptionType);
         }
 
+        [Fact]
+        public void ReadNaNHalf()
+        {
+            Half actualValue = Helper.Read<Half>(nameof(CborReader.ReadHalf), "F97E00");
+            Assert.True(Half.IsNaN(actualValue));
+        }
+
         [Theory]
         // half
         [InlineData("F9E3D0", -1000f, null)]
@@ -225,7 +232,7 @@ public void ReadDecimal(string hexBuffer, decimal expectedValue, Type expectedEx
         [InlineData("FCFFFFFFFFFFFFFFFFFFFFFFFF00000000", "79228162514264337593543950335", null)]
         public void ReadDecimal2(string hexBuffer, string expectedValue, Type expectedExceptionType)
         {
-            if (!decimal.TryParse(expectedValue, out decimal decimalValue)) throw new InvalidCastException("Specified string cannot be cast to a decimal value");
+            if (!decimal.TryParse(expectedValue, NumberStyles.Any, CultureInfo.InvariantCulture, out decimal decimalValue)) throw new InvalidCastException("Specified string cannot be cast to a decimal value");
 
             Helper.TestRead(nameof(CborReader.ReadDecimal), hexBuffer, decimalValue, expectedExceptionType);
         }

src/Dahomey.Cbor.Tests/CborWriterTests.cs

@@ -2,6 +2,7 @@
 using Dahomey.Cbor.Util;
 using Xunit;
 using System;
+using System.Globalization;
 
 namespace Dahomey.Cbor.Tests
 {
@@ -221,7 +222,7 @@ public void WriteDecimal(string hexBuffer, decimal value, Type expectedException
         [InlineData("FCFFFFFFFFFFFFFFFFFFFFFFFF00000000", "79228162514264337593543950335", null)]
         public void WriteDecimal2(string hexBuffer, string value, Type expectedExceptionType)
         {
-            if (!decimal.TryParse(value, out decimal decimalValue)) throw new InvalidCastException("Specified string cannot be cast to a decimal value");
+            if (!decimal.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out decimal decimalValue)) throw new InvalidCastException("Specified string cannot be cast to a decimal value");
 
             Helper.TestWrite(nameof(CborWriter.WriteDecimal), decimalValue, hexBuffer, expectedExceptionType);
         }

src/Dahomey.Cbor.Tests/Dahomey.Cbor.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net5.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>