Skip to content

Commit 2e1e04c

Browse files
kotlarmilosCopilot
andcommitted
Remove the mono12.0 family of well-known monikers and toolchains
CsProjNetToolchain.ValidateAsync always rejects Mono, MonoWasm, and MonoWasmAot runtimes targeting .NET 12 and later, so the well-known mono12.0, monowasm12.0, and monowasmaot12.0 monikers and their cached runtime and toolchain singletons are unreachable. Parsing an explicit version still resolves through the uncached fallback. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 9170c669-e132-46bb-8258-e448425535d6
1 parent 475ef55 commit 2e1e04c

9 files changed

Lines changed: 6 additions & 30 deletions

File tree

‎src/BenchmarkDotNet.Annotations/Jobs/RuntimeMoniker.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ public static class RuntimeMoniker
8181
public const string Mono10_0 = "mono10.0";
8282
/// <summary>.NET 11 using MonoVM (not CLR which is the default)</summary>
8383
public const string Mono11_0 = "mono11.0";
84-
/// <summary>.NET 12 using MonoVM (not CLR which is the default)</summary>
85-
public const string Mono12_0 = "mono12.0";
8684

8785
/// <summary>.NET 8 CLR with composite ReadyToRun compilation</summary>
8886
public const string R2R80 = "r2r8.0";
@@ -103,8 +101,6 @@ public static class RuntimeMoniker
103101
public const string MonoWasm10_0 = "monowasm10.0";
104102
/// <summary>Mono WebAssembly with net11.0</summary>
105103
public const string MonoWasm11_0 = "monowasm11.0";
106-
/// <summary>Mono WebAssembly with net12.0</summary>
107-
public const string MonoWasm12_0 = "monowasm12.0";
108104

109105
/// <summary>Mono WebAssembly AOT with net8.0</summary>
110106
public const string MonoWasmAot80 = "monowasmaot8.0";
@@ -114,8 +110,6 @@ public static class RuntimeMoniker
114110
public const string MonoWasmAot10_0 = "monowasmaot10.0";
115111
/// <summary>Mono WebAssembly AOT with net11.0</summary>
116112
public const string MonoWasmAot11_0 = "monowasmaot11.0";
117-
/// <summary>Mono WebAssembly AOT with net12.0</summary>
118-
public const string MonoWasmAot12_0 = "monowasmaot12.0";
119113

120114
// Still experimental
121115
//public const string CoreWasm11_0 = "corewasm11.0";

‎src/BenchmarkDotNet/Environments/Runtimes/MonoCoreRuntime.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public sealed class MonoCoreRuntime : Runtime
1717
public static readonly MonoCoreRuntime Net90 = new(new(9, 0));
1818
public static readonly MonoCoreRuntime Net10_0 = new(new(10, 0));
1919
public static readonly MonoCoreRuntime Net11_0 = new(new(11, 0));
20-
public static readonly MonoCoreRuntime Net12_0 = new(new(12, 0));
2120

2221
private MonoCoreRuntime(Version version) => Version = ToRuntimeVersion(version);
2322

@@ -37,7 +36,6 @@ public static MonoCoreRuntime From(Version version)
3736
9 => Net90,
3837
10 => Net10_0,
3938
11 => Net11_0,
40-
12 => Net12_0,
4139
_ => new(version),
4240
};
4341

‎src/BenchmarkDotNet/Environments/Runtimes/MonoWasmAotRuntime.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public sealed class MonoWasmAotRuntime : WasmRuntime
1313
public static readonly MonoWasmAotRuntime Net90 = new(new(9, 0));
1414
public static readonly MonoWasmAotRuntime Net10_0 = new(new(10, 0));
1515
public static readonly MonoWasmAotRuntime Net11_0 = new(new(11, 0));
16-
public static readonly MonoWasmAotRuntime Net12_0 = new(new(12, 0));
1716

1817
private MonoWasmAotRuntime(Version version) : base(version) { }
1918

@@ -27,7 +26,6 @@ public static MonoWasmAotRuntime From(Version version)
2726
9 => Net90,
2827
10 => Net10_0,
2928
11 => Net11_0,
30-
12 => Net12_0,
3129
_ => new(version),
3230
};
3331

‎src/BenchmarkDotNet/Environments/Runtimes/MonoWasmRuntime.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public sealed class MonoWasmRuntime : WasmRuntime
1313
public static readonly MonoWasmRuntime Net90 = new(new(9, 0));
1414
public static readonly MonoWasmRuntime Net10_0 = new(new(10, 0));
1515
public static readonly MonoWasmRuntime Net11_0 = new(new(11, 0));
16-
public static readonly MonoWasmRuntime Net12_0 = new(new(12, 0));
1716

1817
private MonoWasmRuntime(Version version) : base(version) { }
1918

