[release/3.1.1xx] Merge from release/3.0.1xx - #5577
Merged
Merged
Conversation
…0191101.9 (dotnet#5474) - dotnet-dev-certs - 3.0.1-servicing.19551.9 - dotnet-user-secrets - 3.0.1-servicing.19551.9 - dotnet-watch - 3.0.1-servicing.19551.9 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1-servicing.19551.9 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.1-servicing.19551.9
…1101.17 (dotnet#5476) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19551.17
…1104.6 (dotnet#5531) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19554.6 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19554.2 (parent: Microsoft.Dotnet.Toolset.Internal)
…5526) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1 * Fix blob URLs for stabilized ASP.NET 3.0.x Unpin 3.0.x ASP.NET targeting pack Revert dotnet-* tools packages to 3.0.0 versions * Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1 * Fix version of the targeting pack * Fix targeting pack version
…1104.11 (dotnet#5541) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19554.11
Member
Author
|
Fixes failing tests (implicit versions) |
mmitche
force-pushed
the
merge-from-301xx
branch
from
November 7, 2019 15:43
1c3b657 to
c8f7bac
Compare
nguerrera
approved these changes
Nov 7, 2019
Under the current CPD algorithm, which uses first found, work around issues with pinned dependencies by moving them after other dependencies from the same repository
|
The OS X leg is on the floor due to a change made to the machines. @livarcocc and @wli3 are on it, but not sure if they noticed core-sdk yet or not. |
|
@wtgodbe Can I merge this? |
Member
|
I'll merge this once we start GA builds on Monday |
Member
|
@wli3 done |
|
Meanwhile I combined the fixes for master in #5581 |
nguerrera
suggested changes
Nov 9, 2019
nguerrera
left a comment
nguerrera
left a comment
There was a problem hiding this comment.
This CANNOT be merged before the branch opens for GA as P3 will ship before these implicit versions are right.
If we need another P3 build, we will have to disable some tests. cc @livarcocc
|
I realize we said we'd wait until opening for GA already, but wanted to make the point in case it becomes tempting to merge sooner to get to green. |
Member
|
We're now open for GA |
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.
No description provided.