Skip to content

Commit 3dba762

Browse files
Ensure we deploy the build hosts in Roslyn.VisualStudio.Setup (#76747)
Without this, Microsoft.CodeAnalysis.Workspaces.MSBuild.dll itself is deployed, but will fail to work since it can't find any build hosts deployed alongside the DLL. Fixes #73854
2 parents dd63881 + dfd0a2a commit 3dba762

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj

+8-1
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,17 @@
168168
</ProjectReference>
169169
<ProjectReference Include="..\..\Workspaces\MSBuild\Core\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj">
170170
<Name>Workspaces.MSBuild</Name>
171-
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;SatelliteDllsProjectOutputGroup</IncludeOutputGroupsInVSIX>
171+
<!-- Make sure we include ContentFilesProjectOutputGroup so we get the BuildHosts deployed into the VSIX -->
172+
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;SatelliteDllsProjectOutputGroup;ContentFilesProjectOutputGroup</IncludeOutputGroupsInVSIX>
172173
<ForceIncludeInVSIX>true</ForceIncludeInVSIX>
173174
<AdditionalProperties>TargetFramework=net472</AdditionalProperties>
174175
<PkgDefEntry>BindingRedirect</PkgDefEntry>
176+
177+
<!-- Disable ngen. If we don't set this, ngen is enabled for all binaries coming from this ProjectReference, which includes the build hosts coming in as content.
178+
That doesn't make sense to do for the .NET Core build host (since ngen isn't supported there), and without extra configuation to specify the correct set
179+
of binding redirects, it probably won't be useful for the .NET Framework one in practice. Customer use of MSBuildWorkspace inside Visual Studio is rare as it is;
180+
so while we could try to do a bunch of extra MSBuild trickery to get the right ngen attributes to the right binaries, it's just far easier to turn it off. -->
181+
<Ngen>false</Ngen>
175182
</ProjectReference>
176183
<ProjectReference Include="..\..\Workspaces\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj">
177184
<Name>CSharpWorkspace</Name>

0 commit comments

Comments
 (0)