Skip to content

Include the contents of System.Composition in Setup.Dependencies #77451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 7, 2025
Merged

Include the contents of System.Composition in Setup.Dependencies #77451

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45c5c6a
Include the contents of System.Composition in Setup.Dependencies
jasonmalinowski Mar 6, 2025
47f9554
Sort the references
jasonmalinowski Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,22 @@
<PackageReference Include="Microsoft.Extensions.Logging.Console" IncludeInVsix="true" PkgDefEntry="BindingRedirect" />
<PackageReference Include="Microsoft.Extensions.Options" IncludeInVsix="true" PkgDefEntry="BindingRedirect" />
<PackageReference Include="Microsoft.Extensions.Primitives" IncludeInVsix="true" PkgDefEntry="BindingRedirect" />
<PackageReference Include="Microsoft.VisualStudio.Threading" IncludeInVsix="true" PkgDefEntry="BindingRedirect" />
<PackageReference Include="System.Buffers" IncludeInVsix="true" PkgDefEntry="BindingRedirect" />
<PackageReference Include="System.CodeDom" IncludeInVsix="true" PkgDefEntry="BindingRedirect" />
<PackageReference Include="System.Collections.Immutable" IncludeInVsix="true" PkgDefEntry="BindingRedirect" />
<PackageReference Include="System.Configuration.ConfigurationManager" IncludeInVsix="true" PkgDefEntry="BindingRedirect" />

<!-- Include System.Composition until the 9.0 version is included in Visual Studio. Our MSBuild support for IncludeInVsix only looks at the direct contents
of that package and doesn't include any dependencies, which is unfortunate here: System.Composition is a metapackage, and all the actual stuff is in other
packages. We workaround that here by listing all of the "real" packages. I'm using VersionOverride here rather than creating a bunch of new entries in
our Directories.props files, because eventually we can go and delete these and it keeps the hack self-contained. -->
<PackageReference Include="System.Composition.AttributedModel" IncludeInVsix="true" PkgDefEntry="BindingRedirect" VersionOverride="$(SystemCompositionVersion)" />
<PackageReference Include="System.Composition.Convention" IncludeInVsix="true" PkgDefEntry="BindingRedirect" VersionOverride="$(SystemCompositionVersion)" />
<PackageReference Include="System.Composition.Hosting" IncludeInVsix="true" PkgDefEntry="BindingRedirect" VersionOverride="$(SystemCompositionVersion)" />
<PackageReference Include="System.Composition.Runtime" IncludeInVsix="true" PkgDefEntry="BindingRedirect" VersionOverride="$(SystemCompositionVersion)" />
<PackageReference Include="System.Composition.TypedParts" IncludeInVsix="true" PkgDefEntry="BindingRedirect" VersionOverride="$(SystemCompositionVersion)" />

<PackageReference Include="System.Drawing.Common" IncludeInVsix="true" PkgDefEntry="BindingRedirect" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" IncludeInVsix="true" PkgDefEntry="BindingRedirect" />
<PackageReference Include="System.Diagnostics.EventLog" IncludeInVsix="true" PkgDefEntry="BindingRedirect" />
Expand All @@ -55,7 +67,6 @@
<PackageReference Include="System.Threading.Tasks.Extensions" IncludeInVsix="true" PkgDefEntry="BindingRedirect" />
<PackageReference Include="Nerdbank.Streams" IncludeInVsix="true" PkgDefEntry="BindingRedirect" />
<PackageReference Include="StreamJsonRpc" IncludeInVsix="true" PkgDefEntry="BindingRedirect" />
<PackageReference Include="Microsoft.VisualStudio.Threading" IncludeInVsix="true" PkgDefEntry="BindingRedirect" />
</ItemGroup>
<ItemGroup>
<None Include="source.extension.vsixmanifest">
Expand Down
Loading