From b32b88a4475b3c68c3580068229a6b0d8bfb37cf Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Thu, 27 Oct 2022 13:50:00 -0700
Subject: [PATCH] Turn off Roslyn OOP for test scenarios

---
 azure-pipelines.yml                                 |  2 ++
 eng/SetupVSHive.ps1                                 | 13 +++++++++++++
 eng/pipelines/test-integration-job.yml              |  3 +++
 .../AssemblyCodeBases.cs                            | 12 ------------
 ....VisualStudio.RazorExtension.Dependencies.csproj |  2 --
 5 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 eng/SetupVSHive.ps1

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 328036a476..574c24b339 100644
--- a/azure-pipelines.yml
+++ b/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
diff --git a/eng/SetupVSHive.ps1 b/eng/SetupVSHive.ps1
new file mode 100644
index 0000000000..d63bcb14d9
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/eng/pipelines/test-integration-job.yml b/eng/pipelines/test-integration-job.yml
index 42df28a1d5..38762868aa 100644
--- a/eng/pipelines/test-integration-job.yml
+++ b/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
diff --git a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/AssemblyCodeBases.cs b/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/AssemblyCodeBases.cs
index f991dd6470..d8a5bf1315 100644
--- a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/AssemblyCodeBases.cs
+++ b/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,
diff --git a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj b/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj
index bacf8669a8..ec2cfd078f 100644
--- a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj
+++ b/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" />