[release/6.0.4xx] Update dependencies from dotnet/msbuild#25507
Merged
v-wuzhai merged 6 commits intorelease/6.0.4xxfrom May 30, 2022
Merged
Conversation
…0518.2 Microsoft.Build.Localization , Microsoft.Build From Version 17.3.0-preview-22266-03 -> To Version 17.3.0-preview-22268-02
ghost
added
the
To match MSBuild's update from dotnet/msbuild#7629. Also removed redundant version for System.Security.Cryptography.ProtectedData that caused downgrades.
rainersigwald
force-pushed
the
darc-release/6.0.4xx-25fed7ac-59e6-49d9-8256-0c2cb5312529
branch
from
0d6eca7 to
bf38d57
Compare
Member
|
Same issue with System.Reflection.Metadata update as #25483. |
For .NET Framework task builds, use the SCI+SRM 5.0 instead of 6, because 6 is not included in MSBuild 17.2 and lower's binding redirects. On new MSBuild, everything gets binding redirected to 6.0.0.0 and is fine. On older ones, the 1.x references from within HostModel get redirected to 5.0, but the references within the task assembly itself were 6.0 (because of references in this project). Both are loadable side-by-side in the .NET Framework model, but they are incompatible types. Instead, compile this assembly against 5.0 versions, and apply the manual binding redirect to 5.0 assemblies redistributed next to the task assembly via `TaskWithAssemblyResolveHooks`. Since the MSBuild packages now use 6.0, this requires some gymnastics: 1. explicitly reference the 6.0 packages in this project, so they can be annotated with `IncludeAssets="none"`. 2. download + explicitly reference the 5.0 packages _after_ RAR runs, to avoid the assembly-mismatch errors that RAR would generate. 3. explicitly copy SRM and SCI into the output folder.
rainersigwald
force-pushed
the
darc-release/6.0.4xx-25fed7ac-59e6-49d9-8256-0c2cb5312529
branch
from
71b46ca to
66826cc
Compare
Member
|
@dsplaisted Ok, I think my changes are ready for review. It's the best I could come up with to keep 6.0.400 working on MSBuild 17.2, but I'd love to not have to mess with things in this way. Ideas welcome! After this is approved/redone, I'll port to main. |
…0526.1 Microsoft.Build , Microsoft.Build.Localization From Version 17.3.0-preview-22266-03 -> To Version 17.3.0-preview-22276-01
Member
|
I assume we'll need those changes in main as well. |
…0526.2 Microsoft.Build , Microsoft.Build.Localization From Version 17.3.0-preview-22266-03 -> To Version 17.3.0-preview-22276-02
…0527.1 Microsoft.Build , Microsoft.Build.Localization From Version 17.3.0-preview-22266-03 -> To Version 17.3.0-preview-22277-01
v-wuzhai
approved these changes
May 30, 2022
v-wuzhai
deleted the
darc-release/6.0.4xx-25fed7ac-59e6-49d9-8256-0c2cb5312529
branch
dsplaisted
reviewed
May 30, 2022
Comment on lines
+77
to
+78
| <PackageDownload Include="System.Collections.Immutable" Version="[5.0.0]" GeneratePathProperty="true" /> | ||
| <PackageDownload Include="System.Reflection.Metadata" Version="[5.0.0]" GeneratePathProperty="true" /> |
Member
There was a problem hiding this comment.
Looks like you're not using the properties generated by GeneratePathProperty below. Was that intentional?
Member
There was a problem hiding this comment.
IIRC it didn't actually produce the properties as I expected. In which case I probably should have removed the attributes here.
This was referenced Jun 17, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request updates the following dependencies
From https://github.com/dotnet/msbuild