Change tests to run recommended net472 or net6.0 TFMs

Author: mythz

tests/ServiceStack.Text.Tests/DictionaryTests.cs

@@ -250,7 +250,7 @@ public void Test_ServiceStack_Text_JsonSerializer_Array_Value_Deserializes_Corre
         }
 
         [Test]
-        public void deserizes_to_decimal_by_default()
+        public void Deserializes_to_decimal_by_default()
         {
             JsConfig.TryToParsePrimitiveTypeValues = true;
 
@@ -279,7 +279,7 @@ public NumericType(decimal min, decimal max, Type type)
         }
 
         [Test]
-        public void deserizes_signed_bytes_into_to_best_fit_numeric()
+        public void Deserializes_signed_bytes_into_to_best_fit_numeric()
         {
             JsConfig.TryToParsePrimitiveTypeValues = true;
             JsConfig.TryToParseNumericType = true;
@@ -292,16 +292,18 @@ public void deserizes_signed_bytes_into_to_best_fit_numeric()
             Assert.That(deserializedDict["max"], Is.EqualTo(sbyte.MaxValue));
         }
 
+#if NETFX
         [Test]
-        public void deserizes_floats_into_to_best_fit_floating_point()
+        public void Deserializes_floats_into_to_best_fit_floating_point()
         {
             JsConfig.TryToParsePrimitiveTypeValues = true;
             JsConfig.TryToParseNumericType = true;
             JsConfig.ParsePrimitiveFloatingPointTypes = ParseAsType.Single | ParseAsType.Double;
 
             float floatValue = 1.1f;
             //TODO find a number that doesn't suck which throws in float.Parse() but not double.Parse()
-            double doubleValue = double.MaxValue - Math.Pow(2, 1000);
+            double Offset = Math.Pow(2, 1000);
+            double doubleValue = double.MaxValue - Offset;
             var intValue = int.MaxValue;
             var longValue = long.MaxValue;
 
@@ -311,17 +313,17 @@ public void deserizes_floats_into_to_best_fit_floating_point()
             var toFloatValue = float.Parse(floatValue.ToString());
             Assert.AreEqual(toFloatValue, floatValue, 1);
             var toDoubleValue = double.Parse(doubleValue.ToString());
-            Assert.AreEqual(toDoubleValue, doubleValue, Math.Pow(2, 1000));
+            Assert.AreEqual(toDoubleValue, doubleValue, Offset);
 
             var json = "{{\"float\":{0},\"double\":{1},\"int\":{2},\"long\":{3}}}"
                 .Fmt(CultureInfo.InvariantCulture, floatValue, doubleValue, intValue, longValue);
             var map = JsonSerializer.DeserializeFromString<IDictionary<string, object>>(json);
 
             Assert.That(map["float"], Is.TypeOf<float>());
             Assert.That(map["float"], Is.EqualTo(floatValue));
-
+ 
             Assert.That(map["double"], Is.TypeOf<double>());
-            Assert.AreEqual((double)map["double"], doubleValue, Math.Pow(2, 1000));
+            Assert.AreEqual((double)map["double"], doubleValue, Offset);
 
             Assert.That(map["int"], Is.TypeOf<int>());
             Assert.That(map["int"], Is.EqualTo(intValue));
@@ -331,9 +333,10 @@ public void deserizes_floats_into_to_best_fit_floating_point()
 
             JsConfig.Reset();
         }
+#endif
 
         [Test]
-        public void deserizes_signed_types_into_to_best_fit_numeric()
+        public void Deserializes_signed_types_into_to_best_fit_numeric()
         {
             var unsignedTypes = new[]
                 {
@@ -365,7 +368,7 @@ public void deserizes_signed_types_into_to_best_fit_numeric()
         }
 
         [Test]
-        public void deserizes_unsigned_types_into_to_best_fit_numeric()
+        public void Deserializes_unsigned_types_into_to_best_fit_numeric()
         {
             var unsignedTypes = new[]
                 {

tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <DebugType>portable</DebugType>
     <AssemblyName>ServiceStack.Text.Tests</AssemblyName>
     <OutputType>Library</OutputType>
@@ -16,7 +16,7 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <DebugType Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'netcoreapp2.1'">Full</DebugType>
+    <DebugType Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'net6.0'">Full</DebugType>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\ServiceStack.Text\ServiceStack.Text.csproj" />
@@ -36,10 +36,10 @@
     <PackageReference Include="System.Memory" Version="4.5.4" />
     <PackageReference Include="ServiceStack" Version="5.*" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>$(DefineConstants);NET45</DefineConstants>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
+    <DefineConstants>$(DefineConstants);NETFX</DefineConstants>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
     <Reference Include="System.Configuration" />
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Tasks" />
@@ -49,10 +49,10 @@
     <Reference Include="System.Web.Extensions" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <ProjectReference Include="..\..\src\ServiceStack.Memory\ServiceStack.Memory.csproj" />
     <PackageReference Include="System.Collections.Specialized" Version="4.*" />
     <PackageReference Include="System.Collections.NonGeneric" Version="4.*" />