Turn off Roslyn OOP for test scenarios

azure-pipelines.yml

@@ -238,6 +238,8 @@ stages:
               artifactName: $(Agent.Os)_$(Agent.JobName) BuildVSIXBinLog
               artifactType: Container
               parallel: true
+        - powershell: eng\SetupVSHive.ps1
+          displayName: Setup VS Hive
         - script: eng\CIBuild.cmd
             -configuration $(_BuildConfig)
             -prepareMachine

eng/SetupVSHive.ps1

@@ -0,0 +1,13 @@
+. $PSScriptRoot\common\tools.ps1
+
+$vsInfo = LocateVisualStudio
+if ($null -eq $vsInfo) {
+  throw "Unable to locate required Visual Studio installation"
+}
+
+$vsDir = $vsInfo.installationPath.TrimEnd("\")
+
+$vsRegEdit = Join-Path (Join-Path (Join-Path $vsDir 'Common7') 'IDE') 'VSRegEdit.exe'
+
+$hive = "RoslynDev"
+&$vsRegEdit set "$vsDir" $hive HKCU "Roslyn\Internal\OnOff\Features" OOP64Bit dword 0

eng/pipelines/test-integration-job.yml

@@ -69,6 +69,9 @@ steps:
         artifactType: Container
         parallel: true
 
+  - powershell: eng\SetupVSHive.ps1
+    displayName: Setup VS Hive
+
   - script: eng\cibuild.cmd
       -configuration ${{ parameters.configuration }}
       -msbuildEngine vs

src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/AssemblyCodeBases.cs

@@ -51,12 +51,6 @@ using Microsoft.VisualStudio.Shell;
     OldVersionLowerBound = "4.4.0.0",
     OldVersionUpperBound = "4.5.0.0",
     NewVersion = "4.5.0.0")]
-[assembly: ProvideBindingRedirection(
-    AssemblyName = "Microsoft.CodeAnalysis.ExternalAccess.FSharp",
-    GenerateCodeBase = true,
-    OldVersionLowerBound = "4.4.0.0",
-    OldVersionUpperBound = "4.5.0.0",
-    NewVersion = "4.5.0.0")]
 [assembly: ProvideBindingRedirection(
     AssemblyName = "Microsoft.CodeAnalysis.InteractiveHost",
     GenerateCodeBase = true,
@@ -87,12 +81,6 @@ using Microsoft.VisualStudio.Shell;
     OldVersionLowerBound = "4.4.0.0",
     OldVersionUpperBound = "4.5.0.0",
     NewVersion = "4.5.0.0")]
-[assembly: ProvideBindingRedirection(
-    AssemblyName = "Microsoft.CodeAnalysis.VisualBasic.Workspaces",
-    GenerateCodeBase = true,
-    OldVersionLowerBound = "4.4.0.0",
-    OldVersionUpperBound = "4.5.0.0",
-    NewVersion = "4.5.0.0")]
 [assembly: ProvideBindingRedirection(
     AssemblyName = "Microsoft.CodeAnalysis.Workspaces",
     GenerateCodeBase = true,

src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj

@@ -65,14 +65,12 @@
     <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.EditorFeatures.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.EditorFeatures.Text.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.EditorFeatures.Wpf.dll" />
-    <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.ExternalAccess.FSharp.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.ExternalAccess.Razor.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.InteractiveHost.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.Features.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.LanguageServer.Protocol.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.Remote.Workspaces.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.Workspaces.dll" />
-    <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.VisualStudio.LanguageServices.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.VisualStudio.LanguageServer.Protocol.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.VisualStudio.LanguageServer.Protocol.Extensions.dll" />