@@ -27,7 +26,6 @@ public static MonoWasmRuntime From(Version version)
2726
9 => Net90,
2827
10 => Net10_0,
2928
11 => Net11_0,
30-
12 => Net12_0,
3129
_ => new(version),
3230
};
3331

‎src/BenchmarkDotNet/Toolchains/Mono/CsProjMonoCoreToolchain.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public sealed class CsProjMonoCoreToolchain : CsProjNetToolchain
1313
public static readonly CsProjMonoCoreToolchain Mono90 = new(MonoCoreRuntime.Net90, MonoCoreSettings.Default);
1414
public static readonly CsProjMonoCoreToolchain Mono10_0 = new(MonoCoreRuntime.Net10_0, MonoCoreSettings.Default);
1515
public static readonly CsProjMonoCoreToolchain Mono11_0 = new(MonoCoreRuntime.Net11_0, MonoCoreSettings.Default);
16-
public static readonly CsProjMonoCoreToolchain Mono12_0 = new(MonoCoreRuntime.Net12_0, MonoCoreSettings.Default);
1716

1817
private CsProjMonoCoreToolchain(MonoCoreRuntime runtime, MonoCoreSettings settings)
1918
: this(runtime, settings, Resolve(settings, runtime)) { }
@@ -44,7 +43,6 @@ public static CsProjMonoCoreToolchain From(MonoCoreRuntime runtime, MonoCoreSett
4443
9 => Mono90,
4544
10 => Mono10_0,
4645
11 => Mono11_0,
47-
12 => Mono12_0,
4846
_ => new CsProjMonoCoreToolchain(runtime, settings),
4947
};
5048
}

‎src/BenchmarkDotNet/Toolchains/Wasm/CsProjMonoWasmAotToolchain.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ public sealed class CsProjMonoWasmAotToolchain : CsProjWasmToolchain
99
public static readonly CsProjMonoWasmAotToolchain Net90 = new(MonoWasmAotRuntime.Net90, WasmSettings.Default);
1010
public static readonly CsProjMonoWasmAotToolchain Net10_0 = new(MonoWasmAotRuntime.Net10_0, WasmSettings.Default);
1111
public static readonly CsProjMonoWasmAotToolchain Net11_0 = new(MonoWasmAotRuntime.Net11_0, WasmSettings.Default);
12-
public static readonly CsProjMonoWasmAotToolchain Net12_0 = new(MonoWasmAotRuntime.Net12_0, WasmSettings.Default);
1312

1413
private CsProjMonoWasmAotToolchain(MonoWasmAotRuntime runtime, WasmSettings settings)
1514
: base("MonoWasmAot", runtime, settings, aot: true, useCoreClrRuntime: false) { }
@@ -26,7 +25,6 @@ public static CsProjMonoWasmAotToolchain From(MonoWasmAotRuntime runtime, WasmSe
2625
9 => Net90,
2726
10 => Net10_0,
2827
11 => Net11_0,
29-
12 => Net12_0,
3028
_ => new CsProjMonoWasmAotToolchain(runtime, settings),
3129
};
3230
}

‎src/BenchmarkDotNet/Toolchains/Wasm/CsProjMonoWasmToolchain.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ public sealed class CsProjMonoWasmToolchain : CsProjWasmToolchain
99
public static readonly CsProjMonoWasmToolchain Net90 = new(MonoWasmRuntime.Net90, WasmSettings.Default);
1010
public static readonly CsProjMonoWasmToolchain Net10_0 = new(MonoWasmRuntime.Net10_0, WasmSettings.Default);
1111
public static readonly CsProjMonoWasmToolchain Net11_0 = new(MonoWasmRuntime.Net11_0, WasmSettings.Default);
12-
public static readonly CsProjMonoWasmToolchain Net12_0 = new(MonoWasmRuntime.Net12_0, WasmSettings.Default);
1312

1413
private CsProjMonoWasmToolchain(MonoWasmRuntime runtime, WasmSettings settings)
1514
: base("MonoWasm", runtime, settings, aot: false, useCoreClrRuntime: false) { }
@@ -26,7 +25,6 @@ public static CsProjMonoWasmToolchain From(MonoWasmRuntime runtime, WasmSettings
2625
9 => Net90,
2726
10 => Net10_0,
2827
11 => Net11_0,
29-
12 => Net12_0,
3028
_ => new CsProjMonoWasmToolchain(runtime, settings),
3129
};
3230
}

‎tests/BenchmarkDotNet.Tests/ConfigParserTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,10 @@ public void WasmRuntimesResolveToTheirToolchains(string moniker, Type expectedTo
400400
[Theory]
401401
[InlineData(RuntimeMoniker.Net12_0, typeof(CsProjCoreToolchain))]
402402
[InlineData(RuntimeMoniker.NativeAot12_0, typeof(CsProjNativeAotToolchain))]
403-
[InlineData(RuntimeMoniker.Mono12_0, typeof(CsProjMonoCoreToolchain))]
403+
[InlineData("mono12.0", typeof(CsProjMonoCoreToolchain))]
404404
[InlineData(RuntimeMoniker.R2R12_0, typeof(CsProjR2RToolchain))]
405-
[InlineData(RuntimeMoniker.MonoWasm12_0, typeof(CsProjMonoWasmToolchain))]
406-
[InlineData(RuntimeMoniker.MonoWasmAot12_0, typeof(CsProjMonoWasmAotToolchain))]
405+
[InlineData("monowasm12.0", typeof(CsProjMonoWasmToolchain))]
406+
[InlineData("monowasmaot12.0", typeof(CsProjMonoWasmAotToolchain))]
407407
[InlineData("corewasm12.0", typeof(CsProjCoreWasmToolchain))]
408408
public void Net12RuntimesResolveToTheirToolchains(string moniker, Type expectedToolchain)
409409
{

‎tests/BenchmarkDotNet.Tests/RuntimeParseTests.cs‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ public class RuntimeParseTests
1717
[InlineData("net10.0", typeof(CoreRuntime), 10, 0)]
1818
[InlineData(RuntimeMoniker.Net12_0, typeof(CoreRuntime), 12, 0)]
1919
[InlineData(RuntimeMoniker.NativeAot12_0, typeof(NativeAotRuntime), 12, 0)]
20-
[InlineData(RuntimeMoniker.Mono12_0, typeof(MonoCoreRuntime), 12, 0)]
21-
[InlineData(RuntimeMoniker.MonoWasm12_0, typeof(MonoWasmRuntime), 12, 0)]
22-
[InlineData(RuntimeMoniker.MonoWasmAot12_0, typeof(MonoWasmAotRuntime), 12, 0)]
20+
[InlineData("mono12.0", typeof(MonoCoreRuntime), 12, 0)]
21+
[InlineData("monowasm12.0", typeof(MonoWasmRuntime), 12, 0)]
22+
[InlineData("monowasmAot12.0", typeof(MonoWasmAotRuntime), 12, 0)]
2323
[InlineData(RuntimeMoniker.R2R12_0, typeof(R2RRuntime), 12, 0)]
2424
[InlineData("corewasm12.0", typeof(CoreWasmRuntime), 12, 0)]
2525
[InlineData("netcoreapp3.1", typeof(CoreRuntime), 3, 1)]
@@ -265,17 +265,11 @@ public void Net12RuntimesAndDefaultToolchainsUseCachedInstances()
265265
{
266266
Assert.Same(CoreRuntime.Core12_0, Runtime.Parse(RuntimeMoniker.Net12_0));
267267
Assert.Same(NativeAotRuntime.Net12_0, Runtime.Parse(RuntimeMoniker.NativeAot12_0));
268-
Assert.Same(MonoCoreRuntime.Net12_0, Runtime.Parse(RuntimeMoniker.Mono12_0));
269-
Assert.Same(MonoWasmRuntime.Net12_0, Runtime.Parse(RuntimeMoniker.MonoWasm12_0));
270-
Assert.Same(MonoWasmAotRuntime.Net12_0, Runtime.Parse(RuntimeMoniker.MonoWasmAot12_0));
271268
Assert.Same(R2RRuntime.Net12_0, Runtime.Parse(RuntimeMoniker.R2R12_0));
272269
Assert.Same(CoreRuntime.Core12_0, CoreRuntime.Latest);
273270

274271
Assert.Same(CsProjCoreToolchain.NetCoreApp12_0, CsProjCoreToolchain.From(CoreRuntime.Core12_0, NetCoreAppSettings.Default));
275272
Assert.Same(CsProjNativeAotToolchain.Net12_0, CsProjNativeAotToolchain.From(NativeAotRuntime.Net12_0, NativeAotSettings.Default));
276-
Assert.Same(CsProjMonoCoreToolchain.Mono12_0, CsProjMonoCoreToolchain.From(MonoCoreRuntime.Net12_0, MonoCoreSettings.Default));
277-
Assert.Same(CsProjMonoWasmToolchain.Net12_0, CsProjMonoWasmToolchain.From(MonoWasmRuntime.Net12_0, WasmSettings.Default));
278-
Assert.Same(CsProjMonoWasmAotToolchain.Net12_0, CsProjMonoWasmAotToolchain.From(MonoWasmAotRuntime.Net12_0, WasmSettings.Default));
279273
Assert.Same(CsProjR2RToolchain.R2R12_0, CsProjR2RToolchain.From(R2RRuntime.Net12_0, R2RSettings.Default));
280274
}
281275

0 commit comments

Comments
 (0)