Skip to content

[release/7.0.1xx-preview5] Update dependencies from dotnet/msbuild#25668

Merged
dotnet-maestro[bot] merged 7 commits intorelease/7.0.1xx-preview5from
darc-release/7.0.1xx-preview5-badb5788-f9ad-41f6-9c5a-ebd3a4d16e7a
Jun 1, 2022
Merged

[release/7.0.1xx-preview5] Update dependencies from dotnet/msbuild#25668
dotnet-maestro[bot] merged 7 commits intorelease/7.0.1xx-preview5from
darc-release/7.0.1xx-preview5-badb5788-f9ad-41f6-9c5a-ebd3a4d16e7a

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

@dotnet-maestro dotnet-maestro Bot commented May 26, 2022

This pull request updates the following dependencies

From https://github.com/dotnet/msbuild

  • Subscription: f8bd70e0-b284-41b6-50e9-08da3ed49769
  • Build: 20220527.1
  • Date Produced: May 27, 2022 3:47:46 PM UTC
  • Commit: f1dae6ab690483458d37b8900f1d1e4a5fc72851
  • Branch: refs/heads/main

…0526.2

Microsoft.Build , Microsoft.Build.Localization
 From Version 17.3.0-preview-22263-02 -> To Version 17.3.0-preview-22276-02
@ghost ghost added the Area-CodeFlow label May 26, 2022
…0527.1

Microsoft.Build , Microsoft.Build.Localization
 From Version 17.3.0-preview-22263-02 -> To Version 17.3.0-preview-22277-01
@gkulin
Copy link
Copy Markdown
Contributor

gkulin commented May 31, 2022

@rainersigwald @Forgind it looks like this is failing some tests. Can you take a look?

@Forgind
Copy link
Copy Markdown
Contributor

Forgind commented May 31, 2022

This is a kitten thing. @rokonec commented that:
Probably linked to #25507 which might need to be cherry picked into main and release/7.0.1xx-preview5

To match MSBuild's update from dotnet/msbuild#7629.

Also removed redundant version for
System.Security.Cryptography.ProtectedData that caused downgrades.
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.
Comment thread eng/Versions.props Outdated
<NewtonsoftJsonVersion>$(NewtonsoftJsonPackageVersion)</NewtonsoftJsonVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
<SystemReflectionMetadataVersion>.0.0</SystemReflectionMetadataVersion>
Copy link
Copy Markdown
Contributor

@Forgind Forgind May 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahem. 😉

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😱

@dotnet-maestro dotnet-maestro Bot merged commit 5e06105 into release/7.0.1xx-preview5 Jun 1, 2022
@dotnet-maestro dotnet-maestro Bot deleted the darc-release/7.0.1xx-preview5-badb5788-f9ad-41f6-9c5a-ebd3a4d16e7a branch June 1, 2022 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants