From a96b7c8827d61a9a484cb60e2d01534e937076c1 Mon Sep 17 00:00:00 2001
From: Drew Noakes <git@drewnoakes.com>
Date: Thu, 31 Aug 2023 20:13:56 +1000
Subject: [PATCH] Re-enable Build Acceleration within the solution

When Build Acceleration observes the Microsoft.VSSDK.BuildTools package in the project, it disables itself out of caution, as VSIX projects cannot be accelerated (they must call MSBuild in order to pack the VSIX).

In our solution we were adding this VSSDK package to every project, effectively disabling it entirely within the solution.

This change removes it from VisualStudio.props and adds it only to the VSIX project files themselves.
---
 eng/imports/VisualStudio.props                                | 3 ---
 setup/ProjectSystemSetup/ProjectSystemSetup.csproj            | 4 ++++
 .../VisualStudioEditorsSetup/VisualStudioEditorsSetup.csproj  | 4 ++++
 .../Microsoft.VisualStudio.Editors.vbproj                     | 4 ++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/eng/imports/VisualStudio.props b/eng/imports/VisualStudio.props
index 80c7c48594f..e1fce5d9bc6 100644
--- a/eng/imports/VisualStudio.props
+++ b/eng/imports/VisualStudio.props
@@ -19,9 +19,6 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
-    
-    <!-- Infrastructure -->
-    <PackageReference Include="Microsoft.VSSDK.BuildTools"     PrivateAssets="all" />
 
     <!-- VS SDK -->
     <PackageReference Include="Microsoft.Internal.VisualStudio.Interop" />
diff --git a/setup/ProjectSystemSetup/ProjectSystemSetup.csproj b/setup/ProjectSystemSetup/ProjectSystemSetup.csproj
index 8bfc0729ffd..a54cf69dd3a 100644
--- a/setup/ProjectSystemSetup/ProjectSystemSetup.csproj
+++ b/setup/ProjectSystemSetup/ProjectSystemSetup.csproj
@@ -26,6 +26,10 @@
     <VsixManifestPackageId>$(_ManagedProjectName)</VsixManifestPackageId>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" PrivateAssets="all" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Include="UnifiedSettings\ManagedProjectSystem.registration.json">
       <IncludeInVSIX>true</IncludeInVSIX>
diff --git a/setup/VisualStudioEditorsSetup/VisualStudioEditorsSetup.csproj b/setup/VisualStudioEditorsSetup/VisualStudioEditorsSetup.csproj
index 34fdfd04375..cd0d9740911 100644
--- a/setup/VisualStudioEditorsSetup/VisualStudioEditorsSetup.csproj
+++ b/setup/VisualStudioEditorsSetup/VisualStudioEditorsSetup.csproj
@@ -24,6 +24,10 @@
     <VsixManifestPackageId>$(_EditorsProjectName)</VsixManifestPackageId>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" PrivateAssets="all" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.VisualStudio.AppDesigner\Microsoft.VisualStudio.AppDesigner.vbproj">
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;SatelliteDllsProjectOutputGroup</IncludeOutputGroupsInVSIX>
diff --git a/src/Microsoft.VisualStudio.Editors/Microsoft.VisualStudio.Editors.vbproj b/src/Microsoft.VisualStudio.Editors/Microsoft.VisualStudio.Editors.vbproj
index 64600e20678..f06415f2742 100644
--- a/src/Microsoft.VisualStudio.Editors/Microsoft.VisualStudio.Editors.vbproj
+++ b/src/Microsoft.VisualStudio.Editors/Microsoft.VisualStudio.Editors.vbproj
@@ -22,6 +22,10 @@
     <RootNamespace />
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" PrivateAssets="all" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" />
   </ItemGroup>