Skip to content

[release/6.0] Initial Bootstrap v4 SxS support #36378

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 18 commits into from
Sep 10, 2021

Conversation

github-actions[bot]
Copy link
Contributor

Backport of #35981 to release/6.0

/cc @HaoK

Customer Impact

Testing

Risk

@github-actions github-actions bot requested a review from Pilchie as a code owner September 10, 2021 16:54
@ghost ghost added the area-identity Includes: Identity and providers label Sep 10, 2021
@HaoK
Copy link
Member

HaoK commented Sep 10, 2021

@dotnet/aspnet-build could we get this merged?

@wtgodbe wtgodbe merged commit 77d5fbb into release/6.0 Sep 10, 2021
@wtgodbe wtgodbe deleted the backport/pr-35981-to-release/6.0 branch September 10, 2021 20:47
@ghost ghost added this to the 6.0-rc2 milestone Sep 10, 2021
@HaoK
Copy link
Member

HaoK commented Sep 11, 2021

/backport to main

@github-actions
Copy link
Contributor Author

Started backporting to main: https://github.com/dotnet/aspnetcore/actions/runs/1223273332

HaoK added a commit that referenced this pull request Dec 7, 2021
* Add props and build files

* Bring back V4 files

tmp

Setup V5 stuff

* Add back v5 files too

Restore V4 files

Undo diffs

Update Testing.DefaultWebSite.StaticWebAssets.V5.xml

Fix tests

Checkpoint

Fix

Undo

Try bootstrap4 codepath

Stuff

Checkpoint before rebase

* Correct target names

* Fix views

* Cleanup

* Fix test

* Bring back targets

* Make things work

* PR feedback

* Fix for content type

* Harden the view version logic

* Fix test

* Nullable warning fixes

* Fix nullable warning another way

* Fix V4 nullability warnings

* Another nullability fix

* Fix CI

Co-authored-by: Javier Calvarro Nelson <[email protected]>
Co-authored-by: Hao Kung <[email protected]>
HaoK added a commit that referenced this pull request Jan 5, 2022
* Add props and build files

* Bring back V4 files

tmp

Setup V5 stuff

* Add back v5 files too

Restore V4 files

Undo diffs

Update Testing.DefaultWebSite.StaticWebAssets.V5.xml

Fix tests

Checkpoint

Fix

Undo

Try bootstrap4 codepath

Stuff

Checkpoint before rebase

* Correct target names

* Fix views

* Cleanup

* Fix test

* Bring back targets

* Make things work

* PR feedback

* Fix for content type

* Harden the view version logic

* Fix test

* Nullable warning fixes

* Fix nullable warning another way

* Fix V4 nullability warnings

* Another nullability fix

* Fix CI

Co-authored-by: Javier Calvarro Nelson <[email protected]>
Co-authored-by: Hao Kung <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-identity Includes: Identity and providers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants