Merge pull request #57252 from dotnet/merges/release/dev17.0-to-relea…

…se/dev17.0-vs-deps Merge release/dev17.0 to release/dev17.0-vs-deps
dotnet · Oct 20, 2021 · 3a0930f · 3a0930f
2 parents 711bb9f + b3cb966
commit 3a0930f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/Workspaces/Remote/Core/ExternalAccess/UnitTesting/Api/UnitTestingRemoteHostClient.cs b/src/Workspaces/Remote/Core/ExternalAccess/UnitTesting/Api/UnitTestingRemoteHostClient.cs
@@ -36,7 +36,7 @@ internal UnitTestingRemoteHostClient(ServiceHubRemoteHostClient client, UnitTest
         public static bool IsServiceHubProcessCoreClr(HostWorkspaceServices services)
         {
             var optionServices = services.GetRequiredService<IOptionService>();
-            return optionServices.GetOption(RemoteHostOptions.OOPCoreClr) || optionServices.GetOption(RemoteHostOptions.OOPCoreClrFeatureFlag);
+            return optionServices.GetOption(RemoteHostOptions.OOPCoreClrFeatureFlag);
         }
 
         public UnitTestingRemoteServiceConnectionWrapper<TService> CreateConnection<TService>(object? callbackTarget) where TService : class

diff --git a/src/Workspaces/Remote/Core/RemoteHostOptions.cs b/src/Workspaces/Remote/Core/RemoteHostOptions.cs
@@ -45,20 +45,15 @@ internal sealed class RemoteHostOptions : IOptionProvider
             new FeatureFlagStorageLocation("Roslyn.OOPServerGC"));
 
         // use coreclr host for OOP
-        public static readonly Option2<bool> OOPCoreClr = new(
-            FeatureName, nameof(OOPCoreClr), defaultValue: false,
-            storageLocation: new LocalUserProfileStorageLocation(LocalRegistryPath + nameof(OOPCoreClr)));
-
         public static readonly Option<bool> OOPCoreClrFeatureFlag = new(
-            FeatureName, nameof(OOPCoreClr), defaultValue: false,
-            new FeatureFlagStorageLocation("Roslyn.OOPCoreClr"));
+            FeatureName, nameof(OOPCoreClrFeatureFlag), defaultValue: false,
+            new FeatureFlagStorageLocation("Roslyn.ServiceHubCore"));
 
         ImmutableArray<IOption> IOptionProvider.Options { get; } = ImmutableArray.Create<IOption>(
             SolutionChecksumMonitorBackOffTimeSpanInMS,
             OOP64Bit,
             OOPServerGC,
             OOPServerGCFeatureFlag,
-            OOPCoreClr,
             OOPCoreClrFeatureFlag);
 
         [ImportingConstructor]
@@ -77,7 +72,7 @@ public static bool IsUsingServiceHubOutOfProcess(IGlobalOptionService globalOpti
             => Environment.Is64BitOperatingSystem && globalOptions.GetOption(OOP64Bit);
 
         public static bool IsServiceHubProcessCoreClr(IGlobalOptionService globalOptions)
-            => globalOptions.GetOption(OOPCoreClr) || globalOptions.GetOption(OOPCoreClrFeatureFlag);
+            => globalOptions.GetOption(OOPCoreClrFeatureFlag);
 
         public static bool IsCurrentProcessRunningOnCoreClr()
             => !RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework") &&