[automated] Merge branch 'release/2.1' => 'release/2.2' #6723
Conversation
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
…2.1.0
The 2.0 version of the Microsoft.Extensions.DependencyModel does not
support the assembly/file version metadata. We must have at least 2.1.
Between 2.1.6 and 2.1.7, we switched the build to use MSBuild.exe
("full" MSBuild) instead of `dotnet msbuild` ("core" MSBuild). MSBuild
has different assembly loaders behaviors in core vs full. By switching
MSBuild types, we were also unintentionally switching the version of
Microsoft.Extensions.DependencyModel.dll that was being used by our build
task from 2.1 back down to 2.0.
The reason we didn't discover this in earlier 2.1.x patches is that
building on msbuild core automatically upgraded our build tasks to
Microsoft.Extensions.DependencyModel.dll, Version=2.1.0.0. This happens
because of differences in the way .NET Core and MSBuild handles
assemblies with the same ID and different versions, and differences in
the layout of MSBuild and the .NET Core CLI.
In the end, this happened because we didn't have test coverage. MSBuild
and custom tasks burned asagain, but we should have just had unit tests
all along, which would have uncovered this regression as soon as we
switched to msbuild.exe.
|
This pull request has been updated. This PR merges commits made on release/2.1 by the following committers: |
|
This pull request has been updated. This PR merges commits made on release/2.1 by the following committers: |
jkotalik
force-pushed
the
merge/release/2.1-to-release/2.2
branch
from
563ff7c to
eacffd5
Compare
|
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.1, but I could not automatically push those to merge/release/2.1-to-release/2.2 to update this PR. |
natemcmaster
approved these changes
Jan 16, 2019
src/Security/samples/ClaimsTransformation/ClaimsTransformation.csproj
Outdated
Show resolved
Hide resolved
src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj
Outdated
Show resolved
Hide resolved
src/Security/samples/PathSchemeSelection/PathSchemeSelection.csproj
Outdated
Show resolved
Hide resolved
|
There are some kestrel failures in this test with Missing method exceptions: @Tratcher known issue? |
|
@jkotalik Yes, known issue in 2.2. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
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 repo does not appear to allow merge commits from the GitHub UI, so you will need to update this PR with a merge commit before closing this PR.
git fetch git checkout release/2.1 git pull --ff-only git checkout release/2.2 git pull --ff-only git merge --no-ff release/2.1 # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/2.2or if you are using SSH
After PR checks are complete push the branch
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.