Skip to content

2.1: Merge Localization, BasicMiddleware, and Identity #4345

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 1,889 commits into from
Dec 4, 2018

Conversation

natemcmaster
Copy link
Contributor

As a part of #3598, this replaces the git submodule for Localization and BasicMiddleware with local code.

Nate McMaster and others added 16 commits July 12, 2018 11:50
This reverts our previous policy of cascading versions on all servicing updates.
This moves variables into the 'pinned' section, and points them to the latest
stable release (versions that were used at the time of the 2.1.2 release).
This reverts our previous policy of cascading versions on all servicing updates.
This moves variables into the 'pinned' section, and points them to the latest
stable release (versions that were used at the time of the 2.1.2 release).
This reverts our previous policy of cascading versions on all servicing updates.
This moves variables into the 'pinned' section, and points them to the latest
stable release (versions that were used at the time of the 2.1.2 release).
Per discussion with our team, we want to make the following changes to versioning during servicing updates:

* The versioning on packages with ship with ASP.NET Core should be consistent
* (No change) on packages with changes in them ship during servicing updates
* Version gaps are okay. For example, this repo is producing a patch for 2.1.6, so packages will be 2.1.6. It did not patch for 2.1.4 or 2.1.3 so those versions will be skipped.

This also includes another minor change: for consistency with the rest of the .NET Core teams, pre-release servicing builds will be 2.1.x-servicing-buildnumber.
…tion.Tests.csproj

This isn't really a test project. It's a class library which contains testing compontents. Because 'xunit' is referenced, IsTestProject=true, which
messes up some of the build logic we have for handling code signing and test runners
As a part of preparing this repo for merging into aspnet/AspNetCore, this code is being removed as it is currently not in a "shipping" state for 2.1.
@natemcmaster natemcmaster changed the title 2.1: Merge aspnet/Localization and aspnet/BasicMiddleware 2.1: Merge Localization, BasicMiddleware, and Identity Dec 1, 2018
@natemcmaster natemcmaster requested a review from HaoK December 1, 2018 01:01
Copy link
Contributor

@ryanbrandenburg ryanbrandenburg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@natemcmaster
Copy link
Contributor Author

🆙 📅 - this now includes all of Identity. The original plan was to move Microsoft.Extensions.Identity.* packages into aspnet/Extensions, but these projects appear to be so closely coupled to Microsoft.AspNetCore.Identity.* that we'd rather keep the source here in this repo.

@natemcmaster natemcmaster merged commit a6b5bb1 into release/2.1 Dec 4, 2018
@natemcmaster natemcmaster deleted the merge-repos branch December 4, 2018 17:04
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.