This repository has been archived by the owner on Apr 20, 2023. It is now read-only.
Merge release/2.2.1xx to release/2.2.2xx #10190
Merged
Conversation
This file contains 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
Fix test break
Adding a workaround for the sockets issue when restoring with many nuget feeds.
Trying to make this match the dependencies in 2.1.401.
Updating the websdk version to 2.1.500
Updating Asp.net nad M.NC.App to 2.1.3
* Replace yum with rpm Since we need low level access like --nodeps * Get package name directly from file To avoid keeping name scheme in sync * install key in docker
Update branding to 2.1.403
MSBuild 15.9.10-preview
Insert NuGet Build 4.9.0-preview2.5428 into cli
I ported a fix in 2.1.0-rc1-03130-05 that should address the failures seen here: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_build?_a=summary&buildId=1991247
…e/2.1.5xx Merge release/2.1.4xx to release/2.1.5xx
Update BuildTasksFeedToolVersion
…e/2.1.5xx Merge release/2.1.4xx to release/2.1.5xx
Reproduced, saw the excat error message first and then fixed it
Update LatestPatchVersionForNetCore 1.0 and 1.1
MSBuild 15.9.19
Change package id compare from CurrentCultureIgnoreCase to OrdinalIgnoreCase
Insert testplatform 15.9 RTM
In 2.2.1xx we have another item that needs to be updated for it.
Updating 1.0 and 1.1 implicit self-contained versions
…, aspnet, coresetup, sdk, templating, templating, websdk to preview3-35497, preview3-35497, preview3-35497, preview3-35497, preview3-35497, preview3-35497, preview3-35497, preview3-35497, preview3-35497, preview3-27014-02, preview3-63414-02, beta4-20181013-2115911, beta4-20181013-2115911, preview3-20181013-2115910, respectively
…ateDependencies Update aspnet, aspnet, aspnet, aspnet, aspnet, aspnet, aspnet, aspnet, aspnet, coresetup, sdk, templating, templating, websdk to preview3-35497, preview3-35497, preview3-35497, preview3-35497, preview3-35497, preview3-35497, preview3-35497, preview3-35497, preview3-35497, preview3-27014-02, preview3-63414-02, beta4-20181013-2115911, beta4-20181013-2115911, preview3-20181013-2115910, respectively (release/2.2.1xx)
…-1-1 Insert NuGet Build 4.9.0-preview4.5552 into cli
Adding new VS.Redist packages for 2.1, so that we can serve both 15.x and 16.x
…se/2.1.5xx Merge release/2.1.4xx to release/2.1.5xx
…e/2.2.1xx Merge release/2.1.5xx to release/2.2.1xx
Update branding for 2.2.1xx rtm
…se/2.2.1xx Merge release/2.1.5xx to release/2.2.1xx
|
@livarcocc I'm surprised there are so many commits and commits going back to August in merge from 2.2.1xx to 2.2.2xx. Wasn't 2.2.2xx just created? |
|
Ah, they were backed up in 2.1.5xx and just got to 2.2.1xx: #9901 |
nguerrera
approved these changes
Oct 18, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This is an automatically generated pull request from release/2.2.1xx into release/2.2.2xx.
git fetch --all git checkout merges/release/2.2.1xx-to-release/2.2.2xx git reset --hard upstream/release/2.2.2xx git merge upstream/release/2.2.1xx # Fix merge conflicts git commit git push merges/release/2.2.1xx-to-release/2.2.2xx --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.