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.

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

Update some package references to 6.0 versions #7629

Merged
merged 1 commit into from
May 16, 2022

Conversation

rainersigwald
Copy link
Member

This is required in coordination with some internal VS repo changes.

Directory.Build.props Outdated Show resolved Hide resolved
eng/Versions.props Outdated Show resolved Hide resolved
src/Tasks.UnitTests/RoslynCodeTaskFactory_Tests.cs Outdated Show resolved Hide resolved
Updates some packages to more recent versions. Coordinates with Roslyn
and VS changes to do the same.
@rainersigwald rainersigwald merged commit b362620 into dotnet:main May 16, 2022
@rainersigwald rainersigwald deleted the exp/go-6.0-go branch May 16, 2022 16:41
rainersigwald added a commit to dotnet/sdk that referenced this pull request May 18, 2022
rainersigwald added a commit to dotnet/sdk that referenced this pull request May 18, 2022
rainersigwald added a commit to dotnet/sdk that referenced this pull request May 18, 2022
To match MSBuild's update from dotnet/msbuild#7629.

Also removed redundant version for
System.Security.Cryptography.ProtectedData that caused downgrades.
benvillalobos pushed a commit to dotnet/sdk that referenced this pull request May 31, 2022
To match MSBuild's update from dotnet/msbuild#7629.

Also removed redundant version for
System.Security.Cryptography.ProtectedData that caused downgrades.
dotnet-maestro bot added a commit to dotnet/sdk that referenced this pull request Jun 1, 2022
…25668)

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


 - Update S.Reflection.Metadata to 6.0

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

Also removed redundant version for
System.Security.Cryptography.ProtectedData that caused downgrades.

 - Preserve compat with older MSBuild-on-Framework

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.

 - Fix version for SystemReflectionMetadataVersion

 - Merge branch 'release/7.0.1xx-preview5' into darc-release/7.0.1xx-preview5-badb5788-f9ad-41f6-9c5a-ebd3a4d16e7a

 - Merge branch 'release/7.0.1xx-preview5' into darc-release/7.0.1xx-preview5-badb5788-f9ad-41f6-9c5a-ebd3a4d16e7a
rainersigwald added a commit to rainersigwald/upgrade-assistant that referenced this pull request Jun 13, 2022
dotnet/msbuild#7629 updated MSBuild's reference to
`System.Configuration.ConfigurationManager` to the current 6.0.0.0
version. That version is available in the SDK directory and
MSBuildLocator tries to load it but fails. Figuring out why is tracked
as microsoft/MSBuildLocator#159, but this works around the problem by
updating to (and thus redistributing) the same version that MSBuild now
references, which is compatible with older SDKs/MSBuilds as well.
rainersigwald added a commit to rainersigwald/upgrade-assistant that referenced this pull request Jun 14, 2022
dotnet/msbuild#7629 updated MSBuild's reference to
`System.Configuration.ConfigurationManager` to the current 6.0.0.0
version. That version is available in the SDK directory and
MSBuildLocator tries to load it but fails. Figuring out why is tracked
as microsoft/MSBuildLocator#159, but this works around the problem by
updating to (and thus redistributing) the same version that MSBuild now
references, which is compatible with older SDKs/MSBuilds as well.
brandonh-msft added a commit to dotnet/upgrade-assistant that referenced this pull request Jun 20, 2022
dotnet/msbuild#7629 updated MSBuild's reference to
`System.Configuration.ConfigurationManager` to the current 6.0.0.0
version. That version is available in the SDK directory and
MSBuildLocator tries to load it but fails. Figuring out why is tracked
as microsoft/MSBuildLocator#159, but this works around the problem by
updating to (and thus redistributing) the same version that MSBuild now
references, which is compatible with older SDKs/MSBuilds as well.

Co-authored-by: Brandon H <brandonh-msft@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants