[build] Force cake to use our .NET SDK

AndreyAkinshin · AndreyAkinshin · commit 65de55d25e39 · 2023-11-15T12:59:09.000+01:00
diff --git a/build/BenchmarkDotNet.Build/BuildContext.cs b/build/BenchmarkDotNet.Build/BuildContext.cs
@@ -29,6 +29,7 @@ public class BuildContext : FrostingContext
     public DirectoryPath BuildDirectory { get; }
     public DirectoryPath ArtifactsDirectory { get; }
 
+    public FilePath ToolPath { get; }
     public FilePath SolutionFile { get; }
     public FilePath TemplatesTestsProjectFile { get; }
     public FilePathCollection AllPackableSrcProjects { get; }
@@ -59,7 +60,8 @@ public BuildContext(ICakeContext context)
         BuildDirectory = RootDirectory.Combine("build");
         ArtifactsDirectory = RootDirectory.Combine("artifacts");
 
-
+        var toolExecutable = context.IsRunningOnWindows() ? "dotnet.exe" : "dotnet";
+        ToolPath = RootDirectory.Combine(".dotnet").CombineWithFilePath(toolExecutable);
         SolutionFile = RootDirectory.CombineWithFilePath("BenchmarkDotNet.sln");
 
         TemplatesTestsProjectFile = RootDirectory.Combine("templates")
diff --git a/build/BenchmarkDotNet.Build/Runners/BuildRunner.cs b/build/BenchmarkDotNet.Build/Runners/BuildRunner.cs
@@ -24,7 +24,9 @@ public void Restore()
         context.DotNetRestore(context.SolutionFile.FullPath,
             new DotNetRestoreSettings
             {
-                MSBuildSettings = context.MsBuildSettingsRestore
+                MSBuildSettings = context.MsBuildSettingsRestore,
+                Verbosity = DotNetVerbosity.Normal,
+                ToolPath = context.ToolPath
             });
     }
 
@@ -37,7 +39,8 @@ public void Build()
             DiagnosticOutput = true,
             MSBuildSettings = context.MsBuildSettingsBuild,
             Configuration = context.BuildConfiguration,
-            Verbosity = context.BuildVerbosity
+            Verbosity = context.BuildVerbosity,
+            ToolPath = context.ToolPath
         });
     }
 
@@ -49,7 +52,8 @@ public void BuildProjectSilent(FilePath projectFile)
             DiagnosticOutput = false,
             MSBuildSettings = context.MsBuildSettingsBuild,
             Configuration = context.BuildConfiguration,
-            Verbosity = DotNetVerbosity.Quiet
+            Verbosity = DotNetVerbosity.Quiet,
+            ToolPath = context.ToolPath
         });
     }
 
@@ -62,7 +66,8 @@ public void Pack()
             OutputDirectory = context.ArtifactsDirectory,
             ArgumentCustomization = args => args.Append("--include-symbols").Append("-p:SymbolPackageFormat=snupkg"),
             MSBuildSettings = context.MsBuildSettingsPack,
-            Configuration = context.BuildConfiguration
+            Configuration = context.BuildConfiguration,
+            ToolPath = context.ToolPath
         };
 
         foreach (var project in context.AllPackableSrcProjects)
@@ -72,7 +77,8 @@ public void Pack()
         {
             OutputDirectory = context.ArtifactsDirectory,
             MSBuildSettings = context.MsBuildSettingsPack,
-            Configuration = context.BuildConfiguration
+            Configuration = context.BuildConfiguration,
+            ToolPath = context.ToolPath
         };
         context.DotNetPack(context.TemplatesTestsProjectFile.FullPath, settingsTemplate);
     }
diff --git a/build/BenchmarkDotNet.Build/Runners/ReleaseRunner.cs b/build/BenchmarkDotNet.Build/Runners/ReleaseRunner.cs
@@ -112,7 +112,8 @@ private void PushNupkg()
         {
             ApiKey = nuGetToken,
             SymbolApiKey = nuGetToken,
-            Source = "https://api.nuget.org/v3/index.json"
+            Source = "https://api.nuget.org/v3/index.json",
+            ToolPath = context.ToolPath
         };
 
         foreach (var file in files)
diff --git a/build/BenchmarkDotNet.Build/Runners/UnitTestRunner.cs b/build/BenchmarkDotNet.Build/Runners/UnitTestRunner.cs
@@ -42,7 +42,8 @@ private DotNetTestSettings GetTestSettingsParameters(FilePath logFile, string tf
             EnvironmentVariables =
             {
                 ["Platform"] = "" // force the tool to not look for the .dll in platform-specific directory
-            }
+            },
+            ToolPath = context.ToolPath
         };
         return settings;
     }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,8 @@ private void PushNupkg()`
`112`	`112`	`{`
`113`	`113`	`ApiKey = nuGetToken,`
`114`	`114`	`SymbolApiKey = nuGetToken,`
`115`		`- Source = "https://api.nuget.org/v3/index.json"`
	`115`	`+ Source = "https://api.nuget.org/v3/index.json",`
	`116`	`+ ToolPath = context.ToolPath`
`116`	`117`	`};`
`117`	`118`
`118`	`119`	`foreach (var file in files)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,8 @@ private DotNetTestSettings GetTestSettingsParameters(FilePath logFile, string tf`
`42`	`42`	`EnvironmentVariables =`
`43`	`43`	`{`
`44`	`44`	`["Platform"] = "" // force the tool to not look for the .dll in platform-specific directory`
`45`		`- }`
	`45`	`+ },`
	`46`	`+ ToolPath = context.ToolPath`
`46`	`47`	`};`
`47`	`48`	`return settings;`
`48`	`49`	`}`