diff --git a/src/BenchmarkDotNet.Annotations/Jobs/RuntimeMoniker.cs b/src/BenchmarkDotNet.Annotations/Jobs/RuntimeMoniker.cs index 8e903db129..83f54ab6d1 100644 --- a/src/BenchmarkDotNet.Annotations/Jobs/RuntimeMoniker.cs +++ b/src/BenchmarkDotNet.Annotations/Jobs/RuntimeMoniker.cs @@ -144,26 +144,6 @@ public enum RuntimeMoniker /// NativeAot11_0, - /// - /// WebAssembly with default .Net version - /// - Wasm, - - /// - /// WebAssembly with net5.0 - /// - WasmNet50, - - /// - /// WebAssembly with net6.0 - /// - WasmNet60, - - /// - /// WebAssembly with net7.0 - /// - WasmNet70, - /// /// WebAssembly with net8.0 /// diff --git a/src/BenchmarkDotNet.Diagnostics.dotMemory/DotMemoryDiagnoser.cs b/src/BenchmarkDotNet.Diagnostics.dotMemory/DotMemoryDiagnoser.cs index 5782616d5b..0624aa0155 100644 --- a/src/BenchmarkDotNet.Diagnostics.dotMemory/DotMemoryDiagnoser.cs +++ b/src/BenchmarkDotNet.Diagnostics.dotMemory/DotMemoryDiagnoser.cs @@ -100,10 +100,6 @@ internal override bool IsSupported(RuntimeMoniker runtimeMoniker) case RuntimeMoniker.NativeAot90: case RuntimeMoniker.NativeAot10_0: case RuntimeMoniker.NativeAot11_0: - case RuntimeMoniker.Wasm: - case RuntimeMoniker.WasmNet50: - case RuntimeMoniker.WasmNet60: - case RuntimeMoniker.WasmNet70: case RuntimeMoniker.WasmNet80: case RuntimeMoniker.WasmNet90: case RuntimeMoniker.WasmNet10_0: diff --git a/src/BenchmarkDotNet.Diagnostics.dotTrace/DotTraceDiagnoser.cs b/src/BenchmarkDotNet.Diagnostics.dotTrace/DotTraceDiagnoser.cs index 1ff18625de..d7c8382f4d 100644 --- a/src/BenchmarkDotNet.Diagnostics.dotTrace/DotTraceDiagnoser.cs +++ b/src/BenchmarkDotNet.Diagnostics.dotTrace/DotTraceDiagnoser.cs @@ -103,10 +103,6 @@ internal override bool IsSupported(RuntimeMoniker runtimeMoniker) case RuntimeMoniker.NativeAot90: case RuntimeMoniker.NativeAot10_0: case RuntimeMoniker.NativeAot11_0: - case RuntimeMoniker.Wasm: - case RuntimeMoniker.WasmNet50: - case RuntimeMoniker.WasmNet60: - case RuntimeMoniker.WasmNet70: case RuntimeMoniker.WasmNet80: case RuntimeMoniker.WasmNet90: case RuntimeMoniker.WasmNet10_0: diff --git a/src/BenchmarkDotNet/ConsoleArguments/ConfigParser.cs b/src/BenchmarkDotNet/ConsoleArguments/ConfigParser.cs index 2992a09cae..b9163654eb 100644 --- a/src/BenchmarkDotNet/ConsoleArguments/ConfigParser.cs +++ b/src/BenchmarkDotNet/ConsoleArguments/ConfigParser.cs @@ -578,18 +578,6 @@ private static Job CreateJobForGivenRuntime(Job baseJob, string runtimeId, Comma case RuntimeMoniker.NativeAot11_0: return CreateAotJob(baseJob, options, runtimeMoniker, "", "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json"); - case RuntimeMoniker.Wasm: - return MakeWasmJob(baseJob, options, RuntimeInformation.IsNetCore ? CoreRuntime.GetCurrentVersion().MsBuildMoniker : "net5.0", runtimeMoniker); - - case RuntimeMoniker.WasmNet50: - return MakeWasmJob(baseJob, options, "net5.0", runtimeMoniker); - - case RuntimeMoniker.WasmNet60: - return MakeWasmJob(baseJob, options, "net6.0", runtimeMoniker); - - case RuntimeMoniker.WasmNet70: - return MakeWasmJob(baseJob, options, "net7.0", runtimeMoniker); - case RuntimeMoniker.WasmNet80: return MakeWasmJob(baseJob, options, "net8.0", runtimeMoniker); diff --git a/src/BenchmarkDotNet/Environments/Runtimes/WasmRuntime.cs b/src/BenchmarkDotNet/Environments/Runtimes/WasmRuntime.cs index 7e7fb6ec6b..0c148c0352 100644 --- a/src/BenchmarkDotNet/Environments/Runtimes/WasmRuntime.cs +++ b/src/BenchmarkDotNet/Environments/Runtimes/WasmRuntime.cs @@ -37,7 +37,16 @@ public class WasmRuntime : Runtime, IEquatable /// Specifies a wasm data directory surfaced as $(WasmDataDir) for the project /// Runtime moniker /// When true (default), use Mono runtime pack; when false, use CoreCLR runtime pack. - public WasmRuntime(string msBuildMoniker = "net5.0", string displayName = "Wasm", string javaScriptEngine = "v8", string javaScriptEngineArguments = "--expose_wasm", bool aot = false, string wasmDataDir = "", RuntimeMoniker moniker = RuntimeMoniker.Wasm, bool isMonoRuntime = true) : base(moniker, msBuildMoniker, displayName) + public WasmRuntime( + string msBuildMoniker = "net8.0", + string displayName = "Wasm", + string javaScriptEngine = "v8", + string javaScriptEngineArguments = "--expose_wasm", + bool aot = false, + string wasmDataDir = "", + RuntimeMoniker moniker = RuntimeMoniker.WasmNet80, + bool isMonoRuntime = true) + : base(moniker, msBuildMoniker, displayName) { if (javaScriptEngine.IsNotBlank() && javaScriptEngine != "v8" && !File.Exists(javaScriptEngine)) throw new FileNotFoundException($"Provided {nameof(javaScriptEngine)} file: \"{javaScriptEngine}\" doest NOT exist"); diff --git a/src/BenchmarkDotNet/Extensions/RuntimeMonikerExtensions.cs b/src/BenchmarkDotNet/Extensions/RuntimeMonikerExtensions.cs index ce0b3ed207..29378656a3 100644 --- a/src/BenchmarkDotNet/Extensions/RuntimeMonikerExtensions.cs +++ b/src/BenchmarkDotNet/Extensions/RuntimeMonikerExtensions.cs @@ -111,10 +111,6 @@ internal static Runtime GetRuntime(this RuntimeMoniker runtimeMoniker) RuntimeMoniker.Mono60 => new Version(6, 0), RuntimeMoniker.Mono70 => new Version(7, 0), RuntimeMoniker.Mono80 => new Version(8, 0), - RuntimeMoniker.Wasm => Portability.RuntimeInformation.IsNetCore && CoreRuntime.TryGetVersion(out var version) ? version : new Version(5, 0), - RuntimeMoniker.WasmNet50 => new Version(5, 0), - RuntimeMoniker.WasmNet60 => new Version(6, 0), - RuntimeMoniker.WasmNet70 => new Version(7, 0), RuntimeMoniker.WasmNet80 => new Version(8, 0), RuntimeMoniker.WasmNet90 => new Version(9, 0), RuntimeMoniker.WasmNet10_0 => new Version(10, 0), diff --git a/tests/BenchmarkDotNet.Tests/ConfigParserTests.cs b/tests/BenchmarkDotNet.Tests/ConfigParserTests.cs index 76393cc631..a8b4245b97 100644 --- a/tests/BenchmarkDotNet.Tests/ConfigParserTests.cs +++ b/tests/BenchmarkDotNet.Tests/ConfigParserTests.cs @@ -655,7 +655,7 @@ public void UserCanSpecifyWasmArgs() [Fact] public void UserCanSpecifyWasmArgsUsingEquals() { - var parsedConfiguration = ConfigParser.Parse(new[] { "--runtimes", "wasm", "--wasmArgs=--expose_wasm --module" }, new OutputLogger(Output)); + var parsedConfiguration = ConfigParser.Parse(new[] { "--runtimes", "wasmnet80", "--wasmArgs=--expose_wasm --module" }, new OutputLogger(Output)); Assert.True(parsedConfiguration.isSuccess); var jobs = parsedConfiguration.config.GetJobs(); foreach (var job in parsedConfiguration.config.GetJobs()) @@ -671,7 +671,7 @@ public void UserCanSpecifyWasmArgsViaResponseFile() var tempResponseFile = Path.GetRandomFileName(); File.WriteAllLines(tempResponseFile, new[] { - "--runtimes wasm", + "--runtimes wasmnet80", "--wasmArgs \"--expose_wasm --module\"" }); var parsedConfiguration = ConfigParser.Parse(new[] { $"@{tempResponseFile}" }, new OutputLogger(Output));