Revert "chore: Modify mono toolchain behavior and remove mono90 or la…

src/BenchmarkDotNet.Annotations/Jobs/RuntimeMoniker.cs

@@ -212,6 +212,21 @@ public enum RuntimeMoniker
         /// </summary>
         Mono80,
 
+        /// <summary>
+        /// .NET 9 using MonoVM (not CLR which is the default)
+        /// </summary>
+        Mono90,
+
+        /// <summary>
+        /// .NET 10 using MonoVM (not CLR which is the default)
+        /// </summary>
+        Mono10_0,
+
+        /// <summary>
+        /// .NET 11 using MonoVM (not CLR which is the default)
+        /// </summary>
+        Mono11_0,
+
         /// <summary>
         /// .NET 8 CLR with composite ReadyToRun compilation
         /// </summary>

src/BenchmarkDotNet.Diagnostics.dotMemory/DotMemoryDiagnoser.cs

@@ -113,6 +113,9 @@ internal override bool IsSupported(RuntimeMoniker runtimeMoniker)
             case RuntimeMoniker.Mono60:
             case RuntimeMoniker.Mono70:
             case RuntimeMoniker.Mono80:
+            case RuntimeMoniker.Mono90:
+            case RuntimeMoniker.Mono10_0:
+            case RuntimeMoniker.Mono11_0:
                 return false;
             case RuntimeMoniker.NetCoreApp20:
             case RuntimeMoniker.NetCoreApp21:

src/BenchmarkDotNet.Diagnostics.dotTrace/DotTraceDiagnoser.cs

@@ -116,6 +116,9 @@ internal override bool IsSupported(RuntimeMoniker runtimeMoniker)
             case RuntimeMoniker.Mono60:
             case RuntimeMoniker.Mono70:
             case RuntimeMoniker.Mono80:
+            case RuntimeMoniker.Mono90:
+            case RuntimeMoniker.Mono10_0:
+            case RuntimeMoniker.Mono11_0:
                 return false;
             case RuntimeMoniker.NetCoreApp20:
             case RuntimeMoniker.NetCoreApp21:

src/BenchmarkDotNet/ConsoleArguments/ConfigParser.cs

@@ -639,6 +639,15 @@ private static Job CreateJobForGivenRuntime(Job baseJob, string runtimeId, Comma
                 case RuntimeMoniker.Mono80:
                     return MakeMonoJob(baseJob, options, MonoRuntime.Mono80);
 
+                case RuntimeMoniker.Mono90:
+                    return MakeMonoJob(baseJob, options, MonoRuntime.Mono90);
+
+                case RuntimeMoniker.Mono10_0:
+                    return MakeMonoJob(baseJob, options, MonoRuntime.Mono10_0);
+
+                case RuntimeMoniker.Mono11_0:
+                    return MakeMonoJob(baseJob, options, MonoRuntime.Mono11_0);
+
                 case RuntimeMoniker.R2R80:
                 case RuntimeMoniker.R2R90:
                 case RuntimeMoniker.R2R10_0:

src/BenchmarkDotNet/Environments/Runtimes/MonoRuntime.cs

@@ -8,6 +8,9 @@ public class MonoRuntime : Runtime, IEquatable<MonoRuntime>
         public static readonly MonoRuntime Mono60 = new("Mono with .NET 6.0", RuntimeMoniker.Mono60, "net6.0", isDotNetBuiltIn: true);
         public static readonly MonoRuntime Mono70 = new("Mono with .NET 7.0", RuntimeMoniker.Mono70, "net7.0", isDotNetBuiltIn: true);
         public static readonly MonoRuntime Mono80 = new("Mono with .NET 8.0", RuntimeMoniker.Mono80, "net8.0", isDotNetBuiltIn: true);
+        public static readonly MonoRuntime Mono90 = new("Mono with .NET 9.0", RuntimeMoniker.Mono90, "net9.0", isDotNetBuiltIn: true);
+        public static readonly MonoRuntime Mono10_0 = new("Mono with .NET 10.0", RuntimeMoniker.Mono10_0, "net10.0", isDotNetBuiltIn: true);
+        public static readonly MonoRuntime Mono11_0 = new("Mono with .NET 11.0", RuntimeMoniker.Mono11_0, "net11.0", isDotNetBuiltIn: true);
 
         public string CustomPath { get; } = "";
 

src/BenchmarkDotNet/Extensions/RuntimeMonikerExtensions.cs

@@ -67,6 +67,12 @@ internal static Runtime GetRuntime(this RuntimeMoniker runtimeMoniker)
                     return MonoRuntime.Mono70;
                 case RuntimeMoniker.Mono80:
                     return MonoRuntime.Mono80;
+                case RuntimeMoniker.Mono90:
+                    return MonoRuntime.Mono90;
+                case RuntimeMoniker.Mono10_0:
+                    return MonoRuntime.Mono10_0;
+                case RuntimeMoniker.Mono11_0:
+                    return MonoRuntime.Mono11_0;
                 case RuntimeMoniker.R2R80:
                     return R2RRuntime.Net80;
                 case RuntimeMoniker.R2R90:
@@ -110,6 +116,9 @@ 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.Mono90 => new Version(9, 0),
+            RuntimeMoniker.Mono10_0 => new Version(10, 0),
+            RuntimeMoniker.Mono11_0 => new Version(11, 0),
             RuntimeMoniker.WasmNet80 => new Version(8, 0),
             RuntimeMoniker.WasmNet90 => new Version(9, 0),
             RuntimeMoniker.WasmNet10_0 => new Version(10, 0),

src/BenchmarkDotNet/Toolchains/CsProj/CsProjGenerator.cs

@@ -505,4 +505,4 @@ private static IEnumerable<DirectoryInfo> GetSubDirectories(DirectoryInfo curren
             => currentDir.EnumerateDirectories("*", DirectoryEnumerationOptions);
 #endif
     }
-}
+}

