Avoid potential NRE (#29128)

dotnet · Nov 18, 2022 · 6bc8daf · 6bc8daf
1 parent 19ebb6c
commit 6bc8daf
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs
@@ -307,8 +307,12 @@ private void ConfigureExecutable(DotNetWatchContext context, ProcessSpec process
                 processSpec.EnvironmentVariables["ASPNETCORE_URLS"] = context.LaunchSettingsProfile.ApplicationUrl;
             }
 
-            var rootVariableName = Environment.Is64BitProcess ? "DOTNET_ROOT" : "DOTNET_ROOT(x86)";
-            if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable(rootVariableName)))
+            var rootVariableName = EnvironmentVariableNames.TryGetDotNetRootVariableName(
+                project.RuntimeIdentifier ?? "",
+                project.DefaultAppHostRuntimeIdentifier ?? "",
+                project.TargetFrameworkVersion);
+
+            if (rootVariableName != null && string.IsNullOrEmpty(Environment.GetEnvironmentVariable(rootVariableName)))
             {
                 processSpec.EnvironmentVariables[rootVariableName] = Path.GetDirectoryName(_muxerPath);
             }