the CI must run net6.0, not net5.0 tests (#1986)

adamsitnik · web-flow · commit 31de77dc6b9f · 2022-04-06T14:48:35.000+02:00
* the CI must run net6.0, not net5.0 tests

* fix Microsoft.NET.Test.Sdk reference (one, existing version for all test projects)

* fix the platform-specific API warning

* Task.FromResult(0) is cached in .NET 6 and does not report allocations ;)
diff --git a/build/Program.cs b/build/Program.cs
@@ -293,8 +293,8 @@ public override bool ShouldRun(BuildContext context)
     public override void Run(BuildContext context)
     {
         var targetFrameworks = context.IsRunningOnWindows()
-            ? new[] { "net461", "net5.0" }
-            : new[] { "net5.0" };
+            ? new[] { "net461", "net6.0" }
+            : new[] { "net6.0" };
 
         foreach (var targetFramework in targetFrameworks) 
             context.RunTests(context.UnitTestsProjectFile, "UnitTests", targetFramework);
@@ -327,7 +327,7 @@ public override bool ShouldRun(BuildContext context)
 
     public override void Run(BuildContext context)
     {
-        context.RunTests(context.IntegrationTestsProjectFile, "IntegrationTests", "net5.0");
+        context.RunTests(context.IntegrationTestsProjectFile, "IntegrationTests", "net6.0");
     }
 }
 
diff --git a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj
@@ -27,7 +27,7 @@
     <ProjectReference Include="..\..\src\BenchmarkDotNet.Diagnostics.Windows\BenchmarkDotNet.Diagnostics.Windows.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
   </ItemGroup>
diff --git a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj
@@ -30,7 +30,7 @@
     <ProjectReference Include="..\..\src\BenchmarkDotNet\BenchmarkDotNet.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
diff --git a/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs b/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs
@@ -57,7 +57,7 @@ public class AccurateAllocations
             [Benchmark] public byte[] EightBytesArray() => new byte[8];
             [Benchmark] public byte[] SixtyFourBytesArray() => new byte[64];
 
-            [Benchmark] public Task<int> AllocateTask() => Task.FromResult(default(int));
+            [Benchmark] public Task<int> AllocateTask() => Task.FromResult<int>(-12345);
         }
 
         [Theory, MemberData(nameof(GetToolchains))]
diff --git a/tests/BenchmarkDotNet.IntegrationTests/ProcessPropertiesTests.cs b/tests/BenchmarkDotNet.IntegrationTests/ProcessPropertiesTests.cs
@@ -54,9 +54,14 @@ public class CustomAffinity
         [Benchmark]
         public void Ensure()
         {
-            if (Process.GetCurrentProcess().ProcessorAffinity != Value)
+#if NET6_0_OR_GREATER
+            if (OperatingSystem.IsWindows())
+#endif
             {
-                throw new InvalidOperationException("Did not set custom affinity");
+                if (Process.GetCurrentProcess().ProcessorAffinity != Value)
+                {
+                    throw new InvalidOperationException("Did not set custom affinity");
+                }
             }
         }
     }
diff --git a/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj b/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Memory" Version="4.5.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="ApprovalTests" Version="3.1.0" />

Original file line number	Diff line number	Diff line change
`@@ -293,8 +293,8 @@ public override bool ShouldRun(BuildContext context)`
`293`	`293`	`public override void Run(BuildContext context)`
`294`	`294`	`{`
`295`	`295`	`var targetFrameworks = context.IsRunningOnWindows()`
`296`		`- ? new[] { "net461", "net5.0" }`
`297`		`- : new[] { "net5.0" };`
	`296`	`+ ? new[] { "net461", "net6.0" }`
	`297`	`+ : new[] { "net6.0" };`
`298`	`298`
`299`	`299`	`foreach (var targetFramework in targetFrameworks)`
`300`	`300`	`context.RunTests(context.UnitTestsProjectFile, "UnitTests", targetFramework);`
`@@ -327,7 +327,7 @@ public override bool ShouldRun(BuildContext context)`
`327`	`327`
`328`	`328`	`public override void Run(BuildContext context)`
`329`	`329`	`{`
`330`		`- context.RunTests(context.IntegrationTestsProjectFile, "IntegrationTests", "net5.0");`
	`330`	`+ context.RunTests(context.IntegrationTestsProjectFile, "IntegrationTests", "net6.0");`
`331`	`331`	`}`
`332`	`332`	`}`
`333`	`333`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public class AccurateAllocations`
`57`	`57`	`[Benchmark] public byte[] EightBytesArray() => new byte[8];`
`58`	`58`	`[Benchmark] public byte[] SixtyFourBytesArray() => new byte[64];`
`59`	`59`
`60`		`- [Benchmark] public Task<int> AllocateTask() => Task.FromResult(default(int));`
	`60`	`+ [Benchmark] public Task<int> AllocateTask() => Task.FromResult<int>(-12345);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`[Theory, MemberData(nameof(GetToolchains))]`
Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,14 @@ public class CustomAffinity`
`54`	`54`	`[Benchmark]`
`55`	`55`	`public void Ensure()`
`56`	`56`	`{`
`57`		`- if (Process.GetCurrentProcess().ProcessorAffinity != Value)`
	`57`	`+#if NET6_0_OR_GREATER`
	`58`	`+ if (OperatingSystem.IsWindows())`
	`59`	`+#endif`
`58`	`60`	`{`
`59`		`- throw new InvalidOperationException("Did not set custom affinity");`
	`61`	`+ if (Process.GetCurrentProcess().ProcessorAffinity != Value)`
	`62`	`+ {`
	`63`	`+ throw new InvalidOperationException("Did not set custom affinity");`
	`64`	`+ }`
`60`	`65`	`}`
`61`	`66`	`}`
`62`	`67`	`}`