Skip to content

3.1.14: Merge internal/release/3.1 into release/3.1 #4404

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

Jump to bottom
Closed
wants to merge 7 commits into from
Closed

3.1.14: Merge internal/release/3.1 into release/3.1 #4404

wants to merge 7 commits into from

Conversation

@ryalanms
Copy link
Member

@ryalanms ryalanms commented Apr 13, 2021

Merge internal/release/3.1 in to release/3.1.

(5c3bf7f)
@ghost ghost added the PR metadata: Label to tag PRs, to facilitate with triage label Apr 13, 2021
@ghost ghost requested review from SamBent and fabiant3 April 13, 2021 19:29
@ryalanms ryalanms changed the title Merge internal/release/3.1 in to release/3.1 3.1.14: Merge internal/release/3.1 into release/3.1 Apr 13, 2021
@ryalanms ryalanms requested a review from wtgodbe April 13, 2021 19:35
@ryalanms
Copy link
Member Author

ryalanms commented Apr 13, 2021

src\Microsoft.DotNet.Wpf\cycle-breakers\ReachFramework\ReachFramework-System.Printing-api-cycle.csproj#L0
src\Microsoft.DotNet.Wpf\cycle-breakers\ReachFramework\ReachFramework-System.Printing-api-cycle.csproj(0,0): error NU1603: ReachFramework-SystemPrinting-api-cycle depends on Microsoft.Private.Winforms (>= 4.8.1-servicing.21213.3) but Microsoft.Private.Winforms 4.8.1-servicing.21213.3 was not found. An approximate best match of Microsoft.Private.Winforms 4.8.1-servicing.21213.4 was resolved.

Looking...
wtgodbe
wtgodbe requested changes Apr 13, 2021
View reviewed changes
Copy link
Member

@wtgodbe wtgodbe left a comment

Choose a reason for hiding this comment

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

The problem is that you merged in internal/release/3.1 wholesale - you need to merge in the specific commit we shipped for 3.1.14, which can be found in the manifests I linked from the email thread
@ryalanms
Copy link
Member Author

ryalanms commented Apr 13, 2021

The commit looks correct to me: 5c3bf7f.
@ryalanms ryalanms closed this Apr 13, 2021
@ghost ghost locked as resolved and limited conversation to collaborators Apr 9, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

PR metadata: Label to tag PRs, to facilitate with triage

4 participants

@ryalanms @wtgodbe @dotnet-bot