Check for dotnet in DOTNET_INSTALL_DIR

microsoft · Feb 9, 2024 · 8374610 · 8374610
1 parent 9b74678
commit 8374610
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/test/Microsoft.Build.Sql.Tests/TestUtils.cs b/test/Microsoft.Build.Sql.Tests/TestUtils.cs
@@ -10,6 +10,7 @@ namespace Microsoft.Build.Sql.Tests
     public static class TestUtils
     {
         private const string DotnetToolPathEnvironmentVariable = "DOTNET_TOOL_PATH";
+        private const string DotnetInstallDirEnvironmentVariable = "DOTNET_INSTALL_DIR";
 
         /// <summary>
         /// Returns the full path to the dotnet executable based on the current operating system.
@@ -18,7 +19,7 @@ public static class TestUtils
         public static string GetDotnetPath()
         {
             string dotnetExecutable = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "dotnet.exe" : "dotnet";
-            string? dotnetPath = Environment.GetEnvironmentVariable(DotnetToolPathEnvironmentVariable);
+            string? dotnetPath = Environment.GetEnvironmentVariable(DotnetToolPathEnvironmentVariable) ?? Environment.GetEnvironmentVariable(DotnetInstallDirEnvironmentVariable);
             if (string.IsNullOrEmpty(dotnetPath))
             {
                 // Determine OS specific dotnet installation path
@@ -73,4 +74,4 @@ public static void CopyDirectoryRecursive(string sourceDirectoryPath, string tar
             }
         }
     }
-}
+}