Skip to content

Merge v2.1.2-ga into release/2.1 #637

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

Merged
merged 10 commits into from
Jul 12, 2018
Merged

Conversation

dagood
Copy link
Member

@dagood dagood commented Jul 10, 2018

Merges the v2.1.2-ga tag into the release/2.1 branch. We didn't push directly into the release/2.1 branch to preserve green CI.

Once this is merged, we'll tag the result v2.1.2 and v2.1.302.

/cc @dleeapho @dseefeld @crummel

dseefeld and others added 10 commits July 2, 2018 13:38
Add script to fetch internal vsts commits
Call internal fetch conditionally in build definition
Update to the 2018-06-18 ProdCon 2.1.2 build.

Manually updated the AspNetCore package version used and ProdConFeed.txt.
Add archiving of packages restored during smoke-test and include them in the tarball so they can be used by the tarball smoke-test.
@dagood dagood requested review from dseefeld and crummel July 10, 2018 17:43
@dagood
Copy link
Member Author

dagood commented Jul 10, 2018

error: Server does not allow request for unadvertised object 9048955601872e659ff226d515cc72ae9bf4fa42
Fetched in submodule path 'src/cli', but it did not contain 9048955601872e659ff226d515cc72ae9bf4fa42. Direct fetching of that commit failed.

CLI doesn't have its commit available yet.

@peterhuene
Copy link

When dotnet/cli#9633 goes green, I'll merge and let you know.

@peterhuene
Copy link

The MSRC changes have been merged to upstream release/2.1.3xx. Thanks!

@dseefeld
Copy link
Contributor

@dotnet-bot test this please

@dseefeld
Copy link
Contributor

error: Server does not allow request for unadvertised object d4541b21dcb0cb15c5ec49c38354bde46e3eaea4
Fetched in submodule path 'src/corefx', but it did not contain d4541b21dcb0cb15c5ec49c38354bde46e3eaea4. Direct fetching of that commit failed.

It looks like corefx doesn't have its commit available, yet.

@dagood
Copy link
Member Author

dagood commented Jul 11, 2018

@dotnet-bot test this please
CoreFX commit merged with dotnet/corefx#30976.

@dagood
Copy link
Member Author

dagood commented Jul 11, 2018

error : Unable to load the service index for source https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180628-02/final/index.json

ProdCon blob feed is not available for this build yet, I'm talking with @mmitche about the best way to fix this.

@dagood
Copy link
Member Author

dagood commented Jul 11, 2018

@dotnet-bot test this please
ProdCon feed should be set up now.

@dagood dagood merged commit 71a7395 into dotnet:release/2.1 Jul 12, 2018
@dagood dagood deleted the release/2.1 branch July 12, 2018 14:33
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.

4 participants