src/BenchmarkDotNet/Toolchains/Mono/MonoGenerator.cs

@@ -14,13 +14,11 @@ protected override string GetRuntimeSettings(GcMode gcMode, IResolver resolver)
         {
             // Workaround for following issues.
             // 1. 'Found multiple publish output files with the same relative path' error
-            // 2. NU1102 error occurs when running 'dotnet publish' on projects that contain .NET 9.0 or higher. https://github.com/dotnet/BenchmarkDotNet/issues/3000
+            // 2. NU1102 error occurs when passing /p:UseMonoRuntime=true to the dotnet cli with projects containing .NET 9.0 or higher. #3000
             return base.GetRuntimeSettings(gcMode, resolver) +
                 """
                   <PropertyGroup>
                     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
-                  </PropertyGroup>
-                  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
                     <UseMonoRuntime>true</UseMonoRuntime>
                   </PropertyGroup>
                 """;

src/BenchmarkDotNet/Toolchains/Mono/MonoToolchain.cs

@@ -10,6 +10,9 @@ public class MonoToolchain : CsProjCoreToolchain, IEquatable<MonoToolchain>
         [PublicAPI] public static readonly IToolchain Mono60 = From(new NetCoreAppSettings("net6.0", "mono60"));
         [PublicAPI] public static readonly IToolchain Mono70 = From(new NetCoreAppSettings("net7.0", "mono70"));
         [PublicAPI] public static readonly IToolchain Mono80 = From(new NetCoreAppSettings("net8.0", "mono80"));
+        [PublicAPI] public static readonly IToolchain Mono90 = From(new NetCoreAppSettings("net9.0", "mono90"));
+        [PublicAPI] public static readonly IToolchain Mono10_0 = From(new NetCoreAppSettings("net10.0", "mono10_0"));
+        [PublicAPI] public static readonly IToolchain Mono11_0 = From(new NetCoreAppSettings("net11.0", "mono11_0"));
 
         private MonoToolchain(string name, IGenerator generator, IBuilder builder, IExecutor executor, string customDotNetCliPath)
             : base(name, generator, builder, executor, customDotNetCliPath)

src/BenchmarkDotNet/Toolchains/ToolchainExtensions.cs

@@ -73,6 +73,9 @@ bool UseRoslyn()
                                 RuntimeMoniker.Mono60 => GetToolchain(RuntimeMoniker.Net60),
                                 RuntimeMoniker.Mono70 => GetToolchain(RuntimeMoniker.Net70),
                                 RuntimeMoniker.Mono80 => GetToolchain(RuntimeMoniker.Net80),
+                                RuntimeMoniker.Mono90 => GetToolchain(RuntimeMoniker.Net90),
+                                RuntimeMoniker.Mono10_0 => GetToolchain(RuntimeMoniker.Net10_0),
+                                RuntimeMoniker.Mono11_0 => GetToolchain(RuntimeMoniker.Net11_0),
                                 _ => CsProjCoreToolchain.From(new NetCoreAppSettings(mono.MsBuildMoniker, mono.Name))
                             };
                         }
@@ -198,6 +201,15 @@ private static IToolchain GetToolchain(RuntimeMoniker runtimeMoniker)
                 case RuntimeMoniker.Mono80:
                     return MonoToolchain.Mono80;
 
+                case RuntimeMoniker.Mono90:
+                    return MonoToolchain.Mono90;
+
+                case RuntimeMoniker.Mono10_0:
+                    return MonoToolchain.Mono10_0;
+
+                case RuntimeMoniker.Mono11_0:
+                    return MonoToolchain.Mono11_0;
+
                 case RuntimeMoniker.R2R80:
                     return R2RToolchain.R2R80;
 
@@ -215,4 +227,4 @@ private static IToolchain GetToolchain(RuntimeMoniker runtimeMoniker)
             }
         }
     }
-}
+}