Try replacing the global.json

Author: MihaZupan

Runner/Helpers/DotnetHelpers.cs

@@ -37,6 +37,16 @@ public static async Task KillRemainingDotnetProcessesAsync(JobBase job)
         }
     }
 
+    public static int GetDotnetVersion(string repository = "runtime")
+    {
+        // "version": "10.0.100-preview.1.12345.6", => 10
+        return int.Parse(File.ReadAllLines($"{repository}/global.json")
+            .First(line => line.Contains("version", StringComparison.OrdinalIgnoreCase))
+            .Split(':')[1] //  "10.0.100-preview.1.12345.6"
+            .Split('.')[0] //  "10
+            .TrimStart(' ', '"'));
+    }
+
     public static async Task InstallDotnetSdkAsync(JobBase job, string globalJsonPath, string? installDir = null) =>
         await InstallDotnetSdkAsyncCore(job, $"--jsonfile {globalJsonPath}", installDir);
 

Runner/Helpers/RuntimeHelpers.cs

@@ -223,14 +223,4 @@ public static async Task CopyReleaseArtifactsAsync(JobBase job, string logPrefix
 
         await job.RunProcessAsync("cp", $"-r {BaseDirectory}/{folder}/. {destination}", logPrefix: logPrefix);
     }
-
-    public static int GetDotnetVersion(string repository = "runtime")
-    {
-        // "version": "10.0.100-preview.1.12345.6", => 10
-        return int.Parse(File.ReadAllLines($"{repository}/global.json")
-            .First(line => line.Contains("version", StringComparison.OrdinalIgnoreCase))
-            .Split(':')[1] //  "10.0.100-preview.1.12345.6"
-            .Split('.')[0] //  "10
-            .TrimStart(' ', '"'));
-    }
 }

Runner/Jobs/BenchmarkLibrariesJob.cs

@@ -4,8 +4,6 @@ namespace Runner.Jobs;
 
 internal sealed partial class BenchmarkLibrariesJob : JobBase
 {
-    private const string DotnetInstallDir = "dotnet-performance";
-
     public BenchmarkLibrariesJob(HttpClient client, Dictionary<string, string> metadata) : base(client, metadata) { }
 
     protected override async Task RunJobCoreAsync()
@@ -32,7 +30,7 @@ protected override async Task RunJobCoreAsync()
         {
             await clonePerformanceTask;
 
-            PendingTasks.Enqueue(DotnetHelpers.InstallDotnetDailySdkAsync(this, GetPerformanceDotnetVersion(), DotnetInstallDir));
+            PendingTasks.Enqueue(DotnetHelpers.InstallDotnetSdkAsync(this, "performance/global.json"));
 
             coreRuns = await DownloadCoreRootsAsync(entries);
         }
@@ -65,7 +63,7 @@ protected override async Task RunJobCoreAsync()
                 await JitDiffJob.BuildAndCopyRuntimeBranchBitsAsync(this, "pr", uploadArtifacts: false, buildChecked: false, canSkipRebuild: false);
             }
 
-            await DotnetHelpers.InstallDotnetDailySdkAsync(this, GetPerformanceDotnetVersion(), DotnetInstallDir);
+            await DotnetHelpers.InstallDotnetSdkAsync(this, "performance/global.json");
 
             coreRuns = ["artifacts-main/corerun", "artifacts-pr/corerun"];
         }
@@ -83,6 +81,13 @@ private async Task CloneDotnetPerformanceAndSetupToolsAsync()
 
             await RunProcessAsync("git", $"clone --no-tags --depth=1 -b {branch} --progress https://github.com/{repo} performance", logPrefix: "Clone performance");
 
+            if (repo == "dotnet/performance" && branch == "main")
+            {
+                // Performance's global.json is out of date
+                byte[] bytes = await HttpClient.GetByteArrayAsync("https://raw.githubusercontent.com/dotnet/runtime/refs/heads/main/global.json");
+                await File.WriteAllBytesAsync("performance/global.json", bytes);
+            }
+
             if (TryGetFlag("medium") || TryGetFlag("long"))
             {
                 string? path = Directory.EnumerateFiles("performance", "*.cs", SearchOption.AllDirectories)
@@ -195,23 +200,6 @@ private async Task CloneDotnetPerformanceAndSetupToolsAsync()
         }
     }
 
-    private int GetPerformanceDotnetVersion()
-    {
-        string source = File.ReadAllText("performance/src/benchmarks/micro/MicroBenchmarks.csproj");
-        // <SupportedTargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0;net11.0</SupportedTargetFrameworks>
-
-        Match match = DotnetVersionFromCsprojRegex().Match(source);
-
-        if (!match.Success)
-        {
-            throw new Exception("Failed to determine the dotnet version from MicroBenchmarks.csproj");
-        }
-
-        // ["net6.0", "net7.0", ...]
-        string[] frameworks = match.Groups[1].Value.Split(';', StringSplitOptions.RemoveEmptyEntries);
-        return frameworks.Max(f => int.Parse(f.AsSpan(3, f.IndexOf('.') - 3)));
-    }
-
     private async Task<string[]> DownloadCoreRootsAsync(CoreRootAPI.CoreRootEntry[] entries)
     {
         for (int i = 0; i < entries.Length; i++)
@@ -248,7 +236,7 @@ private async Task RunBenchmarksAsync(string[] coreRunPaths)
             filter = $"*{filter}*";
         }
 
-        int dotnetVersion = GetPerformanceDotnetVersion();
+        int dotnetVersion = DotnetHelpers.GetDotnetVersion("performance");
 
         string coreRuns = string.Join(' ', coreRunPaths.Select(p => $"\"{Path.GetFullPath(p)}\""));
 
@@ -263,10 +251,8 @@ private async Task RunBenchmarksAsync(string[] coreRunPaths)
 
         string? artifactsDir = null;
 
-        string dotnetPath = Path.GetFullPath($"{DotnetInstallDir}/dotnet");
-
-        await RunProcessAsync(dotnetPath,
-            $"run -c Release --framework net{dotnetVersion}.0 -- --cli \"{dotnetPath}\" --filter {filter} -h {HiddenColumns} --corerun {coreRuns} {parallelSuffix}",
+        await RunProcessAsync("/usr/lib/dotnet/dotnet",
+            $"run -c Release --framework net{dotnetVersion}.0 -- --filter {filter} -h {HiddenColumns} --corerun {coreRuns} {parallelSuffix}",
             workDir: "performance/src/benchmarks/micro",
             processLogs: line =>
             {
@@ -405,7 +391,4 @@ await RunProcessAsync(dotnetPath,
 
     [GeneratedRegex(@"BenchmarkDotNet\.(\d.*?)\.nupkg")]
     private static partial Regex BenchmarkDotNetPackageVersionRegex();
-
-    [GeneratedRegex(@"Frameworks>((?:net\d+\.\d+);?)+<\/")]
-    private static partial Regex DotnetVersionFromCsprojRegex();
 }

Runner/Jobs/RegexDiffJob.cs

@@ -567,7 +567,7 @@ await Parallel.ForAsync(0, Environment.ProcessorCount, async (processorId, _) =>
                     <Project Sdk="Microsoft.NET.Sdk">
                       <PropertyGroup>
                         <OutputType>Library</OutputType>
-                        <TargetFramework>net{RuntimeHelpers.GetDotnetVersion()}.0</TargetFramework>
+                        <TargetFramework>net{DotnetHelpers.GetDotnetVersion()}.0</TargetFramework>
                         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
                       </PropertyGroup>
                     </Project>