Upgrade specs and benchmarks to .NET 6.0 (#142)

* Update to .NET 6.0 Replace Obsolete BenchmarkDot APIs with preferred approaches. * Revert unnecessary upgrade The Ais.Net project itself does not benefit at all from being upgraded to .NET 6.0. It turns out that all the gains can be had simply by loading the existing library into a .NET 6.0 application. The existing library targetting .netstandard2.1 performs exactly as well as one targetting .NET 6.0 directly (even if we upgrade to the latest System.Io.Pipelines) so there's no need for us to do a new release. * Remove SourceLink from specs & benchmark We don't publish the spec or benchmark projects as a library so there's no reason for them to use sourcelink. * Add .NET 6.0 SDK to build * Remove .NET Core 2.1 support Looks like it won't build unless we do this. * I hate yaml * Attempt to fix broken build Co-authored-by: Howard van Rooijen <[email protected]>
ais-dotnet · Dec 7, 2021 · eabff1b · eabff1b
1 parent e5c10dc
commit eabff1b
Show file tree

Hide file tree

Showing 20 changed files with 47 additions and 9,973 deletions.
diff --git a/.gitignore b/.gitignore
@@ -336,4 +336,7 @@ ASALocalRun/
 coverage.cobertura.xml
 
 # VS Code config files
-/.vscode
+/.vscode
+
+# Generated SpecFlow files
+*.feature.cs
diff --git a/Solutions/Ais.Net.Benchmarks/Ais.Net.Benchmarks.csproj b/Solutions/Ais.Net.Benchmarks/Ais.Net.Benchmarks.csproj
@@ -1,9 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\Common.NetCore_3_1.proj" />
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+  <Import Project="..\Common.Net.proj" />
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+	<OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -14,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -25,4 +29,11 @@
     <Folder Include="TestData\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/Solutions/Ais.Net.Benchmarks/Program.cs b/Solutions/Ais.Net.Benchmarks/Program.cs
@@ -43,15 +43,15 @@ private static void Main(string[] args)
         {
             Job job = Job.Default;
             IConfig config = DefaultConfig.Instance
-                .With(MemoryDiagnoser.Default);
+                .AddDiagnoser(MemoryDiagnoser.Default);
 
             if (args.Length == 1 && args[0] == "inprocess")
             {
                 job = job
                         .WithMinWarmupCount(2)
                         .WithMaxWarmupCount(4)
-                        .With(InProcessEmitToolchain.Instance);
-                config = config.With(ConfigOptions.DisableOptimizationsValidator);
+                        .WithToolchain(InProcessEmitToolchain.Instance);
+                config = config.WithOptions(ConfigOptions.DisableOptimizationsValidator);
             }
             else
             {
@@ -65,11 +65,11 @@ private static void Main(string[] args)
                 if (args.Length > 1)
                 {
                     string version = args[1];
-                    job = job.With(new Argument[] { new MsBuildArgument($"/p:Version={version}") });
+                    job = job.WithArguments(new Argument[] { new MsBuildArgument($"/p:Version={version}") });
                 }
             }
 
-            config = config.With(job);
+            config = config.AddJob(job);
 
             BenchmarkRunner.Run<AisNetBenchmarks>(config);
         }

diff --git a/Solutions/Ais.Net.Specs/Ais.Net.Specs.csproj b/Solutions/Ais.Net.Specs/Ais.Net.Specs.csproj
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Common.NetCore_3_1.proj" />
   <PropertyGroup>
-    <IsPackable>false</IsPackable>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+  <Import Project="..\Common.Net.proj" />
+
+  <PropertyGroup>
+	<IsPackable>false</IsPackable>
     <!--
     Note: SA1633 and SA1649 are disabled because of a bug introduced by SpecFlow 3.1.
     If https://github.com/SpecFlowOSS/SpecFlow/pull/1790 is ever successfully merged, we should re-enable them.
@@ -11,7 +16,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Memory" Version="4.5.4" />
-    <PackageReference Include="Corvus.Testing.SpecFlow.NUnit" Version="1.4.5" />
+    <PackageReference Include="Corvus.Testing.SpecFlow.NUnit" Version="1.4.6" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Ais.Net\Ais.Net.csproj" />