DotNetHelper: fix IsMonoRuntime being initialized before extracting t…

…he sdk. (#15646)
dotnet · Mar 14, 2023 · b672d91 · b672d91
1 parent 223e47f
commit b672d91
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs
@@ -14,13 +14,13 @@ internal class DotNetHelper
 {
     private static readonly object s_lockObj = new();
 
-    private static bool IsMonoRuntime { get; } = DetermineIsMonoRuntime();
     public static string DotNetPath { get; } = Path.Combine(Config.DotNetDirectory, "dotnet");
     public static string LogsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "logs");
     public static string PackagesDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "packages");
     public static string ProjectsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), $"projects-{DateTime.Now:yyyyMMddHHmmssffff}");
 
     private ITestOutputHelper OutputHelper { get; }
+    private bool IsMonoRuntime { get; }
 
     public DotNetHelper(ITestOutputHelper outputHelper)
     {
@@ -38,6 +38,7 @@ public DotNetHelper(ITestOutputHelper outputHelper)
                 Directory.CreateDirectory(Config.DotNetDirectory);
                 ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {Config.SdkTarballPath} -C {Config.DotNetDirectory}", outputHelper);
             }
+            IsMonoRuntime = DetermineIsMonoRuntime(Config.DotNetDirectory);
 
             if (!Directory.Exists(ProjectsDirectory))
             {
@@ -234,10 +235,8 @@ private static string GetBinLogOption(string projectName, string command, string
         return $"/bl:{Path.Combine(LogsDirectory, $"{fileName}.binlog")}";
     }
 
-    private static bool DetermineIsMonoRuntime()
+    private static bool DetermineIsMonoRuntime(string dotnetRoot)
     {
-        string dotnetRoot = Config.DotNetDirectory;
-
         string sharedFrameworkRoot = Path.Combine(dotnetRoot, "shared", "Microsoft.NETCore.App");
         if (!Directory.Exists(sharedFrameworkRoot))
         {