Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions src/BenchmarkDotNet.Annotations/Jobs/RuntimeMoniker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -144,26 +144,6 @@ public enum RuntimeMoniker
/// </summary>
NativeAot11_0,

/// <summary>
/// WebAssembly with default .Net version
/// </summary>
Wasm,

/// <summary>
/// WebAssembly with net5.0
/// </summary>
WasmNet50,

/// <summary>
/// WebAssembly with net6.0
/// </summary>
WasmNet60,

/// <summary>
/// WebAssembly with net7.0
/// </summary>
WasmNet70,

/// <summary>
/// WebAssembly with net8.0
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 0 additions & 4 deletions src/BenchmarkDotNet.Diagnostics.dotTrace/DotTraceDiagnoser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 0 additions & 12 deletions src/BenchmarkDotNet/ConsoleArguments/ConfigParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
11 changes: 10 additions & 1 deletion src/BenchmarkDotNet/Environments/Runtimes/WasmRuntime.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,16 @@ public class WasmRuntime : Runtime, IEquatable<WasmRuntime>
/// <param name="wasmDataDir">Specifies a wasm data directory surfaced as $(WasmDataDir) for the project</param>
/// <param name="moniker">Runtime moniker</param>
/// <param name="isMonoRuntime">When true (default), use Mono runtime pack; when false, use CoreCLR runtime pack.</param>
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");
Expand Down
4 changes: 0 additions & 4 deletions src/BenchmarkDotNet/Extensions/RuntimeMonikerExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions tests/BenchmarkDotNet.Tests/ConfigParserTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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));
Expand Down