Install daily .NET SDK for benchmarks

Author: MihaZupan

Runner/Helpers/DotnetHelpers.cs

@@ -36,4 +36,22 @@ public static async Task KillRemainingDotnetProcessesAsync(JobBase job)
             }
         }
     }
+
+    public static async Task InstallDotnetSdkAsync(JobBase job, string globalJsonPath, string? installDir = null) =>
+        await InstallDotnetSdkAsyncCore(job, $"--jsonfile {globalJsonPath}", installDir);
+
+    public static async Task InstallDotnetDailySdkAsync(JobBase job, int version, string? installDir = null) =>
+        await InstallDotnetSdkAsyncCore(job, $"--channel {version}.0 --quality daily", installDir);
+
+    private static async Task InstallDotnetSdkAsyncCore(JobBase job, string versionArgs, string? installDir = null)
+    {
+        installDir ??= "/usr/lib/dotnet";
+
+        if (!File.Exists("dotnet-install.sh"))
+        {
+            await job.RunProcessAsync("wget", "https://dot.net/v1/dotnet-install.sh");
+        }
+
+        await job.RunProcessAsync("bash", $"dotnet-install.sh {versionArgs} --install-dir {installDir}");
+    }
 }

Runner/Helpers/RuntimeHelpers.cs

@@ -202,21 +202,7 @@ string GetMergeScript(string name)
 
     public static async Task InstallRuntimeDotnetSdkAsync(JobBase job, string? installDir = null)
     {
-        await InstallDotnetSdkAsync(job, "runtime/global.json", installDir);
-    }
-
-    public static async Task InstallDotnetSdkAsync(JobBase job, string globalJsonPath, string? installDir = null)
-    {
-        AssertIsLinux();
-
-        installDir ??= "/usr/lib/dotnet";
-
-        if (!File.Exists("dotnet-install.sh"))
-        {
-            await job.RunProcessAsync("wget", "https://dot.net/v1/dotnet-install.sh");
-        }
-
-        await job.RunProcessAsync("bash", $"dotnet-install.sh --jsonfile {globalJsonPath} --install-dir {installDir}");
+        await DotnetHelpers.InstallDotnetSdkAsync(job, "runtime/global.json", installDir);
     }
 
     public static async Task CopyReleaseArtifactsAsync(JobBase job, string logPrefix, string destination, string runtimeConfig = "Release")

Runner/Jobs/BenchmarkLibrariesJob.cs

@@ -32,7 +32,7 @@ protected override async Task RunJobCoreAsync()
         {
             await clonePerformanceTask;
 
-            PendingTasks.Enqueue(RuntimeHelpers.InstallDotnetSdkAsync(this, "performance/global.json", DotnetInstallDir));
+            PendingTasks.Enqueue(Task.Run(InstallDotnetSdksAsync));
 
             coreRuns = await DownloadCoreRootsAsync(entries);
         }
@@ -65,22 +65,20 @@ protected override async Task RunJobCoreAsync()
                 await JitDiffJob.BuildAndCopyRuntimeBranchBitsAsync(this, "pr", uploadArtifacts: false, buildChecked: false, canSkipRebuild: false);
             }
 
-            await RuntimeHelpers.InstallRuntimeDotnetSdkAsync(this, DotnetInstallDir);
-
-            await RuntimeHelpers.InstallDotnetSdkAsync(this, "performance/global.json", DotnetInstallDir);
+            await InstallDotnetSdksAsync();
 
             coreRuns = ["artifacts-main/corerun", "artifacts-pr/corerun"];
         }
 
         await WaitForPendingTasksAsync();
 
-        try
+        await RunBenchmarksAsync(coreRuns);
+
+        async Task InstallDotnetSdksAsync()
         {
-            File.Delete("../NuGet.config");
+            await DotnetHelpers.InstallDotnetSdkAsync(this, "performance/global.json", DotnetInstallDir);
+            await DotnetHelpers.InstallDotnetDailySdkAsync(this, GetPerformanceDotnetVersion(), DotnetInstallDir);
         }
-        catch { }
-
-        await RunBenchmarksAsync(coreRuns);
     }
 
     private async Task CloneDotnetPerformanceAndSetupToolsAsync()
@@ -193,6 +191,23 @@ 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++)
@@ -229,7 +244,7 @@ private async Task RunBenchmarksAsync(string[] coreRunPaths)
             filter = $"*{filter}*";
         }
 
-        int dotnetVersion = RuntimeHelpers.GetDotnetVersion("performance");
+        int dotnetVersion = GetPerformanceDotnetVersion();
 
         string coreRuns = string.Join(' ', coreRunPaths.Select(p => $"\"{Path.GetFullPath(p)}\""));
 
@@ -386,4 +401,7 @@ await RunProcessAsync(dotnetPath,
 
     [GeneratedRegex(@"BenchmarkDotNet\.(\d.*?)\.nupkg")]
     private static partial Regex BenchmarkDotNetPackageVersionRegex();
+
+    [GeneratedRegex(@"Frameworks>((?:net\d+\.\d+);?)+<\/")]
+    private static partial Regex DotnetVersionFromCsprojRegex();
 }