From f65bd156e1053c3ce86738ee7ce87a617377e1af Mon Sep 17 00:00:00 2001 From: nicolas63 Date: Sat, 1 Feb 2025 16:30:41 +0100 Subject: [PATCH] [Blazor] Upgrade Bootstrap to v5 (#1551) * Update Graphical libraries (boostrap5, etc) * Fix enum selectitem --- .gitignore | 2 +- .../Pages/Account/Register.razor.ejs | 20 +-- .../Admin/UserManagement/UserDetail.razor.ejs | 4 +- .../UserManagement/UserManagement.razor.ejs | 18 +-- .../Admin/UserManagement/UserUpdate.razor.ejs | 20 +-- .../_entityClass_/_entityClass_.razor.ejs | 18 +-- .../_entityClass_Detail.razor.ejs | 2 +- .../_entityClass_Update.razor.ejs | 19 +-- .../Project.Client/Pages/Login.razor.ejs | 6 +- .../src/client/Project.Client/Program.cs.ejs | 4 +- .../Project.Client/Project.Client.csproj.ejs | 4 +- .../src/client/Project.Client/libman.json.ejs | 93 +------------ .../wwwroot/content/css/loading.css.ejs | 127 +++++++++--------- .../scss/_bootstrap-variables.scss.ejs | 24 ++-- .../Project.Client/wwwroot/index.html.ejs | 21 ++- .../Project.Client.Test/AlertErrorTest.cs.ejs | 4 +- .../UserManagement/UserDetailTest.cs.ejs | 4 +- .../_entityClass_DetailTest.cs.ejs | 4 +- .../_entityClass_/_entityClass_Test.cs.ejs | 12 +- .../_entityClass_UpdateTest.cs.ejs | 4 +- .../dotnetcore/src/Directory.Packages.props | 4 +- 21 files changed, 167 insertions(+), 247 deletions(-) diff --git a/.gitignore b/.gitignore index c43dc45d0..e768c1d53 100644 --- a/.gitignore +++ b/.gitignore @@ -155,4 +155,4 @@ coverage/ # added by generate-blueprint: generators/**/package-lock.json -[Oo]bj/ \ No newline at end of file +[Oo]bj/ diff --git a/generators/blazor/templates/src/client/Project.Client/Pages/Account/Register.razor.ejs b/generators/blazor/templates/src/client/Project.Client/Pages/Account/Register.razor.ejs index d5240b8d6..a347c5470 100644 --- a/generators/blazor/templates/src/client/Project.Client/Pages/Account/Register.razor.ejs +++ b/generators/blazor/templates/src/client/Project.Client/Pages/Account/Register.razor.ejs @@ -4,7 +4,7 @@ @namespace <%= namespace %>.Client.Pages.Account
-
+

Registration

@if (Success) @@ -34,37 +34,37 @@
-
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
diff --git a/generators/blazor/templates/src/client/Project.Client/Pages/Admin/UserManagement/UserDetail.razor.ejs b/generators/blazor/templates/src/client/Project.Client/Pages/Admin/UserManagement/UserDetail.razor.ejs index 6292697a2..0f5be66d1 100644 --- a/generators/blazor/templates/src/client/Project.Client/Pages/Admin/UserManagement/UserDetail.razor.ejs +++ b/generators/blazor/templates/src/client/Project.Client/Pages/Admin/UserManagement/UserDetail.razor.ejs @@ -4,7 +4,7 @@ @attribute [Authorize(Roles = "ROLE_ADMIN")] -
+
@if (CurrentUser != null) @@ -53,7 +53,7 @@ @foreach (var authority in CurrentUser.Authorities) {
  • - @authority + @authority
    • } diff --git a/generators/blazor/templates/src/client/Project.Client/Pages/Admin/UserManagement/UserManagement.razor.ejs b/generators/blazor/templates/src/client/Project.Client/Pages/Admin/UserManagement/UserManagement.razor.ejs index b0481b83f..4e48bae12 100644 --- a/generators/blazor/templates/src/client/Project.Client/Pages/Admin/UserManagement/UserManagement.razor.ejs +++ b/generators/blazor/templates/src/client/Project.Client/Pages/Admin/UserManagement/UserManagement.razor.ejs @@ -8,10 +8,12 @@

    Users - - - Create a new User - +
    + + + Create a new User + +

    @**@ @@ -69,14 +71,14 @@ @foreach (var authority in user.Authorities) {
    - @authority + @authority
    } @($"{user.CreatedDate:dd/MM/yy HH:mm}") @user.LastModifiedBy @($"{user.LastModifiedDate:dd/MM/yy HH:mm}") - +
    @*
    -
    +
    -
    +
    *@ diff --git a/generators/blazor/templates/src/client/Project.Client/Pages/Admin/UserManagement/UserUpdate.razor.ejs b/generators/blazor/templates/src/client/Project.Client/Pages/Admin/UserManagement/UserUpdate.razor.ejs index 47115c002..49a909f73 100644 --- a/generators/blazor/templates/src/client/Project.Client/Pages/Admin/UserManagement/UserUpdate.razor.ejs +++ b/generators/blazor/templates/src/client/Project.Client/Pages/Admin/UserManagement/UserUpdate.razor.ejs @@ -5,7 +5,7 @@ @attribute [Authorize(Roles = "ROLE_ADMIN")] -
    +
    @if (CurrentUser != null) { @@ -18,14 +18,14 @@ @if (!string.IsNullOrWhiteSpace(CurrentUser.Id)) { -
    +
    } -
    - +
    + @@ -47,8 +47,8 @@
    *@
    -
    - +
    + @*TODO
    @@ -59,7 +59,7 @@
    *@
    -
    +
    @@ -72,8 +72,8 @@
    *@
    -
    - +
    + @*TODO
    @@ -113,7 +113,7 @@
    -
    +
    @@ -50,8 +51,8 @@ _%> } <%_ } else { _%> -
    - +
    +
    @@ -60,8 +61,8 @@ _%> <%_ relationships.forEach(relation => { if (relation.relationshipType === 'one-to-one' || relation.relationshipType === 'many-to-one') { _%> -
    - +
    +
    <%_ } else if ((relation.relationshipType === 'many-to-many' || relation.relationshipType === 'one-to-many') && relation.ownerSide === true ) { _%> -
    - +
    +
    -
    +
    diff --git a/generators/blazor/templates/src/client/Project.Client/Program.cs.ejs b/generators/blazor/templates/src/client/Project.Client/Program.cs.ejs index 397baa0cd..6298b1a90 100644 --- a/generators/blazor/templates/src/client/Project.Client/Program.cs.ejs +++ b/generators/blazor/templates/src/client/Project.Client/Program.cs.ejs @@ -7,7 +7,7 @@ using AutoMapper; using Blazored.Modal; using Blazored.SessionStorage; using Blazorise; -using Blazorise.Bootstrap; +using Blazorise.Bootstrap5; using Blazorise.Icons.FontAwesome; using <%= namespace %>.Client.Pages.Utils; using <%= namespace %>.Client.Services; @@ -34,7 +34,7 @@ public class Program { options.Immediate = true; }) - .AddBootstrapProviders() + .AddBootstrap5Providers() .AddFontAwesomeIcons(); diff --git a/generators/blazor/templates/src/client/Project.Client/Project.Client.csproj.ejs b/generators/blazor/templates/src/client/Project.Client/Project.Client.csproj.ejs index 6b134999e..b6af2b116 100644 --- a/generators/blazor/templates/src/client/Project.Client/Project.Client.csproj.ejs +++ b/generators/blazor/templates/src/client/Project.Client/Project.Client.csproj.ejs @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/generators/blazor/templates/src/client/Project.Client/libman.json.ejs b/generators/blazor/templates/src/client/Project.Client/libman.json.ejs index 4669831bf..94575d82a 100644 --- a/generators/blazor/templates/src/client/Project.Client/libman.json.ejs +++ b/generators/blazor/templates/src/client/Project.Client/libman.json.ejs @@ -4,98 +4,11 @@ "libraries": [ { "provider": "unpkg", - "library": "bootstrap@4.4.1", + "library": "bootstrap@5.3.3", "destination": "wwwroot/lib/bootstrap/", "files": [ - "scss/bootstrap-grid.scss", - "scss/bootstrap-reboot.scss", - "scss/bootstrap.scss", - "scss/_alert.scss", - "scss/_badge.scss", - "scss/_breadcrumb.scss", - "scss/_button-group.scss", - "scss/_buttons.scss", - "scss/_card.scss", - "scss/_carousel.scss", - "scss/_close.scss", - "scss/_code.scss", - "scss/_custom-forms.scss", - "scss/_dropdown.scss", - "scss/_forms.scss", - "scss/_functions.scss", - "scss/_grid.scss", - "scss/_images.scss", - "scss/_input-group.scss", - "scss/_jumbotron.scss", - "scss/_list-group.scss", - "scss/_media.scss", - "scss/_mixins.scss", - "scss/_modal.scss", - "scss/_nav.scss", - "scss/_navbar.scss", - "scss/_pagination.scss", - "scss/_popover.scss", - "scss/_print.scss", - "scss/_progress.scss", - "scss/_reboot.scss", - "scss/_root.scss", - "scss/_spinners.scss", - "scss/_tables.scss", - "scss/_toasts.scss", - "scss/_tooltip.scss", - "scss/_transitions.scss", - "scss/_type.scss", - "scss/_utilities.scss", - "scss/_variables.scss", - "scss/mixins/_alert.scss", - "scss/mixins/_background-variant.scss", - "scss/mixins/_badge.scss", - "scss/mixins/_border-radius.scss", - "scss/mixins/_box-shadow.scss", - "scss/mixins/_breakpoints.scss", - "scss/mixins/_buttons.scss", - "scss/mixins/_caret.scss", - "scss/mixins/_clearfix.scss", - "scss/mixins/_deprecate.scss", - "scss/mixins/_float.scss", - "scss/mixins/_forms.scss", - "scss/mixins/_gradients.scss", - "scss/mixins/_grid-framework.scss", - "scss/mixins/_grid.scss", - "scss/mixins/_hover.scss", - "scss/mixins/_image.scss", - "scss/mixins/_list-group.scss", - "scss/mixins/_lists.scss", - "scss/mixins/_nav-divider.scss", - "scss/mixins/_pagination.scss", - "scss/mixins/_reset-text.scss", - "scss/mixins/_resize.scss", - "scss/mixins/_screen-reader.scss", - "scss/mixins/_size.scss", - "scss/mixins/_table-row.scss", - "scss/mixins/_text-emphasis.scss", - "scss/mixins/_text-hide.scss", - "scss/mixins/_text-truncate.scss", - "scss/mixins/_transition.scss", - "scss/mixins/_visibility.scss", - "scss/utilities/_align.scss", - "scss/utilities/_background.scss", - "scss/utilities/_borders.scss", - "scss/utilities/_clearfix.scss", - "scss/utilities/_display.scss", - "scss/utilities/_embed.scss", - "scss/utilities/_flex.scss", - "scss/utilities/_float.scss", - "scss/utilities/_overflow.scss", - "scss/utilities/_position.scss", - "scss/utilities/_screenreaders.scss", - "scss/utilities/_shadows.scss", - "scss/utilities/_sizing.scss", - "scss/utilities/_spacing.scss", - "scss/utilities/_stretched-link.scss", - "scss/utilities/_text.scss", - "scss/utilities/_visibility.scss", - "scss/vendor/_rfs.scss" + "scss/**.scss", + "scss/*/**.scss" ] } ] diff --git a/generators/blazor/templates/src/client/Project.Client/wwwroot/content/css/loading.css.ejs b/generators/blazor/templates/src/client/Project.Client/wwwroot/content/css/loading.css.ejs index 4f03885eb..31ceae610 100644 --- a/generators/blazor/templates/src/client/Project.Client/wwwroot/content/css/loading.css.ejs +++ b/generators/blazor/templates/src/client/Project.Client/wwwroot/content/css/loading.css.ejs @@ -112,68 +112,65 @@ top: 10em; } - .app-loading p { - display: block; - font-size: 1.17em; - margin-inline-start: 0px; - margin-inline-end: 0px; - font-weight: normal; - } - - .app-loading .lds-pacman { - position: relative; - margin: auto; - } - - .app-loading .lds-pacman > div:nth-child(2) div { - position: absolute; - top: 40px; - left: 40px; - width: 120px; - height: 60px; - border-radius: 120px 120px 0 0; - background: #bbcedd; - -webkit-animation: lds-pacman-1 1s linear infinite; - animation: lds-pacman-1 1s linear infinite; - -webkit-transform-origin: 60px 60px; - transform-origin: 60px 60px; - } - - .app-loading .lds-pacman > div:nth-child(2) div:nth-child(2) { - -webkit-animation: lds-pacman-2 1s linear infinite; - animation: lds-pacman-2 1s linear infinite; - } - - .app-loading .lds-pacman > div:nth-child(1) div { - position: absolute; - top: 97px; - left: -8px; - width: 24px; - height: 10px; - background-image: url('../images/logo-jhipster.png'); - background-size: contain; - -webkit-animation: lds-pacman-3 1s linear infinite; - animation: lds-pacman-3 1.5s linear infinite; - } - - .app-loading .lds-pacman > div:nth-child(1) div:nth-child(1) { - -webkit-animation-delay: -0.67s; - animation-delay: -1s; - } - - .app-loading .lds-pacman > div:nth-child(1) div:nth-child(2) { - -webkit-animation-delay: -0.33s; - animation-delay: -0.5s; - } - - .app-loading .lds-pacman > div:nth-child(1) div:nth-child(3) { - -webkit-animation-delay: 0s; - animation-delay: 0s; - } - - .app-loading .lds-pacman { - width: 200px !important; - height: 200px !important; - -webkit-transform: translate(-100px, -100px) scale(1) translate(100px, 100px); - transform: translate(-100px, -100px) scale(1) translate(100px, 100px); - } +.app-loading p { + display: block; + font-size: 1.17em; + margin-inline-start: 0px; + margin-inline-end: 0px; + font-weight: normal; +} + +.app-loading .lds-pacman { + position: relative; + margin: auto; + width: 200px !important; + height: 200px !important; + -webkit-transform: translate(-100px, -100px) scale(1) translate(100px, 100px); + transform: translate(-100px, -100px) scale(1) translate(100px, 100px); +} + +.app-loading .lds-pacman > div:nth-child(2) div { + position: absolute; + top: 40px; + left: 40px; + width: 120px; + height: 60px; + border-radius: 120px 120px 0 0; + background: #bbcedd; + -webkit-animation: lds-pacman-1 1s linear infinite; + animation: lds-pacman-1 1s linear infinite; + -webkit-transform-origin: 60px 60px; + transform-origin: 60px 60px; +} + +.app-loading .lds-pacman > div:nth-child(2) div:nth-child(2) { + -webkit-animation: lds-pacman-2 1s linear infinite; + animation: lds-pacman-2 1s linear infinite; +} + +.app-loading .lds-pacman > div:nth-child(1) div { + position: absolute; + top: 97px; + left: -8px; + width: 24px; + height: 10px; + background-image: url('../images/logo-jhipster.png'); + background-size: contain; + -webkit-animation: lds-pacman-3 1s linear infinite; + animation: lds-pacman-3 1.5s linear infinite; +} + +.app-loading .lds-pacman > div:nth-child(1) div:nth-child(1) { + -webkit-animation-delay: -0.67s; + animation-delay: -1s; +} + +.app-loading .lds-pacman > div:nth-child(1) div:nth-child(2) { + -webkit-animation-delay: -0.33s; + animation-delay: -0.5s; +} + +.app-loading .lds-pacman > div:nth-child(1) div:nth-child(3) { + -webkit-animation-delay: 0s; + animation-delay: 0s; +} diff --git a/generators/blazor/templates/src/client/Project.Client/wwwroot/content/scss/_bootstrap-variables.scss.ejs b/generators/blazor/templates/src/client/Project.Client/wwwroot/content/scss/_bootstrap-variables.scss.ejs index be0f22649..3ecef6ff5 100644 --- a/generators/blazor/templates/src/client/Project.Client/wwwroot/content/scss/_bootstrap-variables.scss.ejs +++ b/generators/blazor/templates/src/client/Project.Client/wwwroot/content/scss/_bootstrap-variables.scss.ejs @@ -1,18 +1,9 @@ /* -* Bootstrap overrides https://getbootstrap.com/docs/4.0/getting-started/theming/ -* All values defined in bootstrap source -* https://github.com/twbs/bootstrap/blob/v4-dev/scss/_variables.scss can be overwritten here -* Make sure not to add !default to values here -*/ - -// Colors: -// Grayscale and brand colors for use across Bootstrap. - -$primary: #3e8acc; -$success: #28a745; -$info: #17a2b8; -$warning: #ffc107; -$danger: #dc3545; + * Bootstrap overrides https://getbootstrap.com/docs/5.1/customize/sass/ + * All values defined in bootstrap source + * https://github.com/twbs/bootstrap/blob/v5.1.3/scss/_variables.scss can be overwritten here + * Make sure not to add !default to values here + */ // Options: // Quickly modify global styling by enabling or disabling optional features. @@ -34,9 +25,12 @@ $border-radius-sm: 0.1rem; // Body: // Settings for the `` element. -$body-bg: #e4e5e6; +$body-bg: #ffffff; // Typography: // Font, line-height, and color for body text, headings, and more. $font-size-base: 1rem; + +$dropdown-link-hover-color: white; +$dropdown-link-hover-bg: #343a40; \ No newline at end of file diff --git a/generators/blazor/templates/src/client/Project.Client/wwwroot/index.html.ejs b/generators/blazor/templates/src/client/Project.Client/wwwroot/index.html.ejs index 776ab58ba..bdcbbd1af 100644 --- a/generators/blazor/templates/src/client/Project.Client/wwwroot/index.html.ejs +++ b/generators/blazor/templates/src/client/Project.Client/wwwroot/index.html.ejs @@ -14,8 +14,9 @@ - + + @@ -101,9 +102,21 @@
    - - - + + diff --git a/generators/blazor/templates/test/Project.Client.Test/AlertErrorTest.cs.ejs b/generators/blazor/templates/test/Project.Client.Test/AlertErrorTest.cs.ejs index 011444da7..427f10429 100644 --- a/generators/blazor/templates/test/Project.Client.Test/AlertErrorTest.cs.ejs +++ b/generators/blazor/templates/test/Project.Client.Test/AlertErrorTest.cs.ejs @@ -33,7 +33,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Xunit; using Blazorise; -using Blazorise.Bootstrap; +using Blazorise.Bootstrap5; using Blazorise.Icons.FontAwesome; namespace <%= namespace %>.Client.Test; @@ -47,7 +47,7 @@ public class AlertErrorTest : TestContext options.Immediate = true; }) .Replace(ServiceDescriptor.Transient()) - .AddBootstrapProviders() + .AddBootstrap5Providers() .AddFontAwesomeIcons(); JSInterop.Mode = JSRuntimeMode.Loose; } diff --git a/generators/blazor/templates/test/Project.Client.Test/Pages/Admin/UserManagement/UserDetailTest.cs.ejs b/generators/blazor/templates/test/Project.Client.Test/Pages/Admin/UserManagement/UserDetailTest.cs.ejs index d6562c74b..1d9ce6f48 100644 --- a/generators/blazor/templates/test/Project.Client.Test/Pages/Admin/UserManagement/UserDetailTest.cs.ejs +++ b/generators/blazor/templates/test/Project.Client.Test/Pages/Admin/UserManagement/UserDetailTest.cs.ejs @@ -18,7 +18,7 @@ using System.Threading.Tasks; using AutoFixture; using Blazored.Modal.Services; using Blazorise; -using Blazorise.Bootstrap; +using Blazorise.Bootstrap5; using Blazorise.Icons.FontAwesome; using Bunit; using Bunit.Rendering; @@ -53,7 +53,7 @@ public class UserDetailTest : TestContext options.Immediate = true; }) .Replace(ServiceDescriptor.Transient()) - .AddBootstrapProviders() + .AddBootstrap5Providers() .AddFontAwesomeIcons(); Services.AddSingleton(_userService.Object); Services.AddSingleton(_navidationService.Object); diff --git a/generators/blazor/templates/test/Project.Client.Test/Pages/Entities/_entityClass_/_entityClass_DetailTest.cs.ejs b/generators/blazor/templates/test/Project.Client.Test/Pages/Entities/_entityClass_/_entityClass_DetailTest.cs.ejs index 1ac406e4c..9f71a4d92 100644 --- a/generators/blazor/templates/test/Project.Client.Test/Pages/Entities/_entityClass_/_entityClass_DetailTest.cs.ejs +++ b/generators/blazor/templates/test/Project.Client.Test/Pages/Entities/_entityClass_/_entityClass_DetailTest.cs.ejs @@ -23,7 +23,7 @@ using System.Linq; using System.Threading.Tasks; using AutoFixture; using Blazorise; -using Blazorise.Bootstrap; +using Blazorise.Bootstrap5; using Blazorise.Icons.FontAwesome; using Bunit; using Bunit.Rendering; @@ -57,7 +57,7 @@ public class <%= entityClassName %>DetailTest : TestContext options.Immediate = true; }) .Replace(ServiceDescriptor.Transient()) - .AddBootstrapProviders() + .AddBootstrap5Providers() .AddFontAwesomeIcons(); //This code is needed to support recursion _fixture.Behaviors.OfType().ToList() diff --git a/generators/blazor/templates/test/Project.Client.Test/Pages/Entities/_entityClass_/_entityClass_Test.cs.ejs b/generators/blazor/templates/test/Project.Client.Test/Pages/Entities/_entityClass_/_entityClass_Test.cs.ejs index c0ebb5afe..f39f5a4cf 100644 --- a/generators/blazor/templates/test/Project.Client.Test/Pages/Entities/_entityClass_/_entityClass_Test.cs.ejs +++ b/generators/blazor/templates/test/Project.Client.Test/Pages/Entities/_entityClass_/_entityClass_Test.cs.ejs @@ -26,7 +26,7 @@ using AutoFixture; using Blazored.Modal; using Blazored.Modal.Services; using Blazorise; -using Blazorise.Bootstrap; +using Blazorise.Bootstrap5; using Blazorise.Icons.FontAwesome; using Bunit; using Bunit.Rendering; @@ -61,7 +61,7 @@ public class <%= entityClassName %>Test : TestContext options.Immediate = true; }) .Replace(ServiceDescriptor.Transient()) - .AddBootstrapProviders() + .AddBootstrap5Providers() .AddFontAwesomeIcons(); Services.AddHttpClientInterceptor(); //This code is needed to support recursion @@ -119,11 +119,9 @@ public class <%= entityClassName %>Test : TestContext // Assert await <%= entityVariableName %>Page.Find("td>div>button").ClickAsync(new MouseEventArgs()); - _modalService.Verify(service => service.Show(It.IsAny()), Times.Once); - // TODO: FIXME. Clicking the delete button will not call the service delete operation. Instead, it will display a dialog to confirm deletion. - // _<%= entityVariableName %>Service.Verify(service => service.Delete(<%= entityVariableName %>ToDelete.Id.ToString()), Times.Once); - // var <%= camelCasedEntityClassPlural %>TableBody = <%= entityVariableName %>Page.Find("tbody"); - // <%= camelCasedEntityClassPlural %>TableBody.ChildElementCount.Should().Be(9); + _<%= entityVariableName %>Service.Verify(service => service.Delete(<%= entityVariableName %>ToDelete.Id.ToString()), Times.Once); + var <%= camelCasedEntityClassPlural %>TableBody = <%= entityVariableName %>Page.Find("tbody"); + <%= camelCasedEntityClassPlural %>TableBody.ChildElementCount.Should().Be(9); } } diff --git a/generators/blazor/templates/test/Project.Client.Test/Pages/Entities/_entityClass_/_entityClass_UpdateTest.cs.ejs b/generators/blazor/templates/test/Project.Client.Test/Pages/Entities/_entityClass_/_entityClass_UpdateTest.cs.ejs index 30aabae7d..db5545e48 100644 --- a/generators/blazor/templates/test/Project.Client.Test/Pages/Entities/_entityClass_/_entityClass_UpdateTest.cs.ejs +++ b/generators/blazor/templates/test/Project.Client.Test/Pages/Entities/_entityClass_/_entityClass_UpdateTest.cs.ejs @@ -27,7 +27,7 @@ using AutoFixture; using Blazored.Modal; using Blazored.Modal.Services; using Blazorise; -using Blazorise.Bootstrap; +using Blazorise.Bootstrap5; using Blazorise.Icons.FontAwesome; using Bunit; using Bunit.Rendering; @@ -87,7 +87,7 @@ public class <%= entityClassName %>UpdateTest : TestContext options.Immediate = true; }) .Replace(ServiceDescriptor.Transient()) - .AddBootstrapProviders() + .AddBootstrap5Providers() .AddFontAwesomeIcons(); Services.AddHttpClientInterceptor(); //This code is needed to support recursion diff --git a/generators/dotnetcore/templates/dotnetcore/src/Directory.Packages.props b/generators/dotnetcore/templates/dotnetcore/src/Directory.Packages.props index b7a27bbd7..e5a35f1d4 100644 --- a/generators/dotnetcore/templates/dotnetcore/src/Directory.Packages.props +++ b/generators/dotnetcore/templates/dotnetcore/src/Directory.Packages.props @@ -14,8 +14,8 @@ - - + +