From c3dc066a96b0e3ce123a35421ffdec2410e91044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alper=20Ebi=C3=A7o=C4=9Flu?= <9526587+ebicoglu@users.noreply.github.com> Date: Tue, 19 Jul 2022 15:27:41 +0300 Subject: [PATCH 01/20] no more basic theme. migrating to LeptonX Lite --- docs/en/UI/AspNetCore/Basic-Theme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/UI/AspNetCore/Basic-Theme.md b/docs/en/UI/AspNetCore/Basic-Theme.md index e74799a423..903231a20a 100644 --- a/docs/en/UI/AspNetCore/Basic-Theme.md +++ b/docs/en/UI/AspNetCore/Basic-Theme.md @@ -10,7 +10,7 @@ The Basic Theme has RTL (Right-to-Left language) support. ## Installation -**This theme is already installed** when you create a new solution using the [startup templates](../../Startup-Templates/Index.md). If you need to manually install it, follow the steps below: +If you need to manually this theme, follow the steps below: * Install the [Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic](https://www.nuget.org/packages/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic) NuGet package to your web project. * Add `AbpAspNetCoreMvcUiBasicThemeModule` into the `[DependsOn(...)]` attribute for your [module class](../../Module-Development-Basics.md) in the web project. From e684909d6960c751f771369311fb5e9efa574540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alper=20Ebi=C3=A7o=C4=9Flu?= <9526587+ebicoglu@users.noreply.github.com> Date: Tue, 19 Jul 2022 15:29:29 +0300 Subject: [PATCH 02/20] Basic theme is not default anymore (leptonx lite) --- docs/en/UI/Blazor/Basic-Theme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/UI/Blazor/Basic-Theme.md b/docs/en/UI/Blazor/Basic-Theme.md index 2cd0914e2f..4060f097ba 100644 --- a/docs/en/UI/Blazor/Basic-Theme.md +++ b/docs/en/UI/Blazor/Basic-Theme.md @@ -15,7 +15,7 @@ The Basic Theme is a theme implementation for the Blazor UI. It is a minimalist ## Installation -**This theme is already installed** when you create a new solution using the [startup templates](../../Startup-Templates/Index.md). If you need to manually install it, follow the steps below: +If you need to manually this theme, follow the steps below: {{if UI == "Blazor"}} From b87cfd8f630dcf1258c56652a0b5acb7199512e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alper=20Ebi=C3=A7o=C4=9Flu?= <9526587+ebicoglu@users.noreply.github.com> Date: Tue, 19 Jul 2022 15:29:57 +0300 Subject: [PATCH 03/20] Update Basic-Theme.md --- docs/en/UI/Angular/Basic-Theme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/UI/Angular/Basic-Theme.md b/docs/en/UI/Angular/Basic-Theme.md index 7b6c98fdcc..6b9ffcfeb1 100644 --- a/docs/en/UI/Angular/Basic-Theme.md +++ b/docs/en/UI/Angular/Basic-Theme.md @@ -8,7 +8,7 @@ The Basic Theme is a theme implementation for the Angular UI. It is a minimalist ## Installation -**This theme is already installed** when you create a new solution using the [startup templates](../../Startup-Templates/Index.md). If you need to manually install it, follow the steps below: +If you need to manually this theme, follow the steps below: * Install the [@abp/ng.theme.basic](https://www.npmjs.com/package/@abp/ng.theme.basic) NPM package to your Angular project. * Open the `src/app/app.module.ts` file, import `ThemeBasicModule` (it can be imported from `@abp/ng.theme.basic` package), and add `ThemeBasicModule.forRoot()` to the `imports` array. From 6613a9d4214bcbc46e811f3ca8fe89d274189249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alper=20Ebi=C3=A7o=C4=9Flu?= <9526587+ebicoglu@users.noreply.github.com> Date: Tue, 19 Jul 2022 15:32:44 +0300 Subject: [PATCH 04/20] Default theme is LeptonX Lite right now --- docs/en/Themes/LeptonXLite/AspNetCore.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/en/Themes/LeptonXLite/AspNetCore.md b/docs/en/Themes/LeptonXLite/AspNetCore.md index 5c2c515613..eeaf55f545 100644 --- a/docs/en/Themes/LeptonXLite/AspNetCore.md +++ b/docs/en/Themes/LeptonXLite/AspNetCore.md @@ -7,6 +7,8 @@ LeptonX Lite has implementation for the ABP Framework Razor Pages. It's a simpli ## Installation +This theme is **already installed** when you create a new solution using the startup templates. If you are using any other template, you can install this theme by following the steps below: + - Add **Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite** package to your **Web** application. ```bash From 347749637ce4cd916d852670774bf938d1009b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alper=20Ebi=C3=A7o=C4=9Flu?= <9526587+ebicoglu@users.noreply.github.com> Date: Tue, 19 Jul 2022 15:32:48 +0300 Subject: [PATCH 05/20] Default theme is LeptonX Lite right now --- docs/en/Themes/LeptonXLite/blazor.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/en/Themes/LeptonXLite/blazor.md b/docs/en/Themes/LeptonXLite/blazor.md index 22bc4af285..636c33ef28 100644 --- a/docs/en/Themes/LeptonXLite/blazor.md +++ b/docs/en/Themes/LeptonXLite/blazor.md @@ -15,6 +15,8 @@ LeptonX Lite has implementation for the ABP Framework Blazor WebAssembly & Blazo ## Installation +This theme is **already installed** when you create a new solution using the startup templates. If you are using any other template, you can install this theme by following the steps below: + {{if UI == "Blazor"}} - Complete the [MVC Razor Pages Installation](AspNetCore.md#installation) for the **HttpApi.Host** application first. _If the solution is tiered/micro-service, complete the MVC steps for all MVC applications such as **HttpApi.Host** and if identity server is separated, install to the **OpenIddict**_. From 7303a95008803f13fca2fff97ab498b1e37453cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alper=20Ebi=C3=A7o=C4=9Flu?= <9526587+ebicoglu@users.noreply.github.com> Date: Tue, 19 Jul 2022 15:32:53 +0300 Subject: [PATCH 06/20] Default theme is LeptonX Lite right now --- docs/en/Themes/LeptonXLite/angular.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/en/Themes/LeptonXLite/angular.md b/docs/en/Themes/LeptonXLite/angular.md index 3edb7e6b1a..506ffaf753 100644 --- a/docs/en/Themes/LeptonXLite/angular.md +++ b/docs/en/Themes/LeptonXLite/angular.md @@ -7,6 +7,8 @@ LeptonX Lite has implementation for the ABP Framework Angular Client. It's a sim ## Installation +This theme is **already installed** when you create a new solution using the startup templates. If you are using any other template, you can install this theme by following the steps below: + To add `LeptonX-lite` into your project, * Install `@abp/ng.theme.lepton-x` From 86d4b95e8f96cbaf1d203c3613374f8d25284ac0 Mon Sep 17 00:00:00 2001 From: dlboutwe Date: Tue, 19 Jul 2022 23:50:41 -0500 Subject: [PATCH 07/20] Added missing localization items to the en.json file Added missing localization items to the en.json file --- .../Volo/CmsKit/Localization/Resources/en.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index b98319f51b..8da6be8bd5 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -184,6 +184,9 @@ "CmsKit.BlogPost.ScrollIndex": "Quick navigation bar in blog posts", "Add": "Add", "AddWidget": "Add Widget", - "PleaseConfigureWidgets": "Please configure widgets" + "PleaseConfigureWidgets": "Please configure widgets", + "SelectAnAuthor":"Select an Author", + "InThisDocument":"In This Document", + "GoToTop":"Go To Top" } } \ No newline at end of file From 4ec7c186a4aa1b7c31ec0eca304d6eea9ec24908 Mon Sep 17 00:00:00 2001 From: dlboutwe Date: Tue, 19 Jul 2022 23:51:55 -0500 Subject: [PATCH 08/20] Fixed styling issue Added an inline style to fix an unpleasant visual element in the rating widget where the circled question mark icon had what appeared to be an underscore right after it. --- .../Pages/CmsKit/Shared/Components/Rating/Default.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml index 6f1f7a542d..7d8ac031aa 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml @@ -18,7 +18,7 @@ } if (Model.Ratings != null) { - + From 64bd96ee33f37f513251d48e9df6c705e06d7778 Mon Sep 17 00:00:00 2001 From: xyfy Date: Wed, 20 Jul 2022 13:24:06 +0800 Subject: [PATCH 09/20] Update Background-Workers.md fixed the distributed lock url link to --- docs/en/Background-Workers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Background-Workers.md b/docs/en/Background-Workers.md index e1cce6ae28..412de7f787 100644 --- a/docs/en/Background-Workers.md +++ b/docs/en/Background-Workers.md @@ -128,7 +128,7 @@ Be careful if you run multiple instances of your application simultaneously in a If that's a problem for your workers, you have the following options: -* Implement your background workers so that they work in a clustered environment without any problem. Using the [distributed lock](../Distributed-Locking.md) to ensure concurrency control is a way of doing that. A background worker in an application instance may handle a distributed lock, so the workers in other application instances will wait for the lock. In this way, only one worker does the actual work, while others wait in idle. If you implement this, your workers run safely without caring about how the application is deployed. +* Implement your background workers so that they work in a clustered environment without any problem. Using the [distributed lock](Distributed-Locking.md) to ensure concurrency control is a way of doing that. A background worker in an application instance may handle a distributed lock, so the workers in other application instances will wait for the lock. In this way, only one worker does the actual work, while others wait in idle. If you implement this, your workers run safely without caring about how the application is deployed. * Stop the background workers (set `AbpBackgroundWorkerOptions.IsEnabled` to `false`) in all application instances except one of them, so only the single instance runs the workers. * Stop the background workers (set `AbpBackgroundWorkerOptions.IsEnabled` to `false`) in all application instances and create a dedicated application (maybe a console application running in its own container or a Windows Service running in the background) to execute all the background tasks. This can be a good option if your background workers consume high system resources (CPU, RAM or Disk), so you can deploy that background application to a dedicated server and your background tasks don't affect your application's performance. From d7e6c3fd75be33bdcb5637aaa3ee701b80d8e16e Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Wed, 20 Jul 2022 08:49:55 +0300 Subject: [PATCH 10/20] Update LeptonX Lite Theme Packages to 1.0.0-rc.1 --- templates/app/angular/package.json | 2 +- ...ompanyName.MyProjectName.AuthServer.csproj | 2 +- .../package.json | 2 +- .../yarn.lock | 238 ++++++++-------- ....MyProjectName.Blazor.Server.Tiered.csproj | 4 +- .../package.json | 4 +- .../yarn.lock | 268 +++++++++--------- ...anyName.MyProjectName.Blazor.Server.csproj | 4 +- .../package.json | 4 +- .../yarn.lock | 268 +++++++++--------- .../MyCompanyName.MyProjectName.Blazor.csproj | 2 +- .../wwwroot/global.css | 49 +++- .../wwwroot/index.html | 4 +- ...e.MyProjectName.HttpApi.HostWithIds.csproj | 2 +- .../package.json | 2 +- .../yarn.lock | 238 ++++++++-------- ...yCompanyName.MyProjectName.Web.Host.csproj | 2 +- .../package.json | 2 +- .../yarn.lock | 238 ++++++++-------- .../MyCompanyName.MyProjectName.Web.csproj | 2 +- .../package.json | 2 +- .../MyCompanyName.MyProjectName.Web/yarn.lock | 238 ++++++++-------- 22 files changed, 804 insertions(+), 773 deletions(-) diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index a04b563740..d0cc239305 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -19,7 +19,7 @@ "@abp/ng.setting-management": "~5.3.2", "@abp/ng.tenant-management": "~5.3.2", "@abp/ng.theme.shared": "~5.3.2", - "@abp/ng.theme.lepton-x": "~1.0.0-beta.5", + "@abp/ng.theme.lepton-x": "~1.0.0-rc.1", "@angular/animations": "~13.3.3", "@angular/common": "~13.3.3", "@angular/compiler": "~13.3.3", diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj index bc91b87df0..2fa421b562 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj @@ -42,7 +42,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json index 4c70d3533f..a86e6094e2 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock index ebc69b232b..2b23fd7903 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.5.tgz#bc5baa2e6bfd5048f097525629da87a4436b8e4e" - integrity sha1-vFuqLmv9UEjwl1JWKdqHpENrjk4= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj index 17cbcb97b1..a5260019d1 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj @@ -28,8 +28,8 @@ - - + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json index cfe1d94661..30b73b111f 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.5", - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1", + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock index 026cc3e383..cb49aabf61 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock @@ -2,52 +2,52 @@ # yarn lockfile v1 -"@abp/aspnetcore.components.server.leptonxlitetheme@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.leptonxlitetheme/-/@abp/aspnetcore.components.server.leptonxlitetheme-1.0.0-beta.5.tgz#15156400aac99138fecc179ff9f97ca591856237" - integrity sha1-FRVkAKrJkTj+zBef+fl8pZGFYjc= - dependencies: - "@abp/aspnetcore.components.server.theming" "~6.0.0-preview20220630" - -"@abp/aspnetcore.components.server.theming@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.theming/-/@abp/aspnetcore.components.server.theming-6.0.0-preview20220706.tgz#7bbd388922143c5957d96acad1322b7c63520316" - integrity sha1-e704iSIUPFlX2WrK0TIrfGNSAxY= - dependencies: - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.5.tgz#bc5baa2e6bfd5048f097525629da87a4436b8e4e" - integrity sha1-vFuqLmv9UEjwl1JWKdqHpENrjk4= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.components.server.leptonxlitetheme@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.leptonxlitetheme/-/@abp/aspnetcore.components.server.leptonxlitetheme-1.0.0-rc.1.tgz#a40d6191a275e5fbb20918e5fabfd6b97b3f815b" + integrity sha1-pA1hkaJ15fuyCRjl+r/WuXs/gVs= + dependencies: + "@abp/aspnetcore.components.server.theming" "~6.0.0-preview20220719" + +"@abp/aspnetcore.components.server.theming@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.theming/-/@abp/aspnetcore.components.server.theming-6.0.0-preview20220720.tgz#dc5cb8994b7de42f889414982cbc1f5b9fff482c" + integrity sha1-3Fy4mUt95C+IlBSYLLwfW5//SCw= + dependencies: + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -56,144 +56,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index 58e1b13398..7f7a66ce6c 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json index cfe1d94661..30b73b111f 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.5", - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1", + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock index 026cc3e383..cb49aabf61 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock @@ -2,52 +2,52 @@ # yarn lockfile v1 -"@abp/aspnetcore.components.server.leptonxlitetheme@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.leptonxlitetheme/-/@abp/aspnetcore.components.server.leptonxlitetheme-1.0.0-beta.5.tgz#15156400aac99138fecc179ff9f97ca591856237" - integrity sha1-FRVkAKrJkTj+zBef+fl8pZGFYjc= - dependencies: - "@abp/aspnetcore.components.server.theming" "~6.0.0-preview20220630" - -"@abp/aspnetcore.components.server.theming@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.theming/-/@abp/aspnetcore.components.server.theming-6.0.0-preview20220706.tgz#7bbd388922143c5957d96acad1322b7c63520316" - integrity sha1-e704iSIUPFlX2WrK0TIrfGNSAxY= - dependencies: - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.5.tgz#bc5baa2e6bfd5048f097525629da87a4436b8e4e" - integrity sha1-vFuqLmv9UEjwl1JWKdqHpENrjk4= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.components.server.leptonxlitetheme@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.leptonxlitetheme/-/@abp/aspnetcore.components.server.leptonxlitetheme-1.0.0-rc.1.tgz#a40d6191a275e5fbb20918e5fabfd6b97b3f815b" + integrity sha1-pA1hkaJ15fuyCRjl+r/WuXs/gVs= + dependencies: + "@abp/aspnetcore.components.server.theming" "~6.0.0-preview20220719" + +"@abp/aspnetcore.components.server.theming@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.theming/-/@abp/aspnetcore.components.server.theming-6.0.0-preview20220720.tgz#dc5cb8994b7de42f889414982cbc1f5b9fff482c" + integrity sha1-3Fy4mUt95C+IlBSYLLwfW5//SCw= + dependencies: + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -56,144 +56,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj index 202661a2d2..cb7138393f 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj @@ -23,7 +23,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css index b3a56f8a00..25321f5ffd 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css @@ -5516,7 +5516,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-brand { color: #686b6e; - background: rgba(247, 37, 133, 0.2); + background: rgba(247, 37, 133, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-brand a, .alert-brand .icon, @@ -5527,7 +5529,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-primary { color: #686b6e; - background: rgba(53, 93, 255, 0.2); + background: rgba(53, 93, 255, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-primary a, .alert-primary .icon, @@ -5538,7 +5542,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-secondary { color: #686b6e; - background: rgba(108, 93, 211, 0.2); + background: rgba(108, 93, 211, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-secondary a, .alert-secondary .icon, @@ -5549,7 +5555,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-success { color: #686b6e; - background: rgba(79, 191, 103, 0.2); + background: rgba(79, 191, 103, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-success a, .alert-success .icon, @@ -5560,7 +5568,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-info { color: #686b6e; - background: rgba(67, 138, 167, 0.2); + background: rgba(67, 138, 167, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-info a, .alert-info .icon, @@ -5571,7 +5581,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-warning { color: #686b6e; - background: rgba(255, 159, 56, 0.2); + background: rgba(255, 159, 56, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-warning a, .alert-warning .icon, @@ -5582,7 +5594,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-danger { color: #686b6e; - background: rgba(192, 13, 73, 0.2); + background: rgba(192, 13, 73, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-danger a, .alert-danger .icon, @@ -5593,7 +5607,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-light { color: #686b6e; - background: rgba(245, 245, 247, 0.2); + background: rgba(245, 245, 247, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-light a, .alert-light .icon, @@ -5604,7 +5620,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-dark { color: #686b6e; - background: rgba(22, 22, 22, 0.2); + background: rgba(22, 22, 22, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-dark a, .alert-dark .icon, @@ -12075,6 +12093,19 @@ body { padding-top: 72px; } +.lpx-topbar-content { + display: flex; + align-items: center; + margin-right: 0.4rem; + gap: 0.7rem; + font-size: 0.875em; +} +.lpx-topbar-content .lpx-avatar .lpx-avatar-img, +.lpx-topbar-content .lpx-avatar .lpx-avatar-icon { + height: 24px; + width: 24px; +} + @media only screen and (min-width: 1200px) { .lpx-footbar-container { left: 280px; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html index f76edbb631..97aa0ac121 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html @@ -8,7 +8,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj index 1cd0ec3cde..4ee3eb11f7 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj @@ -25,7 +25,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json index 6370b24cac..b0b2ecbefe 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock index e5bce29887..c3e2752356 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.5.tgz#bc5baa2e6bfd5048f097525629da87a4436b8e4e" - integrity sha1-vFuqLmv9UEjwl1JWKdqHpENrjk4= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index 957714626f..c4d92656ad 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -26,7 +26,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json index 6370b24cac..b0b2ecbefe 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock index ebc69b232b..2b23fd7903 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.5.tgz#bc5baa2e6bfd5048f097525629da87a4436b8e4e" - integrity sha1-vFuqLmv9UEjwl1JWKdqHpENrjk4= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index d839f8df53..c456030c2a 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -41,7 +41,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json index 6370b24cac..b0b2ecbefe 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock index e379c868cc..78a3147810 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.5.tgz#bc5baa2e6bfd5048f097525629da87a4436b8e4e" - integrity sha1-vFuqLmv9UEjwl1JWKdqHpENrjk4= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" From 9c7e08a4ab0ecf0b1c2da9d7761c343399318331 Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Wed, 20 Jul 2022 08:59:25 +0300 Subject: [PATCH 11/20] Update LeptonX Lite Theme Packages to 1.0.0-rc.1 for nolayers template --- templates/app-nolayers/angular/package.json | 2 +- .../MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj | 4 ++-- .../package.json | 2 +- .../MyCompanyName.MyProjectName.Blazor.Server.csproj | 4 ++-- .../MyCompanyName.MyProjectName.Blazor.Server/package.json | 4 ++-- .../MyCompanyName.MyProjectName.Host.Mongo.csproj | 2 +- .../MyCompanyName.MyProjectName.Host.Mongo/package.json | 2 +- .../MyCompanyName.MyProjectName.Host.csproj | 2 +- .../aspnet-core/MyCompanyName.MyProjectName.Host/package.json | 2 +- .../MyCompanyName.MyProjectName.Mvc.Mongo.csproj | 2 +- .../MyCompanyName.MyProjectName.Mvc.Mongo/package.json | 2 +- .../MyCompanyName.MyProjectName.Mvc.csproj | 2 +- .../aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index cd2b0d6012..6d1e0387ba 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -19,7 +19,7 @@ "@abp/ng.setting-management": "~5.3.2", "@abp/ng.tenant-management": "~5.3.2", "@abp/ng.theme.shared": "~5.3.2", - "@abp/ng.theme.lepton-x": "~1.0.0-beta.5", + "@abp/ng.theme.lepton-x": "~1.0.0-rc.1", "@angular/animations": "~13.1.1", "@angular/common": "~13.1.1", "@angular/compiler": "~13.1.1", diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj index 52fa59a985..34b4250460 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json index 46f6e5ab6f..101e95a5a6 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.5" + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index 420a031c00..6215c2a44b 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json index cfe1d94661..30b73b111f 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.5", - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1", + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj index 7c499d8ab2..ad5d95868d 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj @@ -69,7 +69,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json index 5a69896673..de039528aa 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj index cef852ee83..0810cdd06e 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj @@ -70,7 +70,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json index 5a69896673..de039528aa 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj index 33d51906ef..b6374bff3e 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj @@ -17,7 +17,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json index 5a69896673..de039528aa 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj index 5fb4be341b..92f7834c86 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj @@ -17,7 +17,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json index 5a69896673..de039528aa 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-rc.1" } } From a18c6a3903908956f46bd16dd5d05c48b6dad8f5 Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Wed, 20 Jul 2022 10:22:04 +0300 Subject: [PATCH 12/20] Update Default.cshtml --- .../Pages/CmsKit/Shared/Components/Rating/Default.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml index 7d8ac031aa..9b7f6e24f7 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml @@ -12,13 +12,13 @@ { @if (Model.CurrentRating != null) { - + @L["Undo"] } if (Model.Ratings != null) { - + From f02ad494a996eb3c4d282260d2cefe429412e199 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Jul 2022 08:56:29 +0000 Subject: [PATCH 13/20] Bump lodash from 4.17.20 to 4.17.21 in /npm/scripts Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21) --- updated-dependencies: - dependency-name: lodash dependency-type: indirect ... Signed-off-by: dependabot[bot] --- npm/scripts/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/npm/scripts/yarn.lock b/npm/scripts/yarn.lock index bae2201646..2feefc9b8a 100644 --- a/npm/scripts/yarn.lock +++ b/npm/scripts/yarn.lock @@ -1144,9 +1144,9 @@ locate-path@^6.0.0: p-locate "^5.0.0" lodash@^4.17.20: - version "4.17.20" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" - integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" From 6209127e6a0dbb8611fff5bc7ee0ec443fea8481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Thu, 21 Jul 2022 11:39:15 +0300 Subject: [PATCH 14/20] Added new test for IDistributedCache. --- .../Volo/Abp/Caching/DistributedCache_Tests.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs index fdba79f1af..a35592497b 100644 --- a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs +++ b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs @@ -947,4 +947,19 @@ public class DistributedCache_Tests : AbpIntegratedTest cacheValue[0].Value.ShouldBeNull(); cacheValue[1].Value.ShouldBeNull(); } + + [Fact] + public async Task Should_Get_Same_Instance_When_Resolve_With_Or_Without_Key() + { + var cache1 = GetRequiredService>(); + var cache2 = GetRequiredService>(); + + await cache1.SetAsync("john", new PersonCacheItem("John Doe")); + + var item1 = await cache1.GetAsync("john"); + item1.Name.ShouldBe("John Doe"); + + var item2 = await cache2.GetAsync("john"); + item2.Name.ShouldBe("John Doe"); + } } From ece35761e02c6ee6445514e83bd0d012c61ca76f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Thu, 21 Jul 2022 11:41:07 +0300 Subject: [PATCH 15/20] Rename test. --- .../Volo/Abp/Caching/DistributedCache_Tests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs index a35592497b..7908dd3d96 100644 --- a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs +++ b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs @@ -949,7 +949,7 @@ public class DistributedCache_Tests : AbpIntegratedTest } [Fact] - public async Task Should_Get_Same_Instance_When_Resolve_With_Or_Without_Key() + public async Task Should_Get_Same_Cache_Set_When_Resolve_With_Or_Without_Key() { var cache1 = GetRequiredService>(); var cache2 = GetRequiredService>(); From 7a77dc476efe1854ef6f441ab35d602a116bb4dc Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Thu, 21 Jul 2022 11:51:07 +0300 Subject: [PATCH 16/20] Fix wrong project reference path for appnolayers template --- ...ompanyName.MyProjectName.Blazor.Server.Mongo.csproj | 10 +++++----- .../MyCompanyName.MyProjectName.Blazor.Server.csproj | 10 +++++----- .../MyCompanyName.MyProjectName.Host.Mongo.csproj | 6 +++--- .../MyCompanyName.MyProjectName.Host.csproj | 6 +++--- .../MyCompanyName.MyProjectName.Mvc.Mongo.csproj | 6 +++--- .../MyCompanyName.MyProjectName.Mvc.csproj | 6 +++--- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj index 34b4250460..c205202a42 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj @@ -15,11 +15,11 @@ - - - - - + + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index 6215c2a44b..661dfdf8db 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -15,11 +15,11 @@ - - - - - + + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj index ad5d95868d..f4c4638ef9 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj @@ -65,9 +65,9 @@ - - - + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj index 0810cdd06e..9697e2cf25 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj @@ -66,9 +66,9 @@ - - - + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj index b6374bff3e..5bafd4f788 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj index 92f7834c86..174a674f39 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj @@ -13,9 +13,9 @@ - - - + + + From 90a50a7bc2e6e7a668ba0a0f8ff37b2600eb8cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Muhammed=20Altu=C4=9F?= Date: Thu, 21 Jul 2022 17:11:12 +0300 Subject: [PATCH 17/20] Fix/ng template bugs (#13361) * update feature management project references * remove logo customization from app nolayers angular styles * add script for copy abp packages to templates' node_modules folder * remove logo customization from app template's style --- .../OpenIddict.Demo.Server.csproj | 8 +- .../scripts/copy-packages-to-templates.ts | 82 +++++++++++++++++++ npm/ng-packs/scripts/package.json | 3 +- .../app-nolayers/angular/src/styles.scss | 6 -- ...e.MyProjectName.Blazor.Server.Mongo.csproj | 8 +- ...anyName.MyProjectName.Blazor.Server.csproj | 8 +- ...ompanyName.MyProjectName.Host.Mongo.csproj | 6 +- .../MyCompanyName.MyProjectName.Host.csproj | 6 +- ...CompanyName.MyProjectName.Mvc.Mongo.csproj | 8 +- .../MyCompanyName.MyProjectName.Mvc.csproj | 8 +- templates/app/angular/src/styles.scss | 6 -- 11 files changed, 110 insertions(+), 39 deletions(-) create mode 100644 npm/ng-packs/scripts/copy-packages-to-templates.ts diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj b/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj index 227a4bfd7b..97453af046 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj +++ b/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj @@ -40,10 +40,10 @@ - - - - + + + + diff --git a/npm/ng-packs/scripts/copy-packages-to-templates.ts b/npm/ng-packs/scripts/copy-packages-to-templates.ts new file mode 100644 index 0000000000..c611c1109a --- /dev/null +++ b/npm/ng-packs/scripts/copy-packages-to-templates.ts @@ -0,0 +1,82 @@ +import execa from 'execa'; +import fse from 'fs-extra'; +import fs from 'fs'; + +const templates = ['app', 'app-nolayers', 'module']; +const packageMap = { + account: 'ng.account', + 'account-core': 'ng.account.core', + components: 'ng.components', + core: 'ng.core', + 'feature-management': 'ng.feature-management', + identity: 'ng.identity', + 'permission-management': 'ng.permission-management', + 'setting-management': 'ng.setting-management', + 'tenant-management': 'ng.tenant-management', + 'theme-basic': 'ng.theme.basic', + 'theme-shared': 'ng.theme.shared', +}; + +(async () => { + await execa('yarn', ['build'], { + stdout: 'inherit', + }); + + await installPackages(); + + await removeAbpPackages(); + + await copyBuildedPackagesFromDistFolder(); +})(); + +async function runEachTemplate( + handler: (template: string, templatePath?: string) => void | Promise, +) { + for (var template of templates) { + const templatePath = `../../../templates/${template}/angular`; + const result = handler(template, templatePath); + result instanceof Promise ? await result : result; + } +} + +async function installPackages() { + await runEachTemplate(async (template, templatePath) => { + if (fse.existsSync(`${templatePath}/yarn.lock`)) { + fse.removeSync(`${templatePath}/yarn.lock`); + } + await execa('yarn', ['install', '--ignore-scripts'], { + stdout: 'inherit', + cwd: templatePath, + }); + }); +} + +async function removeAbpPackages() { + await runEachTemplate(async (template, templatePath) => { + Object.values(packageMap).forEach(value => { + const path = `${templatePath}/node_modules/@abp/${value}`; + if (fs.existsSync(path)) { + fse.removeSync(path); + } + }); + if (fs.existsSync(`${templatePath}/.angular`)) { + fse.removeSync(`${templatePath}/.angular`); + } + }); +} +function createFolderIfNotExists(destination: string) { + destination.split('/').reduce((acc, dir) => { + if (!fs.existsSync(acc)) { + fs.mkdirSync(acc); + } + return `${acc}/${dir}`; + }); +} +async function copyBuildedPackagesFromDistFolder() { + await runEachTemplate(async (template, templatePath) => { + Object.entries(packageMap).forEach(([key, value]) => { + createFolderIfNotExists(`${templatePath}/node_modules/@abp/${value}`); + fse.copySync(`../dist/packages/${key}/`, `${templatePath}/node_modules/@abp/${value}`); + }); + }); +} diff --git a/npm/ng-packs/scripts/package.json b/npm/ng-packs/scripts/package.json index b0961239bb..8f82f88cc9 100644 --- a/npm/ng-packs/scripts/package.json +++ b/npm/ng-packs/scripts/package.json @@ -8,7 +8,8 @@ "build:prod": "ts-node -r tsconfig-paths/register prod-build.ts", "build:schematics": "ts-node -r tsconfig-paths/register build-schematics.ts", "publish-packages": "ts-node -r tsconfig-paths/register publish.ts", - "replace-with-tilde": "ts-node -r tsconfig-paths/register replace-with-tilde.ts" + "replace-with-tilde": "ts-node -r tsconfig-paths/register replace-with-tilde.ts", + "copy-to-templates": "ts-node -r tsconfig-paths/register copy-packages-to-templates.ts" }, "author": "", "dependencies": { diff --git a/templates/app-nolayers/angular/src/styles.scss b/templates/app-nolayers/angular/src/styles.scss index dbc4332587..efe57bd8c3 100644 --- a/templates/app-nolayers/angular/src/styles.scss +++ b/templates/app-nolayers/angular/src/styles.scss @@ -24,9 +24,3 @@ transform: translate(-50%, -50%); } } - -:root { - --lpx-logo: url('/assets/images/logo.png'); - --lpx-logo-icon: url('/assets/images/logo-icon.png'); - --lpx-brand: #edae53; -} \ No newline at end of file diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj index c205202a42..af31d6b3b0 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj @@ -63,10 +63,10 @@ - - - - + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index 661dfdf8db..9525771603 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -64,10 +64,10 @@ - - - - + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj index f4c4638ef9..afd7cf01cf 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj @@ -48,9 +48,9 @@ - - - + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj index 9697e2cf25..9b9817c9a6 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj @@ -49,9 +49,9 @@ - - - + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj index 5bafd4f788..10e8b24a06 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj @@ -58,10 +58,10 @@ - - - - + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj index 174a674f39..4c48cc7a23 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj @@ -59,10 +59,10 @@ - - - - + + + + diff --git a/templates/app/angular/src/styles.scss b/templates/app/angular/src/styles.scss index 14d29fc69b..efe57bd8c3 100644 --- a/templates/app/angular/src/styles.scss +++ b/templates/app/angular/src/styles.scss @@ -24,9 +24,3 @@ transform: translate(-50%, -50%); } } - -:root { - --lpx-logo: url('/assets/images/logo.png'); - --lpx-logo-icon: url('/assets/images/logo-icon.png'); - --lpx-brand: #edae53; -} \ No newline at end of file From 6cb4ae845d7048741e8a7b0360fb3c7a980be7fd Mon Sep 17 00:00:00 2001 From: ismael Liriano Date: Thu, 21 Jul 2022 15:24:54 -0400 Subject: [PATCH 18/20] Grammatically updated the contribution guide docs --- .../POST.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Community-Articles/2020-09-09-Replacing-Email-Template-and-Sending-Emails/POST.md b/docs/en/Community-Articles/2020-09-09-Replacing-Email-Template-and-Sending-Emails/POST.md index 049171731b..f412ca3170 100644 --- a/docs/en/Community-Articles/2020-09-09-Replacing-Email-Template-and-Sending-Emails/POST.md +++ b/docs/en/Community-Articles/2020-09-09-Replacing-Email-Template-and-Sending-Emails/POST.md @@ -335,7 +335,7 @@ After sending the email we should see the template like below.
-

Share your experiences with the ABP Framework!
ABP is an open source and community driven project. This guide is aims to help anyone wants to contribute to the project.

+

Share your experiences with the ABP Framework!
ABP is an open source and community driven project. This guide is aimed to help anyone who wants to contribute to the project.

If you want to write articles or "how to" guides related to the ABP Framework and ASP.NET Core, please submit your article to the community.abp.io web site.

From 37ef2ccf7ae11e30e7da926b34e8b0b29aca0962 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 22 Jul 2022 12:40:41 +0800 Subject: [PATCH 19/20] Check `TenantSideFeatures` only if tenant is available. --- .../Pages/SettingManagement/SettingPageContributorManager.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs index e1f597b85a..9b08236cae 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs @@ -66,7 +66,9 @@ public class SettingPageContributorManager : IScopedDependency if (available) { var requiredTenantSideFeatures = contributor.GetRequiredFeatures(MultiTenancySides.Tenant); - if (requiredTenantSideFeatures.Any() && !await featureChecker.IsEnabledAsync(true, requiredTenantSideFeatures.ToArray())) + if (requiredTenantSideFeatures.Any() && + ServiceProvider.GetRequiredService().IsAvailable && + !await featureChecker.IsEnabledAsync(true, requiredTenantSideFeatures.ToArray())) { available = false; } From 5fe97ae1ec0bd868e6bc53efc244bd1d5faacce4 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Fri, 22 Jul 2022 11:03:24 +0300 Subject: [PATCH 20/20] Update common.props --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index e6c9c40c28..f8b7c620c2 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 6.0.0 + 7.0.0 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/