Skip to content

Conversation

@dotnet-maestro-bot
Copy link
Contributor

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

This PR merges commits made on release/2.2 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.2-to-master master
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/2.2-to-master
git checkout master
git merge --no-ff merge/release/2.2-to-master
git push origin master

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.2-to-master'. 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.2-to-master master
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/2.2-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore merge/release/2.2-to-master

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 5 commits December 4, 2018 16:44
- 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.
@jkotalik jkotalik self-assigned this Dec 6, 2018
@jkotalik
Copy link
Contributor

jkotalik commented Dec 6, 2018

Tests for ANCM are failing; will investigate.

Nate McMaster and others added 3 commits December 5, 2018 17:59
dotnet#4441)

Changes:

* Stop producing Microsoft.AspNetCore.Routing.DecisionTree.Sources. I could not find any usages outside of the Microsoft.AspNetCore.Routing assembly, so I've moved this to be a subfolder of code in the Microsoft.AspNetCore.Routing project.
* Stop building src/Routing as a submodule. Use ProjectReference instead
* Move projects from src/Routing into src/Http/Routing/ and src/Http/Routing.Abstractions/
* Update package baselines and dependencies to support building routing projects and samples
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.2, but I could not automatically push those to merge/release/2.2-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@natemcmaster natemcmaster assigned natemcmaster and unassigned jkotalik Dec 7, 2018
@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.2, but I could not automatically push those to merge/release/2.2-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@natemcmaster natemcmaster force-pushed the merge/release/2.2-to-master branch from ba203d9 to cea7b1b Compare December 7, 2018 18:01
@natemcmaster natemcmaster requested a review from jkotalik December 7, 2018 18:03
@natemcmaster
Copy link
Contributor

This includes changes made to IIS in 2.x: #4335 and #4403. I'm assuming these should merge forward, right @jkotalik ?

@natemcmaster natemcmaster force-pushed the merge/release/2.2-to-master branch from 2146420 to 85e2147 Compare December 7, 2018 19:12
@natemcmaster natemcmaster merged commit 85e2147 into dotnet:master Dec 7, 2018
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.

5 participants