Update dotnet.cake

Update dotnet.cake Set env variables before build device tests Update DotnetInternal.cs Update dotnet.cake
dotnet · Feb 2, 2024 · 0fa8b78 · 0fa8b78
1 parent 70dff82
commit 0fa8b78
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 17 deletions.
diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake
@@ -543,16 +543,17 @@ Dictionary<string, string> GetDotNetEnvironmentVariables()
 
 }
 
-void SetDotNetEnvironmentVariables()
+void SetDotNetEnvironmentVariables(string dotnetDir = null)
 {
-    var dotnet = MakeAbsolute(Directory("./bin/dotnet/")).ToString();
+    var dotnet = dotnetDir ?? MakeAbsolute(Directory("./bin/dotnet/")).ToString();
 
     SetEnvironmentVariable("VSDebugger_ValidateDotnetDebugLibSignatures", "0");
     SetEnvironmentVariable("DOTNET_INSTALL_DIR", dotnet);
     SetEnvironmentVariable("DOTNET_ROOT", dotnet);
     SetEnvironmentVariable("DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR", dotnet);
     SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0");
     SetEnvironmentVariable("MSBuildEnableWorkloadResolver", "true");
+    SetEnvironmentVariable("ForceNet8Current", "true");
     SetEnvironmentVariable("PATH", dotnet, prepend: true);
 
     // Get "full" .binlog in Project System Tools

diff --git a/eng/cake/helpers.cake b/eng/cake/helpers.cake
@@ -92,18 +92,6 @@ public void PrintEnvironmentVariables()
     };
 }
 
-void SetDotNetEnvironmentVariables(string dotnetDir)
-{
-    var dotnet = dotnetDir ?? MakeAbsolute(Directory("./bin/dotnet/")).ToString();
-
-    SetEnvironmentVariable("DOTNET_INSTALL_DIR", dotnet);
-    SetEnvironmentVariable("DOTNET_ROOT", dotnet);
-    SetEnvironmentVariable("DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR", dotnet);
-    SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0");
-    SetEnvironmentVariable("MSBuildEnableWorkloadResolver", "true");
-    SetEnvironmentVariable("PATH", dotnet, prepend: true);
-}
-
 void SetEnvironmentVariable(string name, string value, bool prepend = false)
 {
     var target = EnvironmentVariableTarget.Process;

diff --git a/eng/devices/android.cake b/eng/devices/android.cake
@@ -174,6 +174,7 @@ Task("Build")
 	.WithCriteria(!string.IsNullOrEmpty(PROJECT.FullPath))
 	.Does(() =>
 {
+	SetDotNetEnvironmentVariables();
 	var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
 	var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-android--{DateTime.UtcNow.ToFileTimeUtc()}.binlog";
 

diff --git a/eng/devices/catalyst.cake b/eng/devices/catalyst.cake
@@ -68,6 +68,8 @@ Task("Build")
 	.WithCriteria(!string.IsNullOrEmpty(PROJECT.FullPath))
 	.Does(() =>
 {
+	SetDotNetEnvironmentVariables();
+	
 	var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
 	var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-catalyst.binlog";
 
@@ -111,17 +113,16 @@ Task("Test")
 	Information("Test Results Directory: {0}", TEST_RESULTS);
 
 	if (!IsCIBuild())
+	{
 		CleanDirectories(TEST_RESULTS);
+	}
 	else
 	{
 		// Because we retry on CI we don't want to delete the previous failures
 		// We want to publish those files for reference
 		DeleteFiles(Directory(TEST_RESULTS).Path.Combine("*.*").FullPath);
-
-		//SetDotNetEnvironmentVariables("/Users/runner/hostedtoolcache/dotnet");
 	}
 
-
 	var settings = new DotNetToolSettings {
 		DiagnosticOutput = true,
 		ToolPath = DOTNET_TOOL_PATH,

diff --git a/eng/devices/ios.cake b/eng/devices/ios.cake
@@ -130,6 +130,8 @@ Task("Build")
 	.WithCriteria(!string.IsNullOrEmpty(PROJECT.FullPath))
 	.Does(() =>
 {
+	SetDotNetEnvironmentVariables();
+	
 	var name = System.IO.Path.GetFileNameWithoutExtension(PROJECT.FullPath);
 	var binlog = $"{BINLOG_DIR}/{name}-{CONFIGURATION}-ios.binlog";
 	

diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/Utilities/DotnetInternal.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/Utilities/DotnetInternal.cs
@@ -108,6 +108,7 @@ public static string RunForOutput(string command, string args, out int exitCode,
 			var pinfo = new ProcessStartInfo(DotnetTool, $"{command} {args}");
 			pinfo.EnvironmentVariables["DOTNET_MULTILEVEL_LOOKUP"] = "0";
 			pinfo.EnvironmentVariables["DOTNET_ROOT"] = DotnetRoot;
+			pinfo.EnvironmentVariables["ForceNet8Current"] = "true";
 
 			return ToolRunner.Run(pinfo, out exitCode, timeoutInSeconds: timeoutInSeconds);
 		}