rename host key to _EXPERIMENTAL suffix

baronfel · vseanreesermsft · commit 843734df4574 · 2025-01-23T12:23:30.000-08:00
diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
@@ -23,15 +23,15 @@ public sealed class DotNetMSBuildSdkResolver : SdkResolver
     {
         public override string Name => "Microsoft.DotNet.MSBuildSdkResolver";
 
-        // Default resolver has priority 10000 and we want to go before it and leave room on either side of us. 
+        // Default resolver has priority 10000 and we want to go before it and leave room on either side of us.
         public override int Priority => 5000;
 
         private readonly Func<string, string?> _getEnvironmentVariable;
         private readonly Func<string>? _getCurrentProcessPath;
         private readonly Func<string, string, string?> _getMsbuildRuntime;
         private readonly NETCoreSdkResolver _netCoreSdkResolver;
 
-        private const string DotnetHost = "DOTNET_HOST_PATH";
+        private const string DotnetHostExperimentalKey = "DOTNET_EXPERIMENTAL_HOST_PATH";
         private const string MSBuildTaskHostRuntimeVersion = "SdkResolverMSBuildTaskHostRuntimeVersion";
 
         private static CachingWorkloadResolver _staticWorkloadResolver = new();
@@ -201,11 +201,11 @@ private sealed class CachedState
                 if (File.Exists(dotnetExe))
                 {
                     propertiesToAdd ??= new Dictionary<string, string?>();
-                    propertiesToAdd.Add(DotnetHost, dotnetExe);
+                    propertiesToAdd.Add(DotnetHostExperimentalKey, dotnetExe);
                 }
                 else
                 {
-                    logger?.LogMessage($"Could not set '{DotnetHost}' because dotnet executable '{dotnetExe}' does not exist.");
+                    logger?.LogMessage($"Could not set '{DotnetHostExperimentalKey}' because dotnet executable '{dotnetExe}' does not exist.");
                 }
 
                 string? runtimeVersion = dotnetRoot != null ?
diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs
@@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
 {
     public class GivenAnMSBuildSdkResolver : SdkTest
     {
-        private const string DotnetHost = "DOTNET_HOST_PATH";
+        private const string DotnetHostExperimentalKey = "DOTNET_EXPERIMENTAL_HOST_PATH";
         private const string MSBuildTaskHostRuntimeVersion = "SdkResolverMSBuildTaskHostRuntimeVersion";
 
         public GivenAnMSBuildSdkResolver(ITestOutputHelper logger) : base(logger)
@@ -206,7 +206,7 @@ public void ItReturnsHighestSdkAvailableThatIsCompatibleWithMSBuild(bool disallo
             {
                 // DotnetHost is the path to dotnet.exe. Can be only on Windows.
                 result.PropertiesToAdd.Count.Should().Be(2);
-                result.PropertiesToAdd.Should().ContainKey(DotnetHost);          
+                result.PropertiesToAdd.Should().ContainKey(DotnetHostExperimentalKey);
             }
             else
             {
@@ -291,7 +291,7 @@ public void ItReturnsHighestSdkAvailableThatIsCompatibleWithMSBuildWhenVersionIn
             {
                 // DotnetHost is the path to dotnet.exe. Can be only on Windows.
                 result.PropertiesToAdd.Count.Should().Be(4);
-                result.PropertiesToAdd.Should().ContainKey(DotnetHost);
+                result.PropertiesToAdd.Should().ContainKey(DotnetHostExperimentalKey);
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,15 @@ public sealed class DotNetMSBuildSdkResolver : SdkResolver`
`23`	`23`	`{`
`24`	`24`	`public override string Name => "Microsoft.DotNet.MSBuildSdkResolver";`
`25`	`25`
`26`		`- // Default resolver has priority 10000 and we want to go before it and leave room on either side of us.`
	`26`	`+ // Default resolver has priority 10000 and we want to go before it and leave room on either side of us.`
`27`	`27`	`public override int Priority => 5000;`
`28`	`28`
`29`	`29`	`private readonly Func<string, string?> _getEnvironmentVariable;`
`30`	`30`	`private readonly Func<string>? _getCurrentProcessPath;`
`31`	`31`	`private readonly Func<string, string, string?> _getMsbuildRuntime;`
`32`	`32`	`private readonly NETCoreSdkResolver _netCoreSdkResolver;`
`33`	`33`
`34`		`- private const string DotnetHost = "DOTNET_HOST_PATH";`
	`34`	`+ private const string DotnetHostExperimentalKey = "DOTNET_EXPERIMENTAL_HOST_PATH";`
`35`	`35`	`private const string MSBuildTaskHostRuntimeVersion = "SdkResolverMSBuildTaskHostRuntimeVersion";`
`36`	`36`
`37`	`37`	`private static CachingWorkloadResolver _staticWorkloadResolver = new();`
`@@ -201,11 +201,11 @@ private sealed class CachedState`
`201`	`201`	`if (File.Exists(dotnetExe))`
`202`	`202`	`{`
`203`	`203`	`propertiesToAdd ??= new Dictionary<string, string?>();`
`204`		`- propertiesToAdd.Add(DotnetHost, dotnetExe);`
	`204`	`+ propertiesToAdd.Add(DotnetHostExperimentalKey, dotnetExe);`
`205`	`205`	`}`
`206`	`206`	`else`
`207`	`207`	`{`
`208`		`- logger?.LogMessage($"Could not set '{DotnetHost}' because dotnet executable '{dotnetExe}' does not exist.");`
	`208`	`+ logger?.LogMessage($"Could not set '{DotnetHostExperimentalKey}' because dotnet executable '{dotnetExe}' does not exist.");`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`string? runtimeVersion = dotnetRoot != null ?`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests`
`13`	`13`	`{`
`14`	`14`	`public class GivenAnMSBuildSdkResolver : SdkTest`
`15`	`15`	`{`
`16`		`- private const string DotnetHost = "DOTNET_HOST_PATH";`
	`16`	`+ private const string DotnetHostExperimentalKey = "DOTNET_EXPERIMENTAL_HOST_PATH";`
`17`	`17`	`private const string MSBuildTaskHostRuntimeVersion = "SdkResolverMSBuildTaskHostRuntimeVersion";`
`18`	`18`
`19`	`19`	`public GivenAnMSBuildSdkResolver(ITestOutputHelper logger) : base(logger)`
`@@ -206,7 +206,7 @@ public void ItReturnsHighestSdkAvailableThatIsCompatibleWithMSBuild(bool disallo`
`206`	`206`	`{`
`207`	`207`	`// DotnetHost is the path to dotnet.exe. Can be only on Windows.`
`208`	`208`	`result.PropertiesToAdd.Count.Should().Be(2);`
`209`		`- result.PropertiesToAdd.Should().ContainKey(DotnetHost);`
	`209`	`+ result.PropertiesToAdd.Should().ContainKey(DotnetHostExperimentalKey);`
`210`	`210`	`}`
`211`	`211`	`else`
`212`	`212`	`{`
`@@ -291,7 +291,7 @@ public void ItReturnsHighestSdkAvailableThatIsCompatibleWithMSBuildWhenVersionIn`
`291`	`291`	`{`
`292`	`292`	`// DotnetHost is the path to dotnet.exe. Can be only on Windows.`
`293`	`293`	`result.PropertiesToAdd.Count.Should().Be(4);`
`294`		`- result.PropertiesToAdd.Should().ContainKey(DotnetHost);`
	`294`	`+ result.PropertiesToAdd.Should().ContainKey(DotnetHostExperimentalKey);`
`295`	`295`	`}`
`296`	`296`	`else`
`297`	`297`	`{`