diff --git a/.github/workflows/generate-coverage-report.yaml b/.github/workflows/generate-coverage-report.yaml index 02108ba1ce..9656efd86e 100644 --- a/.github/workflows/generate-coverage-report.yaml +++ b/.github/workflows/generate-coverage-report.yaml @@ -28,10 +28,10 @@ jobs: - uses: actions/checkout@v7 # Ensure DOTNET_ROOT environment variable set on macOS - - uses: actions/setup-dotnet@v5 + - uses: actions/setup-dotnet@v6 with: dotnet-version: | - 8.x + 10.x # Setup additional tools - name: Setup additional tools for Wasm/NativeAot tests @@ -49,13 +49,13 @@ jobs: - name: Collect Code Coverage run: | - dotnet coverage connect bdn_coverage "dotnet test tests/BenchmarkDotNet.Tests -c Release --no-build --framework net8.0" - dotnet coverage connect bdn_coverage "dotnet test tests/BenchmarkDotNet.Analyzers.Tests -c Release --no-build --framework net8.0" + dotnet coverage connect bdn_coverage "dotnet test tests/BenchmarkDotNet.Tests -c Release --no-build --framework net10.0" + dotnet coverage connect bdn_coverage "dotnet test tests/BenchmarkDotNet.Analyzers.Tests -c Release --no-build --framework net10.0" - name: Collect Code Coverage for BenchmarkDotNet.IntegrationTests if: ${{ github.event.inputs.skip_integration_tests == 'false'}} run: | - dotnet coverage connect bdn_coverage "dotnet test tests/BenchmarkDotNet.IntegrationTests -c Release --no-build --framework net8.0" + dotnet coverage connect bdn_coverage "dotnet test tests/BenchmarkDotNet.IntegrationTests -c Release --no-build --framework net10.0" - name: Shutdown dotnet-coverage server. run: dotnet coverage shutdown bdn_coverage --timeout 60000 diff --git a/.github/workflows/run-tests-selected.yaml b/.github/workflows/run-tests-selected.yaml index 98d746adc0..0e2f436810 100644 --- a/.github/workflows/run-tests-selected.yaml +++ b/.github/workflows/run-tests-selected.yaml @@ -32,10 +32,10 @@ on: description: Specify target framework required: true options: - - net8.0 + - net10.0 - net472 # Following target framework is used for `MultipleFrameworks` tests - - net10.0 + - net8.0 - net462 - net48 filter: diff --git a/build/BenchmarkDotNet.Build/Helpers/Utils.cs b/build/BenchmarkDotNet.Build/Helpers/Utils.cs index 55710e730a..51554413cc 100644 --- a/build/BenchmarkDotNet.Build/Helpers/Utils.cs +++ b/build/BenchmarkDotNet.Build/Helpers/Utils.cs @@ -67,19 +67,19 @@ public static string[] GetTargetFrameworks(BuildContext context) switch (jobName) { case "test-windows-core": - return ["net8.0"]; + return ["net10.0"]; case "test-windows-full": return ["net472"]; case "test-linux": case "test-macos": - return ["net8.0"]; + return ["net10.0"]; default: return context.IsRunningOnWindows() - ? ["net472", "net8.0"] - : ["net8.0"]; + ? ["net472", "net10.0"] + : ["net10.0"]; } } } \ No newline at end of file diff --git a/build/BenchmarkDotNet.Build/Program.cs b/build/BenchmarkDotNet.Build/Program.cs index 1028b34fc4..fdf9c11d44 100644 --- a/build/BenchmarkDotNet.Build/Program.cs +++ b/build/BenchmarkDotNet.Build/Program.cs @@ -85,7 +85,7 @@ public class InstallWasmToolsWorkload : FrostingTask, IHelpProvide public override void Run(BuildContext context) { - context.BuildRunner.InstallWorkload("wasm-tools-net8"); + context.BuildRunner.InstallWorkload("wasm-tools"); // It need to specify `wasm-tools-net10` when using newer version of .NET SDK. } public HelpInfo GetHelp() @@ -164,7 +164,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("net8.0"); + public override void Run(BuildContext context) => context.UnitTestRunner.RunInTests("net10.0"); public HelpInfo GetHelp() => new(); } diff --git a/build/sdk/global.json b/build/sdk/global.json index a6dc747fe1..92a71249e5 100644 --- a/build/sdk/global.json +++ b/build/sdk/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.300", + "version": "10.0.302", "rollForward": "disable" } } diff --git a/samples/BenchmarkDotNet.Samples.FSharp/BenchmarkDotNet.Samples.FSharp.fsproj b/samples/BenchmarkDotNet.Samples.FSharp/BenchmarkDotNet.Samples.FSharp.fsproj index 89a7aa883c..eeee8b90f2 100644 --- a/samples/BenchmarkDotNet.Samples.FSharp/BenchmarkDotNet.Samples.FSharp.fsproj +++ b/samples/BenchmarkDotNet.Samples.FSharp/BenchmarkDotNet.Samples.FSharp.fsproj @@ -2,7 +2,7 @@ Exe - net472;net8.0 + net472;net10.0 false false diff --git a/samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj b/samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj index 11585d816f..64abc4e703 100644 --- a/samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj +++ b/samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj @@ -2,7 +2,7 @@ BenchmarkDotNet.Samples - net8.0;net472 + net10.0;net472 true BenchmarkDotNet.Samples Exe diff --git a/samples/BenchmarkDotNet.Samples/IntroWasm.cs b/samples/BenchmarkDotNet.Samples/IntroWasm.cs index 7cc0445e26..81ac17bebd 100644 --- a/samples/BenchmarkDotNet.Samples/IntroWasm.cs +++ b/samples/BenchmarkDotNet.Samples/IntroWasm.cs @@ -12,7 +12,7 @@ namespace BenchmarkDotNet.Samples public class IntroWasmCmdConfig { // Example: - // --runtimes wasmnet8.0 + // --runtimes wasmnet10.0 // --cli /path/to/dotnet (optional) // --wasmEngine v8 (optional) // --wasmArgs "--expose_wasm" (optional) @@ -34,9 +34,9 @@ public static void Run() // Optional: set this to use a custom `dotnet` (for example, a local dotnet/runtime build). const string cliPath = ""; - WasmRuntime runtime = new WasmRuntime(msBuildMoniker: "net8.0", RuntimeMoniker.WasmNet80, "Wasm .net8.0", false, "v8"); + WasmRuntime runtime = new WasmRuntime(msBuildMoniker: "net10.0", RuntimeMoniker.WasmNet10_0, "Wasm .net10.0", false, "v8"); NetCoreAppSettings netCoreAppSettings = new NetCoreAppSettings( - targetFrameworkMoniker: "net8.0", runtimeFrameworkVersion: "", name: "Wasm", + targetFrameworkMoniker: "net10.0", runtimeFrameworkVersion: "", name: "Wasm", customDotNetCliPath: cliPath); var toolChain = WasmToolchain.From(netCoreAppSettings); diff --git a/src/BenchmarkDotNet/Toolchains/CoreRun/CoreRunToolchain.cs b/src/BenchmarkDotNet/Toolchains/CoreRun/CoreRunToolchain.cs index 9f8dc84556..c372051e02 100644 --- a/src/BenchmarkDotNet/Toolchains/CoreRun/CoreRunToolchain.cs +++ b/src/BenchmarkDotNet/Toolchains/CoreRun/CoreRunToolchain.cs @@ -12,12 +12,12 @@ public class CoreRunToolchain : IToolchain /// /// the path to CoreRun /// /should a copy of CoreRun be performed? True by default. The toolchain replaces old dependencies in CoreRun folder with newer versions if used by the benchmarks. - /// TFM, net8.0 is the default + /// TFM, net10.0 is the default /// path to dotnet cli, if not provided the one from PATH will be used /// display name, CoreRun is the default value /// the directory to restore packages to public CoreRunToolchain(FileInfo coreRun, bool createCopy = true, - string targetFrameworkMoniker = "net8.0", + string targetFrameworkMoniker = "net10.0", FileInfo? customDotNetCliPath = null, DirectoryInfo? restorePath = null, string displayName = "CoreRun") diff --git a/src/BenchmarkDotNet/Toolchains/CsProj/CsProjGenerator.cs b/src/BenchmarkDotNet/Toolchains/CsProj/CsProjGenerator.cs index 3401fd6556..9145e1134c 100644 --- a/src/BenchmarkDotNet/Toolchains/CsProj/CsProjGenerator.cs +++ b/src/BenchmarkDotNet/Toolchains/CsProj/CsProjGenerator.cs @@ -35,6 +35,7 @@ public class CsProjGenerator : DotNetCliGenerator, IEquatable "RuntimeHostConfigurationOption", "WarningsAsErrors", "Features", + "GarbageCollectionAdaptationMode" // TODO: Remove this setting after https://github.com/dotnet/runtime/pull/131069 issue is resolved, and backported to .NET 10. }.ToImmutableArray(); public string RuntimeFrameworkVersion { get; } diff --git a/src/BenchmarkDotNet/Toolchains/DotNetCli/CustomDotNetCliToolchainBuilder.cs b/src/BenchmarkDotNet/Toolchains/DotNetCli/CustomDotNetCliToolchainBuilder.cs index 7fb8b3fe32..a685f443c7 100644 --- a/src/BenchmarkDotNet/Toolchains/DotNetCli/CustomDotNetCliToolchainBuilder.cs +++ b/src/BenchmarkDotNet/Toolchains/DotNetCli/CustomDotNetCliToolchainBuilder.cs @@ -47,7 +47,7 @@ public CustomDotNetCliToolchainBuilder UseNuGetClearTag(bool value) return this; } - /// TFM, example: net8.0 + /// TFM, example: net10.0 [PublicAPI] [SuppressMessage("ReSharper", "ParameterHidesMember")] public CustomDotNetCliToolchainBuilder TargetFrameworkMoniker(string targetFrameworkMoniker) diff --git a/tests/BenchmarkDotNet.Analyzers.Tests/BenchmarkDotNet.Analyzers.Tests.csproj b/tests/BenchmarkDotNet.Analyzers.Tests/BenchmarkDotNet.Analyzers.Tests.csproj index 07c4b1ff7d..86e2e79393 100644 --- a/tests/BenchmarkDotNet.Analyzers.Tests/BenchmarkDotNet.Analyzers.Tests.csproj +++ b/tests/BenchmarkDotNet.Analyzers.Tests/BenchmarkDotNet.Analyzers.Tests.csproj @@ -2,7 +2,7 @@ BenchmarkDotNet.Analyzers.Tests - net472;net8.0;net10.0 + net472;net10.0 true true true diff --git a/tests/BenchmarkDotNet.Exporters.Plotting.Tests/BenchmarkDotNet.Exporters.Plotting.Tests.csproj b/tests/BenchmarkDotNet.Exporters.Plotting.Tests/BenchmarkDotNet.Exporters.Plotting.Tests.csproj index 0c8f1162a4..635f19b64c 100644 --- a/tests/BenchmarkDotNet.Exporters.Plotting.Tests/BenchmarkDotNet.Exporters.Plotting.Tests.csproj +++ b/tests/BenchmarkDotNet.Exporters.Plotting.Tests/BenchmarkDotNet.Exporters.Plotting.Tests.csproj @@ -1,7 +1,7 @@  - net8.0;net472 + net10.0;net472 true false diff --git a/tests/BenchmarkDotNet.IntegrationTests.ConfigPerAssembly/BenchmarkDotNet.IntegrationTests.ConfigPerAssembly.csproj b/tests/BenchmarkDotNet.IntegrationTests.ConfigPerAssembly/BenchmarkDotNet.IntegrationTests.ConfigPerAssembly.csproj index 5b849298b3..9f545920c8 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 - net472;net8.0 + net472;net10.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 fdb5400397..db67eae508 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 - net472;net8.0 + net472;net10.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 7bfa81d814..34d29b0fd8 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 - net472;net8.0 + net472;net10.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 44bf309a24..055142f3ef 100644 --- a/tests/BenchmarkDotNet.IntegrationTests.FSharp/BenchmarkDotNet.IntegrationTests.FSharp.fsproj +++ b/tests/BenchmarkDotNet.IntegrationTests.FSharp/BenchmarkDotNet.IntegrationTests.FSharp.fsproj @@ -1,7 +1,7 @@  - net472;net8.0 + net472;net10.0 false diff --git a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj index 6e08da9462..72dd42c0f4 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 - net472;net8.0 + net472;net10.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 268340278e..d14f6da131 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 - net472;net8.0 + net472;net10.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 65ac132061..7d0a424f92 100644 --- a/tests/BenchmarkDotNet.IntegrationTests.VisualBasic/BenchmarkDotNet.IntegrationTests.VisualBasic.vbproj +++ b/tests/BenchmarkDotNet.IntegrationTests.VisualBasic/BenchmarkDotNet.IntegrationTests.VisualBasic.vbproj @@ -1,7 +1,7 @@  - net472;net8.0 + net472;net10.0 diff --git a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj index b7bd6f919b..187c1aa7f9 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj +++ b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj @@ -2,8 +2,9 @@ BenchmarkDotNet.IntegrationTests - net472;net8.0 - net8.0 + + net472;net8.0;net10.0 + net8.0;net10.0 true BenchmarkDotNet.IntegrationTests BenchmarkDotNet.IntegrationTests @@ -13,6 +14,10 @@ true $(NoWarn);CA2007;CA1825 true + + + + 0 diff --git a/tests/BenchmarkDotNet.IntegrationTests/BuildTimeoutTests.cs b/tests/BenchmarkDotNet.IntegrationTests/BuildTimeoutTests.cs index 6fed6c5436..2df6240de8 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/BuildTimeoutTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/BuildTimeoutTests.cs @@ -27,10 +27,10 @@ public void WhenBuildTakesMoreTimeThanTheTimeoutTheBuildIsCancelled() var config = ManualConfig.CreateEmpty() .WithBuildTimeout(timeout) .AddJob(Job.Dry - .WithRuntime(NativeAotRuntime.Net80) + .WithRuntime(NativeAotRuntime.Net10_0) .WithToolchain(NativeAotToolchain.CreateBuilder() - .UseNuGet("8.0.0", "https://api.nuget.org/v3/index.json") - .TargetFrameworkMoniker("net8.0") + .UseNuGet("10.0.0", "https://api.nuget.org/v3/index.json") + .TargetFrameworkMoniker("net10.0") .ToToolchain())); var summary = CanExecute(config, fullValidation: false); diff --git a/tests/BenchmarkDotNet.IntegrationTests/CancellationTokenTests.cs b/tests/BenchmarkDotNet.IntegrationTests/CancellationTokenTests.cs index 37ebda336f..8e37f112dd 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/CancellationTokenTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/CancellationTokenTests.cs @@ -57,14 +57,14 @@ public void BenchmarkWithCancellationTokenProperty_ReceivesToken_InProcessEmit() [InlineData("node")] public void BenchmarkWithCancellationTokenProperty_ReceivesToken_Wasm(string javaScriptEngine) { - var dotnetVersion = "net8.0"; + var dotnetVersion = "net10.0"; var logger = new OutputLogger(Output); var netCoreAppSettings = new NetCoreAppSettings(dotnetVersion, runtimeFrameworkVersion: null!, "Wasm", aotCompilerMode: MonoAotCompilerMode.mini); var config = ManualConfig.CreateEmpty() .AddLogger(logger) .AddJob(Job.Dry - .WithRuntime(new WasmRuntime(dotnetVersion, RuntimeMoniker.WasmNet80, "wasm", false, javaScriptEngine)) + .WithRuntime(new WasmRuntime(dotnetVersion, RuntimeMoniker.WasmNet10_0, "wasm", false, javaScriptEngine)) .WithToolchain(WasmToolchain.From(netCoreAppSettings))) .WithBuildTimeout(TimeSpan.FromSeconds(240)) .WithOption(ConfigOptions.LogBuildOutput, true) @@ -123,14 +123,14 @@ public async Task RunWithCancellationTokenIsCancelled_Wasm(string javaScriptEngi var cts = new CancellationTokenSource(); var diagnoser = new CancelAfterFirstIterationDiagnoser(cts); - var dotnetVersion = "net8.0"; + var dotnetVersion = "net10.0"; var logger = new OutputLogger(Output); var netCoreAppSettings = new NetCoreAppSettings(dotnetVersion, runtimeFrameworkVersion: null!, "Wasm", aotCompilerMode: MonoAotCompilerMode.mini); var config = ManualConfig.CreateEmpty() .AddLogger(logger) .AddJob(Job.Dry - .WithRuntime(new WasmRuntime(dotnetVersion, RuntimeMoniker.WasmNet80, "wasm", false, javaScriptEngine)) + .WithRuntime(new WasmRuntime(dotnetVersion, RuntimeMoniker.WasmNet10_0, "wasm", false, javaScriptEngine)) .WithToolchain(WasmToolchain.From(netCoreAppSettings))) .AddDiagnoser(diagnoser) .WithBuildTimeout(TimeSpan.FromSeconds(240)) diff --git a/tests/BenchmarkDotNet.IntegrationTests/DisassemblyDiagnoserTests.cs b/tests/BenchmarkDotNet.IntegrationTests/DisassemblyDiagnoserTests.cs index f7ccb204aa..26720c6c41 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/DisassemblyDiagnoserTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/DisassemblyDiagnoserTests.cs @@ -41,12 +41,12 @@ public static IEnumerable GetAllJits() // See: https://github.com/dotnet/BenchmarkDotNet/issues/3086 if (RuntimeInformation.GetCurrentPlatform() is Platform.X86 or Platform.X64 && !OsDetector.IsMacOS()) { - yield return [Jit.RyuJit, Platform.X64, CsProjCoreToolchain.NetCoreApp80]; // .NET Core x64 + yield return [Jit.RyuJit, Platform.X64, CsProjCoreToolchain.NetCoreApp10_0]; // .NET Core x64 // We could add Platform.X86 here, but it would make our CI more complicated. } else if (RuntimeInformation.GetCurrentPlatform() is Platform.Arm64) { - yield return [Jit.RyuJit, Platform.Arm64, CsProjCoreToolchain.NetCoreApp80]; // .NET Core arm64 + yield return [Jit.RyuJit, Platform.Arm64, CsProjCoreToolchain.NetCoreApp10_0]; // .NET Core arm64 } } diff --git a/tests/BenchmarkDotNet.IntegrationTests/JitRuntimeValidationTest.cs b/tests/BenchmarkDotNet.IntegrationTests/JitRuntimeValidationTest.cs index 3c6244a65d..212b73076d 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/JitRuntimeValidationTest.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/JitRuntimeValidationTest.cs @@ -48,7 +48,7 @@ public static IEnumerable CheckCore_Arguments() [MemberData(nameof(CheckCore_Arguments))] public void CheckCore(Jit jit, Platform platform, string errorMessage) { - Verify(CoreRuntime.Core80, jit, platform, errorMessage); + Verify(CoreRuntime.Core10_0, jit, platform, errorMessage); } private void Verify(Runtime runtime, Jit jit, Platform platform, string? errorMessage) diff --git a/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs b/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs index 4d989a2835..d9e1ea4650 100755 --- a/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs @@ -81,7 +81,7 @@ public void MemoryDiagnoserSupportsNativeAOT() if (OsDetector.IsMacOS()) return; // currently not supported - MemoryDiagnoserIsAccurate(NativeAotToolchain.Net80); + MemoryDiagnoserIsAccurate(NativeAotToolchain.Net10_0); } [FactEnvSpecific("We don't want to test MonoVM twice (.NET Framework and .NET Core), and it's not supported on Windows+Arm", @@ -103,10 +103,10 @@ public void MemoryDiagnoserSupportsMonoWasm(MonoAotCompilerMode aotCompilerMode) var arraySizeOverhead = ptrSize * 2; // bounds + max_length var intTaskSize = 40; // We can't use CalculateRequiredSpace for AllocateTask since it calculates the size with IntPtr.Size. - var netCoreAppSettings = new NetCoreAppSettings("net8.0", runtimeFrameworkVersion: null!, "Wasm", aotCompilerMode: aotCompilerMode); + var netCoreAppSettings = new NetCoreAppSettings("net10.0", runtimeFrameworkVersion: null!, "Wasm", aotCompilerMode: aotCompilerMode); var runtime = new WasmRuntime( - netCoreAppSettings.TargetFrameworkMoniker, RuntimeMoniker.WasmNet80, + netCoreAppSettings.TargetFrameworkMoniker, RuntimeMoniker.WasmNet10_0, "Wasm", aotCompilerMode == MonoAotCompilerMode.wasm, "v8"); AssertAllocations(WasmToolchain.From(netCoreAppSettings), typeof(AccurateAllocations), new Dictionary diff --git a/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs b/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs index 0da2cb20af..940eeb55ea 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs @@ -72,14 +72,14 @@ public void WasmSupportsCustomMainJs(string javaScriptEngine, string customMainJ private ManualConfig GetConfig(MonoAotCompilerMode aotCompilerMode, string javaScriptEngine, FileInfo? mainJsTemplate = null, WasmIpcType ipcType = WasmIpcType.Auto) { - var dotnetVersion = "net8.0"; + var dotnetVersion = "net10.0"; var logger = new OutputLogger(Output); var netCoreAppSettings = new NetCoreAppSettings(dotnetVersion, runtimeFrameworkVersion: null!, "Wasm", aotCompilerMode: aotCompilerMode); return ManualConfig.CreateEmpty() .AddLogger(logger) .AddJob(Job.Dry - .WithRuntime(new WasmRuntime(dotnetVersion, RuntimeMoniker.WasmNet80, "wasm", aotCompilerMode == MonoAotCompilerMode.wasm, javaScriptEngine, mainJsTemplate: mainJsTemplate, ipcType: ipcType)) + .WithRuntime(new WasmRuntime(dotnetVersion, RuntimeMoniker.WasmNet10_0, "wasm", aotCompilerMode == MonoAotCompilerMode.wasm, javaScriptEngine, mainJsTemplate: mainJsTemplate, ipcType: ipcType)) .WithToolchain(WasmToolchain.From(netCoreAppSettings))) .WithBuildTimeout(TimeSpan.FromSeconds(480)) // Increase timeout for `WasmSupportsInProcessDiagnosers` test on macos(x64) .WithOption(ConfigOptions.LogBuildOutput, true) diff --git a/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj b/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj index 9efbea6fa5..95662cab69 100755 --- a/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj +++ b/tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj @@ -2,7 +2,7 @@ BenchmarkDotNet.Tests - net8.0;net10.0;net472 + net10.0;net472 BenchmarkDotNet.Tests BenchmarkDotNet.Tests true diff --git a/tests/BenchmarkDotNet.Tests/Jobs/JobIdGeneratorTests.cs b/tests/BenchmarkDotNet.Tests/Jobs/JobIdGeneratorTests.cs index f5292da40e..e9c907c232 100644 --- a/tests/BenchmarkDotNet.Tests/Jobs/JobIdGeneratorTests.cs +++ b/tests/BenchmarkDotNet.Tests/Jobs/JobIdGeneratorTests.cs @@ -22,5 +22,6 @@ public void AutoGenerateJobId(string expectedId, Job job) {"Job-OOTPKI", Job.Default.WithToolchain(CsProjCoreToolchain.NetCoreApp80) }, {"Job-QAODSR", Job.Default.WithToolchain(CsProjCoreToolchain.NetCoreApp90) }, {"Job-KHMDUZ", Job.Default.WithToolchain(CsProjCoreToolchain.NetCoreApp80).WithRuntime(CoreRuntime.Core80) }, + {"Job-JMDAGQ", Job.Default.WithToolchain(CsProjCoreToolchain.NetCoreApp10_0) }, }; }