From 738a9a32c5cd3f3ccf46b9accc62af677e107413 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Sep 2021 13:47:41 -0700 Subject: [PATCH] Merge bootstrap4 sxs support from release/6.0 --- .../Identity/Pages/V4/Account/Login.cshtml | 2 +- .../Identity/Pages/V4/Account/Logout.cshtml | 2 +- .../Pages/V4/Account/Manage/_Layout.cshtml | 2 +- .../Pages/V4/Account/Manage/_ManageNav.cshtml | 2 +- .../Identity/Pages/V4/Account/Register.cshtml | 2 +- .../Identity/Pages/V5/Account/Login.cshtml | 2 +- .../Identity/Pages/V5/Account/Logout.cshtml | 2 +- .../Pages/V5/Account/Manage/_Layout.cshtml | 2 +- .../Pages/V5/Account/Manage/_ManageNav.cshtml | 2 +- .../Identity/Pages/V5/Account/Register.cshtml | 2 +- .../UI/src/IdentityBuilderUIExtensions.cs | 120 +- .../Microsoft.AspNetCore.Identity.UI.csproj | 93 +- src/Identity/UI/src/assets/V4/css/site.css | 84 + .../UI/src/{wwwroot => assets/V4}/favicon.ico | Bin .../UI/src/{wwwroot => assets/V4}/js/site.js | 0 .../UI/src/assets/V4/lib/bootstrap/LICENSE | 22 + .../lib/bootstrap/dist/css/bootstrap-grid.css | 3719 ++++++ .../bootstrap/dist/css/bootstrap-grid.css.map | 1 + .../bootstrap/dist/css/bootstrap-grid.min.css | 7 + .../dist/css/bootstrap-grid.min.css.map | 1 + .../bootstrap/dist/css/bootstrap-reboot.css | 331 + .../dist/css/bootstrap-reboot.css.map | 1 + .../dist/css/bootstrap-reboot.min.css | 8 + .../dist/css/bootstrap-reboot.min.css.map | 1 + .../V4/lib/bootstrap/dist/css/bootstrap.css | 10038 ++++++++++++++ .../lib/bootstrap/dist/css/bootstrap.css.map | 1 + .../lib/bootstrap/dist/css/bootstrap.min.css | 7 + .../bootstrap/dist/css/bootstrap.min.css.map | 1 + .../lib/bootstrap/dist/js/bootstrap.bundle.js | 7013 ++++++++++ .../bootstrap/dist/js/bootstrap.bundle.js.map | 1 + .../bootstrap/dist/js/bootstrap.bundle.min.js | 7 + .../dist/js/bootstrap.bundle.min.js.map | 1 + .../V4/lib/bootstrap/dist/js/bootstrap.js | 4435 +++++++ .../V4/lib/bootstrap/dist/js/bootstrap.js.map | 1 + .../V4/lib/bootstrap/dist/js/bootstrap.min.js | 7 + .../bootstrap/dist/js/bootstrap.min.js.map | 1 + .../jquery-validation-unobtrusive/LICENSE.txt | 0 .../jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../V4}/lib/jquery-validation/LICENSE.md | 0 .../dist/additional-methods.js | 0 .../dist/additional-methods.min.js | 0 .../jquery-validation/dist/jquery.validate.js | 0 .../dist/jquery.validate.min.js | 0 .../V4}/lib/jquery/LICENSE.txt | 0 .../V4}/lib/jquery/dist/jquery.js | 0 .../V4}/lib/jquery/dist/jquery.min.js | 0 .../V4}/lib/jquery/dist/jquery.min.map | 0 .../src/{wwwroot => assets/V5}/css/site.css | 0 src/Identity/UI/src/assets/V5/favicon.ico | Bin 0 -> 32038 bytes src/Identity/UI/src/assets/V5/js/site.js | 4 + .../V5/lib/bootstrap/LICENSE} | 0 .../lib/bootstrap/dist/css/bootstrap-grid.css | 0 .../bootstrap/dist/css/bootstrap-grid.css.map | 0 .../bootstrap/dist/css/bootstrap-grid.min.css | 0 .../dist/css/bootstrap-grid.min.css.map | 0 .../bootstrap/dist/css/bootstrap-grid.rtl.css | 0 .../dist/css/bootstrap-grid.rtl.css.map | 0 .../dist/css/bootstrap-grid.rtl.min.css | 0 .../dist/css/bootstrap-grid.rtl.min.css.map | 0 .../bootstrap/dist/css/bootstrap-reboot.css | 0 .../dist/css/bootstrap-reboot.css.map | 0 .../dist/css/bootstrap-reboot.min.css | 0 .../dist/css/bootstrap-reboot.min.css.map | 0 .../dist/css/bootstrap-reboot.rtl.css | 0 .../dist/css/bootstrap-reboot.rtl.css.map | 0 .../dist/css/bootstrap-reboot.rtl.min.css | 0 .../dist/css/bootstrap-reboot.rtl.min.css.map | 0 .../dist/css/bootstrap-utilities.css | 0 .../dist/css/bootstrap-utilities.css.map | 0 .../dist/css/bootstrap-utilities.min.css | 0 .../dist/css/bootstrap-utilities.min.css.map | 0 .../dist/css/bootstrap-utilities.rtl.css | 0 .../dist/css/bootstrap-utilities.rtl.css.map | 0 .../dist/css/bootstrap-utilities.rtl.min.css | 0 .../css/bootstrap-utilities.rtl.min.css.map | 0 .../V5}/lib/bootstrap/dist/css/bootstrap.css | 0 .../lib/bootstrap/dist/css/bootstrap.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.min.css | 0 .../bootstrap/dist/css/bootstrap.min.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.rtl.css | 0 .../bootstrap/dist/css/bootstrap.rtl.css.map | 0 .../bootstrap/dist/css/bootstrap.rtl.min.css | 0 .../dist/css/bootstrap.rtl.min.css.map | 0 .../lib/bootstrap/dist/js/bootstrap.bundle.js | 0 .../bootstrap/dist/js/bootstrap.bundle.js.map | 0 .../bootstrap/dist/js/bootstrap.bundle.min.js | 0 .../dist/js/bootstrap.bundle.min.js.map | 0 .../lib/bootstrap/dist/js/bootstrap.esm.js | 0 .../bootstrap/dist/js/bootstrap.esm.js.map | 0 .../bootstrap/dist/js/bootstrap.esm.min.js | 0 .../dist/js/bootstrap.esm.min.js.map | 0 .../V5}/lib/bootstrap/dist/js/bootstrap.js | 0 .../lib/bootstrap/dist/js/bootstrap.js.map | 0 .../lib/bootstrap/dist/js/bootstrap.min.js | 0 .../bootstrap/dist/js/bootstrap.min.js.map | 0 .../jquery-validation-unobtrusive/LICENSE.txt | 12 + .../jquery.validate.unobtrusive.js | 432 + .../jquery.validate.unobtrusive.min.js | 5 + .../V5/lib/jquery-validation/LICENSE.md | 22 + .../dist/additional-methods.js | 1158 ++ .../dist/additional-methods.min.js | 4 + .../jquery-validation/dist/jquery.validate.js | 1601 +++ .../dist/jquery.validate.min.js | 4 + .../UI/src/assets/V5/lib/jquery/LICENSE.txt | 36 + .../src/assets/V5/lib/jquery/dist/jquery.js | 10872 ++++++++++++++++ .../assets/V5/lib/jquery/dist/jquery.min.js | 2 + .../assets/V5/lib/jquery/dist/jquery.min.map | 1 + .../Microsoft.AspNetCore.Identity.UI.props | 11 + .../Microsoft.AspNetCore.Identity.UI.targets | 3 + ...crosoft.AspNetCore.StaticWebAssets.targets | 4 + .../Microsoft.AspNetCore.Identity.UI.targets | 3 + .../Microsoft.AspNetCore.Identity.UI.targets | 3 + .../IdentitySample.DefaultUI.csproj | 19 +- ...ting.DefaultWebSite.StaticWebAssets.V4.xml | 2 +- ...ting.DefaultWebSite.StaticWebAssets.V5.xml | 2 +- .../Identity.Test/IdentityUIScriptsTest.cs | 9 +- .../Microsoft.AspNetCore.Identity.Test.csproj | 4 +- .../Identity.DefaultUI.WebSite.csproj | 19 +- .../Properties/launchSettings.json | 27 + .../Identity.DefaultUI.WebSite/StartupBase.cs | 1 - 121 files changed, 40136 insertions(+), 45 deletions(-) create mode 100644 src/Identity/UI/src/assets/V4/css/site.css rename src/Identity/UI/src/{wwwroot => assets/V4}/favicon.ico (100%) rename src/Identity/UI/src/{wwwroot => assets/V4}/js/site.js (100%) create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/LICENSE create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/css/bootstrap-grid.css create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/css/bootstrap-grid.css.map create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/css/bootstrap-grid.min.css create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/css/bootstrap-grid.min.css.map create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/css/bootstrap-reboot.css create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/css/bootstrap-reboot.css.map create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/css/bootstrap-reboot.min.css create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/css/bootstrap.css create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/css/bootstrap.css.map create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/css/bootstrap.min.css create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/css/bootstrap.min.css.map create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/js/bootstrap.bundle.js create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/js/bootstrap.bundle.js.map create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/js/bootstrap.bundle.min.js create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/js/bootstrap.js create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/js/bootstrap.js.map create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/js/bootstrap.min.js create mode 100644 src/Identity/UI/src/assets/V4/lib/bootstrap/dist/js/bootstrap.min.js.map rename src/Identity/UI/src/{wwwroot => assets/V4}/lib/jquery-validation-unobtrusive/LICENSE.txt (100%) rename src/Identity/UI/src/{wwwroot => assets/V4}/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js (100%) rename src/Identity/UI/src/{wwwroot => assets/V4}/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js (100%) rename src/Identity/UI/src/{wwwroot => assets/V4}/lib/jquery-validation/LICENSE.md (100%) rename src/Identity/UI/src/{wwwroot => assets/V4}/lib/jquery-validation/dist/additional-methods.js (100%) rename src/Identity/UI/src/{wwwroot => assets/V4}/lib/jquery-validation/dist/additional-methods.min.js (100%) rename src/Identity/UI/src/{wwwroot => assets/V4}/lib/jquery-validation/dist/jquery.validate.js (100%) rename src/Identity/UI/src/{wwwroot => assets/V4}/lib/jquery-validation/dist/jquery.validate.min.js (100%) rename src/Identity/UI/src/{wwwroot => assets/V4}/lib/jquery/LICENSE.txt (100%) rename src/Identity/UI/src/{wwwroot => assets/V4}/lib/jquery/dist/jquery.js (100%) rename src/Identity/UI/src/{wwwroot => assets/V4}/lib/jquery/dist/jquery.min.js (100%) rename src/Identity/UI/src/{wwwroot => assets/V4}/lib/jquery/dist/jquery.min.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/css/site.css (100%) create mode 100644 src/Identity/UI/src/assets/V5/favicon.ico create mode 100644 src/Identity/UI/src/assets/V5/js/site.js rename src/Identity/UI/src/{wwwroot/lib/bootstrap/LICENSE.txt => assets/V5/lib/bootstrap/LICENSE} (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-grid.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-grid.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-grid.min.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-grid.min.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-grid.rtl.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-reboot.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-reboot.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-reboot.min.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-utilities.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-utilities.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-utilities.min.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap.min.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap.min.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap.rtl.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap.rtl.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap.rtl.min.css (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/js/bootstrap.bundle.js (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/js/bootstrap.bundle.js.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/js/bootstrap.bundle.min.js (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/js/bootstrap.esm.js (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/js/bootstrap.esm.js.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/js/bootstrap.esm.min.js (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/js/bootstrap.esm.min.js.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/js/bootstrap.js (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/js/bootstrap.js.map (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/js/bootstrap.min.js (100%) rename src/Identity/UI/src/{wwwroot => assets/V5}/lib/bootstrap/dist/js/bootstrap.min.js.map (100%) create mode 100644 src/Identity/UI/src/assets/V5/lib/jquery-validation-unobtrusive/LICENSE.txt create mode 100644 src/Identity/UI/src/assets/V5/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js create mode 100644 src/Identity/UI/src/assets/V5/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js create mode 100644 src/Identity/UI/src/assets/V5/lib/jquery-validation/LICENSE.md create mode 100644 src/Identity/UI/src/assets/V5/lib/jquery-validation/dist/additional-methods.js create mode 100644 src/Identity/UI/src/assets/V5/lib/jquery-validation/dist/additional-methods.min.js create mode 100644 src/Identity/UI/src/assets/V5/lib/jquery-validation/dist/jquery.validate.js create mode 100644 src/Identity/UI/src/assets/V5/lib/jquery-validation/dist/jquery.validate.min.js create mode 100644 src/Identity/UI/src/assets/V5/lib/jquery/LICENSE.txt create mode 100644 src/Identity/UI/src/assets/V5/lib/jquery/dist/jquery.js create mode 100644 src/Identity/UI/src/assets/V5/lib/jquery/dist/jquery.min.js create mode 100644 src/Identity/UI/src/assets/V5/lib/jquery/dist/jquery.min.map create mode 100644 src/Identity/UI/src/build/Microsoft.AspNetCore.Identity.UI.props create mode 100644 src/Identity/UI/src/build/Microsoft.AspNetCore.Identity.UI.targets create mode 100644 src/Identity/UI/src/build/Microsoft.AspNetCore.StaticWebAssets.targets create mode 100644 src/Identity/UI/src/buildMultiTargeting/Microsoft.AspNetCore.Identity.UI.targets create mode 100644 src/Identity/UI/src/buildTransitive/Microsoft.AspNetCore.Identity.UI.targets create mode 100644 src/Identity/testassets/Identity.DefaultUI.WebSite/Properties/launchSettings.json diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml index 95bc1ef1fd9c..1b14f9f98a3c 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml @@ -67,7 +67,7 @@