Skip to content
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

[release/5.0] Add Microsoft StrongNameKey back to System.Composition* #45757

Merged
merged 4 commits into from
Dec 11, 2020
Merged

[release/5.0] Add Microsoft StrongNameKey back to System.Composition* #45757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fb53d6
Add Microsoft StrongNameKey back to System.Composition*
ViktorHofer Dec 8, 2020
4f0e4c9
Increment package version for System.Composition*
ViktorHofer Dec 11, 2020
fffcd12
Merge remote-tracking branch 'upstream/release/5.0' into backport/pr-…
ViktorHofer Dec 11, 2020
711d57f
Add System.Composition to list for packages to build
ViktorHofer Dec 11, 2020
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
8 changes: 6 additions & 2 deletions src/libraries/System.Composition/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<Project>
<Project>
<Import Project="..\Directory.Build.props" />
</Project>
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<PackageVersion>5.0.1</PackageVersion>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions src/libraries/libraries-packages.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\**\*.pkgproj" Condition="('$(BuildAllConfigurations)' == 'true' or '$(DotNetBuildFromSource)' == 'true') And '$(BuildAllOOBPackages)' == 'true'" />
<!-- If setting BuildAllOOBPackages to false, add bellow the individual OOB packages you want to continue to build -->
<ProjectReference Include="$(LibrariesProjectRoot)\System.Text.Json\pkg\System.Text.Json.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
<ProjectReference Include="$(LibrariesProjectRoot)\System.Composition*\pkg\System.Composition*.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
</ItemGroup>

<!-- Need the PackageIndexFile file property from baseline.props -->
Expand Down