Refactor CliFolderPathCalculatorCore to support environment variable injection

src/Cli/Microsoft.DotNet.Configurer/CliFolderPathCalculator.cs

@@ -46,7 +46,7 @@ public static string DotnetHomePath
         {
             get
             {
-                return CliFolderPathCalculatorCore.GetDotnetHomePath()
+                return new CliFolderPathCalculatorCore().GetDotnetHomePath()
                     ?? throw new ConfigurationException(
                             string.Format(
                                 LocalizableStrings.FailedToDetermineUserHomeDirectory,

src/Common/CliFolderPathCalculatorCore.cs

@@ -3,12 +3,31 @@
 
 namespace Microsoft.DotNet.Configurer
 {
-    static class CliFolderPathCalculatorCore
+    class CliFolderPathCalculatorCore
     {
         public const string DotnetHomeVariableName = "DOTNET_CLI_HOME";
         public const string DotnetProfileDirectoryName = ".dotnet";
 
-        public static string? GetDotnetUserProfileFolderPath()
+        private readonly Func<string, string?> _getEnvironmentVariable;
+
+        /// <summary>
+        /// Creates an instance that reads environment variables from the process environment.
+        /// </summary>
+        public CliFolderPathCalculatorCore()
+            : this(Environment.GetEnvironmentVariable)
+        {
+        }
+
+        /// <summary>
+        /// Creates an instance that reads environment variables via the supplied delegate.
+        /// Use this from MSBuild tasks to route reads through TaskEnvironment.
+        /// </summary>
+        public CliFolderPathCalculatorCore(Func<string, string?> getEnvironmentVariable)
+        {
+            _getEnvironmentVariable = getEnvironmentVariable ?? throw new ArgumentNullException(nameof(getEnvironmentVariable));
+        }
+
+        public string? GetDotnetUserProfileFolderPath()
         {
             string? homePath = GetDotnetHomePath();
             if (homePath is null)
@@ -19,9 +38,9 @@ static class CliFolderPathCalculatorCore
             return Path.Combine(homePath, DotnetProfileDirectoryName);
         }
 
-        public static string? GetDotnetHomePath()
+        public string? GetDotnetHomePath()
         {
-            var home = Environment.GetEnvironmentVariable(DotnetHomeVariableName);
+            var home = _getEnvironmentVariable(DotnetHomeVariableName);
             if (string.IsNullOrEmpty(home))
             {
                 home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
@@ -33,5 +52,6 @@ static class CliFolderPathCalculatorCore
 
             return home;
         }
+
     }
 }

src/RazorSdk/Tool/ServerCommand.cs

@@ -169,7 +169,7 @@ internal static string GetPidFilePath()
             var path = Environment.GetEnvironmentVariable("DOTNET_BUILD_PIDFILE_DIRECTORY");
             if (string.IsNullOrEmpty(path))
             {
-                var homePath = CliFolderPathCalculatorCore.GetDotnetHomePath();
+                var homePath = new CliFolderPathCalculatorCore().GetDotnetHomePath();
                 if (homePath is null)
                 {
                     // Couldn't locate the user profile directory. Bail.

src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs

@@ -308,7 +308,7 @@ private sealed class CachedState
             };
 
             //  First check if requested SDK resolves to a workload SDK pack
-            string? userProfileDir = CliFolderPathCalculatorCore.GetDotnetUserProfileFolderPath();
+            string? userProfileDir = new CliFolderPathCalculatorCore().GetDotnetUserProfileFolderPath();
             ResolutionResult? workloadResult = null;
             if (dotnetRoot is not null && netcoreSdkVersion is not null)
             {

src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/WorkloadSdkResolver.cs

@@ -62,7 +62,7 @@ private class CachedState
                 resolverContext.State = cachedState;
             }
 
-            string? userProfileDir = CliFolderPathCalculatorCore.GetDotnetUserProfileFolderPath();
+            string? userProfileDir = new CliFolderPathCalculatorCore().GetDotnetUserProfileFolderPath();
             ResolutionResult? result = null;
             if (cachedState.DotnetRootPath is not null && cachedState.SdkVersion is not null)
             {

src/Tasks/Microsoft.NET.Build.Tasks/FrameworkReferenceResolver.cs

@@ -7,12 +7,33 @@
 
 namespace Microsoft.NET.Build.Tasks
 {
-    internal static class FrameworkReferenceResolver
+    internal class FrameworkReferenceResolver
     {
-        public static string GetDefaultReferenceAssembliesPath()
+        private readonly Func<string, string> _getEnvironmentVariable;
+
+        /// <summary>
+        /// Creates an instance that reads environment variables from the process environment.
+        /// </summary>
+        public FrameworkReferenceResolver()
+            : this(Environment.GetEnvironmentVariable)
+        {
+        }
+
+        /// <summary>
+        /// Creates an instance that reads environment variables via the supplied delegate.
+        /// Use this from MSBuild tasks to route reads through TaskEnvironment.
+        /// </summary>
+        public FrameworkReferenceResolver(Func<string, string> getEnvironmentVariable)
+        {
+            _getEnvironmentVariable = getEnvironmentVariable ?? throw new ArgumentNullException(nameof(getEnvironmentVariable));
+        }
+
+        public string GetDefaultReferenceAssembliesPath()
         {
-            // Allow setting the reference assemblies path via an environment variable
-            var referenceAssembliesPath = DotNetReferenceAssembliesPathResolver.Resolve();
+            // Allow setting the reference assemblies path via an environment variable.
+            // We read this directly instead of calling DotNetReferenceAssembliesPathResolver.Resolve()
+            // because that runtime method uses process-global Environment.GetEnvironmentVariable.
+            var referenceAssembliesPath = _getEnvironmentVariable(DotNetReferenceAssembliesPathResolver.DotNetReferenceAssembliesPathEnv);
 
             if (!string.IsNullOrEmpty(referenceAssembliesPath))
             {
@@ -28,12 +49,12 @@ public static string GetDefaultReferenceAssembliesPath()
 
             // References assemblies are in %ProgramFiles(x86)% on
             // 64 bit machines
-            var programFiles = Environment.GetEnvironmentVariable("ProgramFiles(x86)");
+            var programFiles = _getEnvironmentVariable("ProgramFiles(x86)");
 
             if (string.IsNullOrEmpty(programFiles))
             {
                 // On 32 bit machines they are in %ProgramFiles%
-                programFiles = Environment.GetEnvironmentVariable("ProgramFiles");
+                programFiles = _getEnvironmentVariable("ProgramFiles");
             }
 
             if (string.IsNullOrEmpty(programFiles))

src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs

@@ -244,7 +244,7 @@ bool ShouldIncludeRuntimeAsset(ITaskItem item)
                 .WithReferenceProjectInfos(referenceProjects)
                 .WithRuntimePackAssets(runtimePackAssets)
                 .WithCompilationOptions(compilationOptions)
-                .WithReferenceAssembliesPath(FrameworkReferenceResolver.GetDefaultReferenceAssembliesPath())
+                .WithReferenceAssembliesPath(new FrameworkReferenceResolver().GetDefaultReferenceAssembliesPath())
                 .WithPackagesThatWereFiltered(GetFilteredPackages());
 
             if (CompileReferences.Length > 0)

src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs

@@ -1124,7 +1124,7 @@ IEnumerable<string> GetPackFolders()
                 if (!string.IsNullOrEmpty(NetCoreRoot) && !string.IsNullOrEmpty(NETCoreSdkVersion))
                 {
                     if (WorkloadFileBasedInstall.IsUserLocal(NetCoreRoot, NETCoreSdkVersion) &&
-                        CliFolderPathCalculatorCore.GetDotnetUserProfileFolderPath() is { } userProfileDir)
+                        new CliFolderPathCalculatorCore().GetDotnetUserProfileFolderPath() is { } userProfileDir)
                     {
                         yield return Path.Combine(userProfileDir, "packs");
                     }
@@ -1177,7 +1177,7 @@ private Lazy<WorkloadResolver> LazyCreateWorkloadResolver()
         {
             return new(() =>
         {
-                string? userProfileDir = CliFolderPathCalculatorCore.GetDotnetUserProfileFolderPath();
+                string? userProfileDir = new CliFolderPathCalculatorCore().GetDotnetUserProfileFolderPath();
 
                 //  When running MSBuild tasks, the current directory is always the project directory, so we can use that as the
                 //  starting point to search for global.json

src/Tasks/Microsoft.NET.Build.Tasks/ShowMissingWorkloads.cs

@@ -38,7 +38,7 @@ protected override void ExecuteCore()
         {
             if (MissingWorkloadPacks.Any())
             {
-                string userProfileDir = CliFolderPathCalculatorCore.GetDotnetUserProfileFolderPath();
+                string userProfileDir = new CliFolderPathCalculatorCore().GetDotnetUserProfileFolderPath();
 
                 //  When running MSBuild tasks, the current directory is always the project directory, so we can use that as the
                 //  starting point to search for global.json