From e90311539d78e4bf9d90c6aeae9f40219b31a4ac Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Wed, 15 Nov 2023 19:40:18 +0100 Subject: [PATCH] update SDK to .NET 8 (#2462) * [build] Bump .NET SDK: 7.0.401->8.0.100 * Fix tests after migration to .NET 8 * [build] Force cake to use our .NET SDK * [build] Bump Cake.Frosting: 3.0.0->3.2.0 * [build] Fix PATH setting in build.ps1 --------- Co-authored-by: Andrey Akinshin --- .github/workflows/run-tests.yaml | 12 ++++-------- .../BenchmarkDotNet.Build.csproj | 4 ++-- build/BenchmarkDotNet.Build/BuildContext.cs | 3 +++ build/BenchmarkDotNet.Build/Program.cs | 2 +- .../BenchmarkDotNet.Build/Runners/BuildRunner.cs | 3 ++- .../Runners/UnitTestRunner.cs | 4 ++-- build/build.ps1 | 5 ++--- build/sdk/global.json | 2 +- .../BenchmarkDotNet.Samples.FSharp.fsproj | 2 +- .../BenchmarkDotNet.Samples.csproj | 2 +- ...tNet.IntegrationTests.ConfigPerAssembly.csproj | 2 +- ....IntegrationTests.DisabledOptimizations.csproj | 2 +- ...t.IntegrationTests.EnabledOptimizations.csproj | 2 +- ...BenchmarkDotNet.IntegrationTests.FSharp.fsproj | 2 +- ...nTests.ManualRunning.MultipleFrameworks.csproj | 2 +- ...rkDotNet.IntegrationTests.ManualRunning.csproj | 2 +- ...BenchmarkDotNet.IntegrationTests.Static.csproj | 2 +- ...markDotNet.IntegrationTests.VisualBasic.vbproj | 2 +- .../BenchmarkDotNet.IntegrationTests.csproj | 4 ++-- .../BuildTimeoutTests.cs | 6 +++--- .../DisassemblyDiagnoserTests.cs | 4 ++-- .../JitRuntimeValidationTest.cs | 2 +- .../LargeAddressAwareTest.cs | 2 +- .../MemoryDiagnoserTests.cs | 4 ++-- .../BenchmarkDotNet.IntegrationTests/MonoTests.cs | 15 +++++++++++---- .../MultipleRuntimesTest.cs | 2 +- .../BenchmarkDotNet.Tests.csproj | 2 +- tests/BenchmarkDotNet.Tests/ConfigParserTests.cs | 2 +- 28 files changed, 52 insertions(+), 46 deletions(-) diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index 4fef9edb83..8ca6aab6cb 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -20,12 +20,10 @@ jobs: - uses: actions/checkout@v3 - name: Run task 'build' shell: cmd - run: | - ./build.cmd build + run: ./build.cmd build - name: Run task 'in-tests-core' shell: cmd - run: | - ./build.cmd in-tests-core -e + run: ./build.cmd in-tests-core -e - name: Upload test results uses: actions/upload-artifact@v3 if: always() @@ -42,12 +40,10 @@ jobs: - uses: actions/checkout@v3 - name: Run task 'build' shell: cmd - run: | - ./build.cmd build + run: ./build.cmd build - name: Run task 'in-tests-full' shell: cmd - run: | - ./build.cmd in-tests-full -e + run: ./build.cmd in-tests-full -e - name: Upload test results uses: actions/upload-artifact@v3 if: always() diff --git a/build/BenchmarkDotNet.Build/BenchmarkDotNet.Build.csproj b/build/BenchmarkDotNet.Build/BenchmarkDotNet.Build.csproj index 6b8ecc7ffc..638b290e6f 100644 --- a/build/BenchmarkDotNet.Build/BenchmarkDotNet.Build.csproj +++ b/build/BenchmarkDotNet.Build/BenchmarkDotNet.Build.csproj @@ -1,12 +1,12 @@ Exe - net7.0 + net8.0 $(MSBuildProjectDirectory) enable - + diff --git a/build/BenchmarkDotNet.Build/BuildContext.cs b/build/BenchmarkDotNet.Build/BuildContext.cs index a13c77c5ed..0a165721e0 100644 --- a/build/BenchmarkDotNet.Build/BuildContext.cs +++ b/build/BenchmarkDotNet.Build/BuildContext.cs @@ -59,6 +59,9 @@ public BuildContext(ICakeContext context) BuildDirectory = RootDirectory.Combine("build"); ArtifactsDirectory = RootDirectory.Combine("artifacts"); + var toolFileName = context.IsRunningOnWindows() ? "dotnet.exe" : "dotnet"; + var toolFilePath = RootDirectory.Combine(".dotnet").CombineWithFilePath(toolFileName); + context.Tools.RegisterFile(toolFilePath); SolutionFile = RootDirectory.CombineWithFilePath("BenchmarkDotNet.sln"); diff --git a/build/BenchmarkDotNet.Build/Program.cs b/build/BenchmarkDotNet.Build/Program.cs index f099c38094..7e8e1d1d85 100644 --- a/build/BenchmarkDotNet.Build/Program.cs +++ b/build/BenchmarkDotNet.Build/Program.cs @@ -98,7 +98,7 @@ public class InTestsFullTask : FrostingTask, IHelpProvider public class InTestsCoreTask : FrostingTask, IHelpProvider { private const string Name = "in-tests-core"; - public override void Run(BuildContext context) => context.UnitTestRunner.RunInTests("net7.0"); + public override void Run(BuildContext context) => context.UnitTestRunner.RunInTests("net8.0"); public HelpInfo GetHelp() => new(); } diff --git a/build/BenchmarkDotNet.Build/Runners/BuildRunner.cs b/build/BenchmarkDotNet.Build/Runners/BuildRunner.cs index 01c490fce3..fb47b2711b 100644 --- a/build/BenchmarkDotNet.Build/Runners/BuildRunner.cs +++ b/build/BenchmarkDotNet.Build/Runners/BuildRunner.cs @@ -24,7 +24,8 @@ public void Restore() context.DotNetRestore(context.SolutionFile.FullPath, new DotNetRestoreSettings { - MSBuildSettings = context.MsBuildSettingsRestore + MSBuildSettings = context.MsBuildSettingsRestore, + Verbosity = DotNetVerbosity.Normal }); } diff --git a/build/BenchmarkDotNet.Build/Runners/UnitTestRunner.cs b/build/BenchmarkDotNet.Build/Runners/UnitTestRunner.cs index 48d5183e14..c759ff1f9f 100644 --- a/build/BenchmarkDotNet.Build/Runners/UnitTestRunner.cs +++ b/build/BenchmarkDotNet.Build/Runners/UnitTestRunner.cs @@ -63,8 +63,8 @@ private void RunTests(FilePath projectFile, string alias, string tfm) public void RunUnitTests() { var targetFrameworks = context.IsRunningOnWindows() - ? new[] { "net462", "net7.0" } - : new[] { "net7.0" }; + ? new[] { "net462", "net8.0" } + : new[] { "net8.0" }; foreach (var targetFramework in targetFrameworks) RunUnitTests(targetFramework); diff --git a/build/build.ps1 b/build/build.ps1 index 2f6d5a5d11..d4db557409 100755 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -58,11 +58,10 @@ if (!(Test-Path $InstallPath)) { $ScriptPath = Join-Path $InstallPath 'dotnet-install.ps1' (New-Object System.Net.WebClient).DownloadFile($DotNetInstallerUri, $ScriptPath); & $ScriptPath -JSonFile $GlobalJsonPath -InstallDir $InstallPath; - - Remove-PathVariable "$InstallPath" - $env:PATH = "$InstallPath;$env:PATH" } +Remove-PathVariable "$InstallPath" +$env:PATH = "$InstallPath;$env:PATH" $env:DOTNET_ROOT=$InstallPath ########################################################################### diff --git a/build/sdk/global.json b/build/sdk/global.json index c1e852daeb..2244195a20 100644 --- a/build/sdk/global.json +++ b/build/sdk/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.401", + "version": "8.0.100", "rollForward": "disable" } } diff --git a/samples/BenchmarkDotNet.Samples.FSharp/BenchmarkDotNet.Samples.FSharp.fsproj b/samples/BenchmarkDotNet.Samples.FSharp/BenchmarkDotNet.Samples.FSharp.fsproj index 55045658d8..6e5daa920a 100644 --- a/samples/BenchmarkDotNet.Samples.FSharp/BenchmarkDotNet.Samples.FSharp.fsproj +++ b/samples/BenchmarkDotNet.Samples.FSharp/BenchmarkDotNet.Samples.FSharp.fsproj @@ -5,7 +5,7 @@ Exe - net462;net7.0 + net462;net8.0 diff --git a/samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj b/samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj index 180148454a..4a937d0a39 100644 --- a/samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj +++ b/samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj @@ -2,7 +2,7 @@ BenchmarkDotNet.Samples - net7.0;net462 + net8.0;net462 true BenchmarkDotNet.Samples Exe diff --git a/tests/BenchmarkDotNet.IntegrationTests.ConfigPerAssembly/BenchmarkDotNet.IntegrationTests.ConfigPerAssembly.csproj b/tests/BenchmarkDotNet.IntegrationTests.ConfigPerAssembly/BenchmarkDotNet.IntegrationTests.ConfigPerAssembly.csproj index 70ca871259..22de37b003 100644 --- a/tests/BenchmarkDotNet.IntegrationTests.ConfigPerAssembly/BenchmarkDotNet.IntegrationTests.ConfigPerAssembly.csproj +++ b/tests/BenchmarkDotNet.IntegrationTests.ConfigPerAssembly/BenchmarkDotNet.IntegrationTests.ConfigPerAssembly.csproj @@ -2,7 +2,7 @@ BenchmarkDotNet.IntegrationTests.ConfigPerAssembly - net462;net7.0 + net462;net8.0 true BenchmarkDotNet.IntegrationTests.ConfigPerAssembly BenchmarkDotNet.IntegrationTests.ConfigPerAssembly diff --git a/tests/BenchmarkDotNet.IntegrationTests.DisabledOptimizations/BenchmarkDotNet.IntegrationTests.DisabledOptimizations.csproj b/tests/BenchmarkDotNet.IntegrationTests.DisabledOptimizations/BenchmarkDotNet.IntegrationTests.DisabledOptimizations.csproj index aad9d6ac33..90f0bc5da3 100644 --- a/tests/BenchmarkDotNet.IntegrationTests.DisabledOptimizations/BenchmarkDotNet.IntegrationTests.DisabledOptimizations.csproj +++ b/tests/BenchmarkDotNet.IntegrationTests.DisabledOptimizations/BenchmarkDotNet.IntegrationTests.DisabledOptimizations.csproj @@ -2,7 +2,7 @@ BenchmarkDotNet.IntegrationTests.DisabledOptimizations - net462;net7.0 + net462;net8.0 true BenchmarkDotNet.IntegrationTests.DisabledOptimizations BenchmarkDotNet.IntegrationTests.DisabledOptimizations diff --git a/tests/BenchmarkDotNet.IntegrationTests.EnabledOptimizations/BenchmarkDotNet.IntegrationTests.EnabledOptimizations.csproj b/tests/BenchmarkDotNet.IntegrationTests.EnabledOptimizations/BenchmarkDotNet.IntegrationTests.EnabledOptimizations.csproj index da7558c82e..adb7d810ab 100644 --- a/tests/BenchmarkDotNet.IntegrationTests.EnabledOptimizations/BenchmarkDotNet.IntegrationTests.EnabledOptimizations.csproj +++ b/tests/BenchmarkDotNet.IntegrationTests.EnabledOptimizations/BenchmarkDotNet.IntegrationTests.EnabledOptimizations.csproj @@ -2,7 +2,7 @@ BenchmarkDotNet.IntegrationTests.EnabledOptimizations - net462;net7.0 + net462;net8.0 true BenchmarkDotNet.IntegrationTests.EnabledOptimizations BenchmarkDotNet.IntegrationTests.EnabledOptimizations diff --git a/tests/BenchmarkDotNet.IntegrationTests.FSharp/BenchmarkDotNet.IntegrationTests.FSharp.fsproj b/tests/BenchmarkDotNet.IntegrationTests.FSharp/BenchmarkDotNet.IntegrationTests.FSharp.fsproj index 6feefadc37..f3a86d5579 100644 --- a/tests/BenchmarkDotNet.IntegrationTests.FSharp/BenchmarkDotNet.IntegrationTests.FSharp.fsproj +++ b/tests/BenchmarkDotNet.IntegrationTests.FSharp/BenchmarkDotNet.IntegrationTests.FSharp.fsproj @@ -5,7 +5,7 @@ - net462;net7.0 + net462;net8.0 false diff --git a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks.csproj b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks.csproj index c7baff4844..5b3af464c3 100644 --- a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks.csproj +++ b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks.csproj @@ -4,7 +4,7 @@ BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks false - net461;net48;netcoreapp2.0;net7.0 + net461;net48;netcoreapp2.0;net8.0 $(NoWarn);NU1903 true BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks diff --git a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj index 136d505b6f..3dfe232951 100755 --- a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj +++ b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj @@ -2,7 +2,7 @@ BenchmarkDotNet.IntegrationTests.ManualRunning - net462;net7.0 + net462;net8.0 true BenchmarkDotNet.IntegrationTests.ManualRunning BenchmarkDotNet.IntegrationTests.ManualRunning diff --git a/tests/BenchmarkDotNet.IntegrationTests.Static/BenchmarkDotNet.IntegrationTests.Static.csproj b/tests/BenchmarkDotNet.IntegrationTests.Static/BenchmarkDotNet.IntegrationTests.Static.csproj index 4a52743deb..74874c401b 100644 --- a/tests/BenchmarkDotNet.IntegrationTests.Static/BenchmarkDotNet.IntegrationTests.Static.csproj +++ b/tests/BenchmarkDotNet.IntegrationTests.Static/BenchmarkDotNet.IntegrationTests.Static.csproj @@ -2,7 +2,7 @@ BenchmarkDotNet.IntegrationTests.Static - net462;net7.0 + net462;net8.0 true BenchmarkDotNet.IntegrationTests.Static BenchmarkDotNet.IntegrationTests.Static diff --git a/tests/BenchmarkDotNet.IntegrationTests.VisualBasic/BenchmarkDotNet.IntegrationTests.VisualBasic.vbproj b/tests/BenchmarkDotNet.IntegrationTests.VisualBasic/BenchmarkDotNet.IntegrationTests.VisualBasic.vbproj index 973fbb08c2..0a456372e8 100644 --- a/tests/BenchmarkDotNet.IntegrationTests.VisualBasic/BenchmarkDotNet.IntegrationTests.VisualBasic.vbproj +++ b/tests/BenchmarkDotNet.IntegrationTests.VisualBasic/BenchmarkDotNet.IntegrationTests.VisualBasic.vbproj @@ -5,7 +5,7 @@ - net462;net7.0 + net462;net8.0 diff --git a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj index 378822308f..2eb9fb9df0 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj +++ b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj @@ -2,8 +2,8 @@ BenchmarkDotNet.IntegrationTests - net462;net7.0 - net7.0 + net462;net8.0 + net8.0 true BenchmarkDotNet.IntegrationTests BenchmarkDotNet.IntegrationTests diff --git a/tests/BenchmarkDotNet.IntegrationTests/BuildTimeoutTests.cs b/tests/BenchmarkDotNet.IntegrationTests/BuildTimeoutTests.cs index b495489d78..e672bcc906 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/BuildTimeoutTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/BuildTimeoutTests.cs @@ -29,10 +29,10 @@ public void WhenBuildTakesMoreTimeThanTheTimeoutTheBuildIsCancelled() var config = ManualConfig.CreateEmpty() .WithBuildTimeout(timeout) .AddJob(Job.Dry - .WithRuntime(NativeAotRuntime.Net70) + .WithRuntime(NativeAotRuntime.Net80) .WithToolchain(NativeAotToolchain.CreateBuilder() - .UseNuGet("7.0.0", "https://api.nuget.org/v3/index.json") - .TargetFrameworkMoniker("net7.0") + .UseNuGet("8.0.0", "https://api.nuget.org/v3/index.json") + .TargetFrameworkMoniker("net8.0") .ToToolchain())); var summary = CanExecute(config, fullValidation: false); diff --git a/tests/BenchmarkDotNet.IntegrationTests/DisassemblyDiagnoserTests.cs b/tests/BenchmarkDotNet.IntegrationTests/DisassemblyDiagnoserTests.cs index 49bd585709..bd2f6d48c2 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/DisassemblyDiagnoserTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/DisassemblyDiagnoserTests.cs @@ -34,11 +34,11 @@ public static IEnumerable GetAllJits() { if (RuntimeInformation.GetCurrentPlatform() is Platform.X86 or Platform.X64) { - yield return new object[] { Jit.RyuJit, Platform.X64, CoreRuntime.Core70 }; // .NET Core x64 + yield return new object[] { Jit.RyuJit, Platform.X64, CoreRuntime.Core80 }; // .NET Core x64 } else if (RuntimeInformation.GetCurrentPlatform() is Platform.Arm64 && RuntimeInformation.IsLinux()) { - yield return new object[] { Jit.RyuJit, Platform.Arm64, CoreRuntime.Core70 }; // .NET Core arm64 + yield return new object[] { Jit.RyuJit, Platform.Arm64, CoreRuntime.Core80 }; // .NET Core arm64 } } if (RuntimeInformation.IsMacOS()) diff --git a/tests/BenchmarkDotNet.IntegrationTests/JitRuntimeValidationTest.cs b/tests/BenchmarkDotNet.IntegrationTests/JitRuntimeValidationTest.cs index 9a4910034c..24c5fa6e50 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/JitRuntimeValidationTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/JitRuntimeValidationTest.cs @@ -51,7 +51,7 @@ public static IEnumerable CheckCore_Arguments() [MemberData(nameof(CheckCore_Arguments))] public void CheckCore(Jit jit, Platform platform, string errorMessage) { - Verify(CoreRuntime.Core70, jit, platform, errorMessage); + Verify(CoreRuntime.Core80, jit, platform, errorMessage); } private void Verify(Runtime runtime, Jit jit, Platform platform, string errorMessage) diff --git a/tests/BenchmarkDotNet.IntegrationTests/LargeAddressAwareTest.cs b/tests/BenchmarkDotNet.IntegrationTests/LargeAddressAwareTest.cs index 89ea7b5ba2..be88b193ac 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/LargeAddressAwareTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/LargeAddressAwareTest.cs @@ -47,7 +47,7 @@ public void BenchmarkCanAllocateMoreThan2Gb() .Any()); Assert.Contains(".NET Framework", summary.AllRuntimes); - Assert.Contains(".NET 7.0", summary.AllRuntimes); + Assert.Contains(".NET 8.0", summary.AllRuntimes); } } diff --git a/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs b/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs index c1f2c622c6..62992f07b8 100755 --- a/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs @@ -81,10 +81,10 @@ public void MemoryDiagnoserSupportsNativeAOT() .ToToolchain()); } - [FactEnvSpecific("We don't want to test MonoVM twice (for .NET Framework 4.6.2 and .NET 7.0)", EnvRequirement.DotNetCoreOnly)] + [FactEnvSpecific("We don't want to test MonoVM twice (for .NET Framework 4.6.2 and .NET 8.0)", EnvRequirement.DotNetCoreOnly)] public void MemoryDiagnoserSupportsModernMono() { - MemoryDiagnoserIsAccurate(MonoToolchain.Mono70); + MemoryDiagnoserIsAccurate(MonoToolchain.Mono80); } public class AllocatingGlobalSetupAndCleanup diff --git a/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs b/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs index 4313dfbec1..17309832ef 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs @@ -4,16 +4,23 @@ using BenchmarkDotNet.Environments; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Portability; +using BenchmarkDotNet.Tests.Loggers; using BenchmarkDotNet.Tests.XUnit; +using Xunit.Abstractions; namespace BenchmarkDotNet.IntegrationTests { public class MonoTests : BenchmarkTestExecutor { + public MonoTests(ITestOutputHelper output) : base(output) { } + [FactEnvSpecific("UseMonoRuntime option is available in .NET Core only starting from .NET 6", EnvRequirement.DotNetCoreOnly)] - public void Mono70IsSupported() + public void Mono80IsSupported() { - var config = ManualConfig.CreateEmpty().AddJob(Job.Dry.WithRuntime(MonoRuntime.Mono70)); + var logger = new OutputLogger(Output); + var config = ManualConfig.CreateEmpty() + .AddLogger(logger) + .AddJob(Job.Dry.WithRuntime(MonoRuntime.Mono80)); CanExecute(config); } @@ -27,11 +34,11 @@ public void Check() throw new Exception("This is not Mono runtime"); } - if (RuntimeInformation.GetCurrentRuntime() != MonoRuntime.Mono70) + if (RuntimeInformation.GetCurrentRuntime() != MonoRuntime.Mono80) { throw new Exception("Incorrect runtime detection"); } } } } -} +} \ No newline at end of file diff --git a/tests/BenchmarkDotNet.IntegrationTests/MultipleRuntimesTest.cs b/tests/BenchmarkDotNet.IntegrationTests/MultipleRuntimesTest.cs index 938a1e2011..a3e7a6b2fe 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/MultipleRuntimesTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/MultipleRuntimesTest.cs @@ -51,7 +51,7 @@ public void SingleBenchmarkCanBeExecutedForMultipleRuntimes() .Any()); Assert.Contains(".NET Framework", summary.AllRuntimes); - Assert.Contains(".NET 7.0", summary.AllRuntimes); + Assert.Contains(".NET 8.0", summary.AllRuntimes); } } diff --git a/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj b/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj index 5b7a5b9cdd..0f53d59d74 100755 --- a/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj +++ b/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj @@ -2,7 +2,7 @@ BenchmarkDotNet.Tests - net7.0;net462 + net8.0;net462 BenchmarkDotNet.Tests BenchmarkDotNet.Tests true diff --git a/tests/BenchmarkDotNet.Tests/ConfigParserTests.cs b/tests/BenchmarkDotNet.Tests/ConfigParserTests.cs index ec9b85021f..bd0f992c80 100644 --- a/tests/BenchmarkDotNet.Tests/ConfigParserTests.cs +++ b/tests/BenchmarkDotNet.Tests/ConfigParserTests.cs @@ -168,7 +168,7 @@ public void SpecifyingCoreRunWithFullFrameworkTargetsMostRecentTfm() [FactEnvSpecific("It's impossible to determine TFM for CoreRunToolchain if host process is not .NET (Core) process", EnvRequirement.DotNetCoreOnly)] public void SpecifyingCoreRunAndRuntimeCreatesTwoJobs() { - const string runtime = "net7.0"; + const string runtime = "net8.0"; var fakeDotnetCliPath = typeof(object).Assembly.Location; var fakeCoreRunPath = typeof(ConfigParserTests).Assembly.Location; var fakeRestorePackages = Path.GetTempPath();