Adds explicit testing for NET5 and removes NETCoreApp2.1 (#152)

* Adds explicit testing for NET5 * Removes explicit testing for .NET Core App 2.1
danielwertheim · Feb 19, 2021 · 9abb929 · 9abb929
1 parent ae3293d
commit 9abb929
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 11 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,31 @@
+# top-most EditorConfig file
+root = true
+
+# Baseline
+[*]
+charset = utf-8
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+max_line_length = 160
+
+[*.{yml,json}]
+indent_size = 2
+
+# Xml project files
+[*.{csproj}]
+indent_size = 2
+
+# Xml files (data, config, projects)
+[*.{xml,props,targets,config,csproj}]
+indent_size = 2
+
+# Shell scripts
+[*.sh]
+end_of_line = lf
+
+# C#
+[*.cs]
+charset = utf-8-bom
+dotnet_sort_system_directives_first = true
diff --git a/azure-templates/stage-build.yml b/azure-templates/stage-build.yml
@@ -22,20 +22,20 @@ stages:
         testRunTitle: 'UnitTests .Net4.5.2'
 
     - task: DotNetCoreCLI@2
-      displayName: 'UnitTests .NetCoreApp2.2'
+      displayName: 'UnitTests .NetCoreApp3.1'
       inputs:
         command: test
         projects: 'src/Tests/**/UnitTests.csproj'
-        arguments: '-c $(BuildConfiguration) -f netcoreapp2.1 --no-build'
-        testRunTitle: 'UnitTests .NetCoreApp2.1'
+        arguments: '-c $(BuildConfiguration) -f netcoreapp3.1 --no-build'
+        testRunTitle: 'UnitTests .NetCoreApp3.1'
 
     - task: DotNetCoreCLI@2
-      displayName: 'UnitTests .NetCoreApp3.0'
+      displayName: 'UnitTests .Net5'
       inputs:
         command: test
         projects: 'src/Tests/**/UnitTests.csproj'
-        arguments: '-c $(BuildConfiguration) -f netcoreapp3.1 --no-build'
-        testRunTitle: 'UnitTests .NetCoreApp3.1'
+        arguments: '-c $(BuildConfiguration) -f net5.0 --no-build'
+        testRunTitle: 'UnitTests .Net5'
 
     - task: DotNetCoreCLI@2
       displayName: 'Pack Nupkg'

diff --git a/src/tests/Benchmarks/Benchmarks.csproj b/src/tests/Benchmarks/Benchmarks.csproj
@@ -2,9 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
-    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/tests/UnitTests/UnitTestBase.cs b/src/tests/UnitTests/UnitTestBase.cs
@@ -14,7 +14,7 @@ private static void AssertThrowedAsExpected(ArgumentException ex, string expecte
                 expectedMessage = string.Format(expectedMessage, formattingArgs);
 
             ex.ParamName.Should().Be(ParamName);
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1 || NET5_0
             var x = $"{expectedMessage} (Parameter 'test')";
 #else
             var x = $"{expectedMessage}{Environment.NewLine}Parameter name: test";

diff --git a/src/tests/UnitTests/UnitTests.csproj b/src/tests/UnitTests/UnitTests.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>