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

[automated] Merge branch 'release/2.1' => 'release/2.2' #4453

Closed
wants to merge 3 commits into
base: release/2.2
from

Conversation

Projects
None yet
4 participants
@dotnet-maestro-bot
Contributor

dotnet-maestro-bot commented Dec 6, 2018

I detected changes in the release/2.1 branch which have not been merged yet to release/2.2. I'm a robot and am configured to help you automatically keep release/2.2 up to date, so I've opened this PR.

This PR merges commits made on release/2.1 by the following committers:

Instructions for merging

This PR will not be auto-merged. When pull request checks pass, please complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

You can also do this on command line:

git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2
git checkout release/2.2
git merge --no-ff merge/release/2.1-to-release/2.2
git push origin release/2.2

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/2.1-to-release/2.2'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2

Please contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

jkotalik and others added some commits Dec 5, 2018

Fix 2.1 build issues and remove obsolete build code (#4443)
- Stop producing the 'Universe' lineup package
- Removes all PackageLineup code
- Use full msbuild on Windows
- Fix invalid reference to internal.aspnetcore.sdk in 2.1.x
- Fix shared folder references for PackageArchive task.
@natemcmaster

This comment has been minimized.

Member

natemcmaster commented Dec 6, 2018

Closing in favor of @jkotalik 's PR: #4427

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment