Merge pull request #227 from EasyAbp/abp601

Upgrade to ABP 6.0.1 and dependent packages
EasyAbp · Nov 21, 2022 · 28a57ab · 28a57ab
2 parents a222d4c + 23a67f1
commit 28a57ab
Show file tree

Hide file tree

Showing 20 changed files with 151 additions and 160 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -34,6 +34,9 @@ jobs:
       - name: dotnet build
         run: dotnet build -c Release
 
+      - name: dotnet test
+        run: dotnet test -c Release --no-restore --no-build
+
       - name: dotnet pack
         run: dotnet pack -c Release --no-build -o dest
 
@@ -47,6 +50,7 @@ jobs:
           del *.Host.Shared.*
           del *.HttpApi.Host.*
           del *.IdentityServer.*
+          del *.AuthServer.*
           del *.Web.Host.*
           del *.Web.Unified.*
           del *.HttpApi.Client.ConsoleTestApp.*

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,13 +1,13 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>5.3.1</AbpVersion>
-    <EasyAbpAbpTreesModuleVersion>2.7.1</EasyAbpAbpTreesModuleVersion>
-    <EasyAbpPaymentServiceModuleVersion>2.0.15</EasyAbpPaymentServiceModuleVersion>
-    <EasyAbpAbpTagHelperPlusModuleVersion>1.0.1</EasyAbpAbpTagHelperPlusModuleVersion>
-    <EasyAbpBookingServiceModuleVersion>0.1.1</EasyAbpBookingServiceModuleVersion>
-    <DaprSdkVersion>1.7.0</DaprSdkVersion>
-    <OrleansVersion>3.6.2</OrleansVersion>
+    <AbpVersion>6.0.1</AbpVersion>
+    <EasyAbpAbpTreesModuleVersion>2.8.0</EasyAbpAbpTreesModuleVersion>
+    <EasyAbpPaymentServiceModuleVersion>2.1.0</EasyAbpPaymentServiceModuleVersion>
+    <EasyAbpAbpTagHelperPlusModuleVersion>1.2.0</EasyAbpAbpTagHelperPlusModuleVersion>
+    <EasyAbpBookingServiceModuleVersion>0.3.0</EasyAbpBookingServiceModuleVersion>
+    <DaprSdkVersion>1.9.0</DaprSdkVersion>
+    <OrleansVersion>3.6.5</OrleansVersion>
     <NodaMoneyVersion>1.0.5</NodaMoneyVersion>
 
   </PropertyGroup>

diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>3.0.0</Version>
+    <Version>3.1.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

diff --git a/docs/README.md b/docs/README.md
@@ -3,7 +3,7 @@
 [![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=%2F%2FProject%2FPropertyGroup%2FAbpVersion&url=https%3A%2F%2Fraw.githubusercontent.com%2FEasyAbp%2FEShop%2Fmaster%2FDirectory.Build.props)](https://abp.io)
 [![NuGet](https://img.shields.io/nuget/v/EasyAbp.EShop.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.EShop.Domain.Shared)
 [![NuGet Download](https://img.shields.io/nuget/dt/EasyAbp.EShop.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.EShop.Domain.Shared)
-[![Discord online](https://badgen.net/discord/online-members/S6QaezrCRq?label=Discord)](https://discord.gg/S6QaezrCRq)
+[![Discord online](https://badgen.net/discord/online-members/xyg8TrRa27?label=Discord)](https://discord.gg/xyg8TrRa27)
 [![GitHub stars](https://img.shields.io/github/stars/EasyAbp/EShop?style=social)](https://www.github.com/EasyAbp/EShop)
 
 An abp application module group that provides basic e-shop service.

diff --git a/docs/plugins/baskets/README.md b/docs/plugins/baskets/README.md
@@ -3,7 +3,7 @@
 [![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=%2F%2FProject%2FPropertyGroup%2FAbpVersion&url=https%3A%2F%2Fraw.githubusercontent.com%2FEasyAbp%2FEShop%2Fmaster%2FDirectory.Build.props)](https://abp.io)
 [![NuGet](https://img.shields.io/nuget/v/EasyAbp.EShop.Plugins.Baskets.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.EShop.Plugins.Baskets.Domain.Shared)
 [![NuGet Download](https://img.shields.io/nuget/dt/EasyAbp.EShop.Plugins.Baskets.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.EShop.Plugins.Baskets.Domain.Shared)
-[![Discord online](https://badgen.net/discord/online-members/S6QaezrCRq?label=Discord)](https://discord.gg/S6QaezrCRq)
+[![Discord online](https://badgen.net/discord/online-members/xyg8TrRa27?label=Discord)](https://discord.gg/xyg8TrRa27)
 [![GitHub stars](https://img.shields.io/github/stars/EasyAbp/EShop?style=social)](https://www.github.com/EasyAbp/EShop)
 
 🛒 A baskets (cart) plugin for EShop. It supports both the server-side pattern and the client-side pattern.

diff --git a/docs/plugins/booking/README.md b/docs/plugins/booking/README.md
@@ -3,7 +3,7 @@
 [![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=%2F%2FProject%2FPropertyGroup%2FAbpVersion&url=https%3A%2F%2Fraw.githubusercontent.com%2FEasyAbp%2FEShop%2Fmaster%2FDirectory.Build.props)](https://abp.io)
 [![NuGet](https://img.shields.io/nuget/v/EasyAbp.EShop.Plugins.Booking.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.EShop.Plugins.Booking.Domain.Shared)
 [![NuGet Download](https://img.shields.io/nuget/dt/EasyAbp.EShop.Plugins.Booking.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.EShop.Plugins.Booking.Domain.Shared)
-[![Discord online](https://badgen.net/discord/online-members/S6QaezrCRq?label=Discord)](https://discord.gg/S6QaezrCRq)
+[![Discord online](https://badgen.net/discord/online-members/xyg8TrRa27?label=Discord)](https://discord.gg/xyg8TrRa27)
 [![GitHub stars](https://img.shields.io/github/stars/EasyAbp/EShop?style=social)](https://www.github.com/EasyAbp/EShop)
 
 A booking-business plugin for EShop. It extends EShop to use the [EasyAbp.BookingService](https://github.com/EasyAbp/BookingService) module to help end-users to book some assets online.

diff --git a/docs/plugins/flash-sales/README.md b/docs/plugins/flash-sales/README.md
@@ -3,7 +3,7 @@
 [![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=%2F%2FProject%2FPropertyGroup%2FAbpVersion&url=https%3A%2F%2Fraw.githubusercontent.com%2FEasyAbp%2FEShop%2Fmaster%2FDirectory.Build.props)](https://abp.io)
 [![NuGet](https://img.shields.io/nuget/v/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared)
 [![NuGet Download](https://img.shields.io/nuget/dt/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.EShop.Plugins.FlashSales.Domain.Shared)
-[![Discord online](https://badgen.net/discord/online-members/S6QaezrCRq?label=Discord)](https://discord.gg/S6QaezrCRq)
+[![Discord online](https://badgen.net/discord/online-members/xyg8TrRa27?label=Discord)](https://discord.gg/xyg8TrRa27)
 [![GitHub stars](https://img.shields.io/github/stars/EasyAbp/EShop?style=social)](https://www.github.com/EasyAbp/EShop)
 
 A flash-sales plugin for EShop.

diff --git a/docs/plugins/inventories/dapr-actors/README.md b/docs/plugins/inventories/dapr-actors/README.md
@@ -3,7 +3,7 @@
 [![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=%2F%2FProject%2FPropertyGroup%2FAbpVersion&url=https%3A%2F%2Fraw.githubusercontent.com%2FEasyAbp%2FEShop%2Fmaster%2FDirectory.Build.props)](https://abp.io)
 [![NuGet](https://img.shields.io/nuget/v/EasyAbp.EShop.Plugins.Inventories.DaprActors.Abstractions.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.EShop.Plugins.Inventories.DaprActors.Abstractions)
 [![NuGet Download](https://img.shields.io/nuget/dt/EasyAbp.EShop.Plugins.Inventories.DaprActors.Abstractions.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.EShop.Plugins.Inventories.DaprActors.Abstractions)
-[![Discord online](https://badgen.net/discord/online-members/S6QaezrCRq?label=Discord)](https://discord.gg/S6QaezrCRq)
+[![Discord online](https://badgen.net/discord/online-members/xyg8TrRa27?label=Discord)](https://discord.gg/xyg8TrRa27)
 [![GitHub stars](https://img.shields.io/github/stars/EasyAbp/EShop?style=social)](https://www.github.com/EasyAbp/EShop)
 
 EShop product-inventory implementation of [Dapr Actors](https://docs.dapr.io/developing-applications/building-blocks/actors/actors-overview).

diff --git a/docs/plugins/inventories/orleans-grains/README.md b/docs/plugins/inventories/orleans-grains/README.md
@@ -3,7 +3,7 @@
 [![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=%2F%2FProject%2FPropertyGroup%2FAbpVersion&url=https%3A%2F%2Fraw.githubusercontent.com%2FEasyAbp%2FEShop%2Fmaster%2FDirectory.Build.props)](https://abp.io)
 [![NuGet](https://img.shields.io/nuget/v/EasyAbp.EShop.Plugins.Inventories.OrleansGrains.Abstractions.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.EShop.Plugins.Inventories.OrleansGrains.Abstractions)
 [![NuGet Download](https://img.shields.io/nuget/dt/EasyAbp.EShop.Plugins.Inventories.OrleansGrains.Abstractions.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.EShop.Plugins.Inventories.OrleansGrains.Abstractions)
-[![Discord online](https://badgen.net/discord/online-members/S6QaezrCRq?label=Discord)](https://discord.gg/S6QaezrCRq)
+[![Discord online](https://badgen.net/discord/online-members/xyg8TrRa27?label=Discord)](https://discord.gg/xyg8TrRa27)
 [![GitHub stars](https://img.shields.io/github/stars/EasyAbp/EShop?style=social)](https://www.github.com/EasyAbp/EShop)
 
 EShop product-inventory implementation of [Orleans Grains](https://docs.microsoft.com/en-us/dotnet/orleans/grains).

diff --git a/...on/EasyAbp/EShop/Orders/Booking/Authorization/BookingOrderCreationAuthorizationHandler.cs b/...on/EasyAbp/EShop/Orders/Booking/Authorization/BookingOrderCreationAuthorizationHandler.cs
@@ -132,6 +132,7 @@ protected virtual OccupyAssetByCategoryInfoModel CreateOccupyAssetByCategoryInfo
         {
             return new OccupyAssetByCategoryInfoModel(
                 assetCategoryId,
+                orderLine.FindBookingPeriodSchemeId(),
                 orderLine.GetBookingVolume(),
                 orderLine.GetBookingDate(),
                 orderLine.GetBookingStartingTime(),

diff --git a/...asyAbp/EShop/Payments/Booking/Authorization/BookingPaymentCreationAuthorizationHandler.cs b/...asyAbp/EShop/Payments/Booking/Authorization/BookingPaymentCreationAuthorizationHandler.cs
@@ -112,6 +112,7 @@ protected virtual OccupyAssetByCategoryInfoModel CreateOccupyAssetByCategoryInfo
         {
             return new OccupyAssetByCategoryInfoModel(
                 assetCategoryId,
+                orderLine.FindBookingPeriodSchemeId(),
                 orderLine.GetBookingVolume(),
                 orderLine.GetBookingDate(),
                 orderLine.GetBookingStartingTime(),

diff --git a/...g.Application/EasyAbp/EShop/Plugins/Booking/EventHandlers/BookingOrderPaidEventHandler.cs b/...g.Application/EasyAbp/EShop/Plugins/Booking/EventHandlers/BookingOrderPaidEventHandler.cs
@@ -27,6 +27,7 @@ public virtual async Task HandleEventAsync(OrderPaidEto eventData)
         {
             var assetId = orderLine.FindBookingAssetId();
             var assetCategoryId = orderLine.FindBookingAssetCategoryId();
+            var periodSchemeId = orderLine.FindBookingPeriodSchemeId();
             var volume = orderLine.FindBookingVolume();
             var date = orderLine.FindBookingDate();
             var startingTime = orderLine.FindBookingStartingTime();
@@ -51,6 +52,7 @@ public virtual async Task HandleEventAsync(OrderPaidEto eventData)
             {
                 occupyByCategoryModels.Add(new OccupyAssetByCategoryInfoModel(
                     assetCategoryId: assetCategoryId.Value,
+                    periodSchemeId: periodSchemeId,
                     volume: volume.Value,
                     date: date.Value,
                     startingTime: startingTime.Value,

diff --git a/...rc/EasyAbp.EShop.Plugins.Booking.Installer/EasyAbp.EShop.Plugins.Booking.Installer.csproj b/...rc/EasyAbp.EShop.Plugins.Booking.Installer/EasyAbp.EShop.Plugins.Booking.Installer.csproj
@@ -9,7 +9,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Volo.Abp.Studio.ModuleInstaller" Version="$(AbpVersion)" />
         <PackageReference Include="Volo.Abp.VirtualFileSystem" Version="$(AbpVersion)" />
     </ItemGroup>
 

diff --git a/...lugins.Booking.Installer/EasyAbp/EShop/Plugins/Booking/BookingInstallerPipelineBuilder.cs b/...lugins.Booking.Installer/EasyAbp/EShop/Plugins/Booking/BookingInstallerPipelineBuilder.cs
diff --git a/...ins.Booking.Installer/EasyAbp/EShop/Plugins/Booking/EShopPluginsBookingInstallerModule.cs b/...ins.Booking.Installer/EasyAbp/EShop/Plugins/Booking/EShopPluginsBookingInstallerModule.cs
@@ -1,11 +1,9 @@
-using Volo.Abp.Studio;
-using Volo.Abp.Modularity;
+using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
 
 namespace EasyAbp.EShop.Plugins.Booking;
 
 [DependsOn(
-    typeof(AbpStudioModuleInstallerModule),
     typeof(AbpVirtualFileSystemModule)
     )]
 public class EShopPluginsBookingInstallerModule : AbpModule

diff --git a/.../Plugins/Booking/GrantedStores/GrantedStore/ViewModels/CreateEditGrantedStoreViewModel.cs b/.../Plugins/Booking/GrantedStores/GrantedStore/ViewModels/CreateEditGrantedStoreViewModel.cs
@@ -18,17 +18,17 @@ public class CreateEditGrantedStoreViewModel
         public Guid StoreId { get; set; }
 
         [EasySelector(
-            getListedDataSourceUrl: BookingServiceUrls.GetAssetListedDataSourceUrl,
-            getSingleDataSourceUrl: BookingServiceUrls.GetAssetSingleDataSourceUrl,
+            getListedDataSourceUrl: BookingServiceCommonUrls.GetAssetListedDataSourceUrl,
+            getSingleDataSourceUrl: BookingServiceCommonUrls.GetAssetSingleDataSourceUrl,
             keyPropertyName: "id",
             textPropertyName: "name",
             moduleName: BookingServiceRemoteServiceConsts.ModuleName)]
         [Display(Name = "GrantedStoreAssetId")]
         public Guid? AssetId { get; set; }
 
         [EasySelector(
-            getListedDataSourceUrl: BookingServiceUrls.GetAssetCategoryListedDataSourceUrl,
-            getSingleDataSourceUrl: BookingServiceUrls.GetAssetCategorySingleDataSourceUrl,
+            getListedDataSourceUrl: BookingServiceCommonUrls.GetAssetCategoryListedDataSourceUrl,
+            getSingleDataSourceUrl: BookingServiceCommonUrls.GetAssetCategorySingleDataSourceUrl,
             keyPropertyName: "id",
             textPropertyName: "name",
             moduleName: BookingServiceRemoteServiceConsts.ModuleName)]

diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj
@@ -50,7 +50,7 @@
     <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Web" Version="$(EasyAbpPaymentServiceModuleVersion)" />
     <PackageReference Include="EasyAbp.PaymentService.Prepayment.Web" Version="$(EasyAbpPaymentServiceModuleVersion)" />
     <PackageReference Include="EasyAbp.BookingService.Web" Version="$(EasyAbpBookingServiceModuleVersion)" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.3" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0" />
     <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(AbpVersion)" />

diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Web/package.json b/samples/EShopSample/aspnet-core/src/EShopSample.Web/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~5.3.1"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0"
   }
 }
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Web/wwwroot/libs/abp/core/abp.js b/samples/EShopSample/aspnet-core/src/EShopSample.Web/wwwroot/libs/abp/core/abp.js
@@ -372,7 +372,9 @@ var abp = abp || {};
             setTimeout(function () {
                 if (element) {
                     element.classList.remove('abp-block-area-disappearing');
-                    element.parentElement.removeChild(element);
+                    if (element.parentElement) {
+                        element.parentElement.removeChild(element);
+                    }
                 }
             }, 250);
         }