Upgrade to ABP v4.4.0

Upgrade to AbpHelper CLI v0.8.2 Upgrade to Electron 14.0.0
EasyAbp · Sep 1, 2021 · 0d5117f · 0d5117f
1 parent 733221c
commit 0d5117f
Show file tree

Hide file tree

Showing 16 changed files with 192 additions and 5,064 deletions.
diff --git a/dotnet/Directory.Build.props b/dotnet/Directory.Build.props
@@ -1,8 +1,9 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>4.3.0</AbpVersion>
-    <AbpHelperCliVersion>0.8.1</AbpHelperCliVersion>
+    <AbpVersion>4.4.0</AbpVersion>
+    <AbpHelperCliVersion>0.8.2</AbpHelperCliVersion>
+    <BlazoriseVersion>0.9.4.1</BlazoriseVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/dotnet/common.props b/dotnet/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>1.3.2</Version>
+    <Version>1.4.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
 	<AbpProjectType>app</AbpProjectType>
   </PropertyGroup>

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application/EasyAbp.AbpHelper.Gui.Application.csproj b/dotnet/src/EasyAbp.AbpHelper.Gui.Application/EasyAbp.AbpHelper.Gui.Application.csproj
@@ -11,6 +11,7 @@
     <PackageReference Include="EasyAbp.AbpHelper.Core" Version="$(AbpHelperCliVersion)" />
     <PackageReference Include="Volo.Abp.AutoMapper" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Cli.Core" Version="$(AbpVersion)" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="$(AbpVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application/GuiApplicationModule.cs b/dotnet/src/EasyAbp.AbpHelper.Gui.Application/GuiApplicationModule.cs
@@ -2,6 +2,7 @@
 using EasyAbp.AbpHelper.Gui.LogService;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp;
+using Volo.Abp.Application;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Cli;
 using Volo.Abp.Modularity;
@@ -10,6 +11,7 @@ namespace EasyAbp.AbpHelper.Gui
 {
     [DependsOn(
         typeof(AbpAutoMapperModule),
+        typeof(AbpDddApplicationModule),
         typeof(AbpCliCoreModule),
         typeof(AbpHelperCoreModule),
         typeof(GuiApplicationContractsModule)

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/EasyAbp.AbpHelper.Gui.Blazor.csproj b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/EasyAbp.AbpHelper.Gui.Blazor.csproj
@@ -16,8 +16,8 @@
   <ItemGroup>
 <!--    <PackageReference Include="Blazor-Analytics" Version="3.3.0" />-->
     <PackageReference Include="Blazorx-Analytics" Version="1.0.0" />
-    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.5" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.5" />
+    <PackageReference Include="Blazorise.Bootstrap" Version="$(BlazoriseVersion)" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="$(BlazoriseVersion)" />
     <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
   </ItemGroup>

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/GuiBundleContributor.cs b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/GuiBundleContributor.cs
diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/Pages/Solutions/Index.razor b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/Pages/Solutions/Index.razor
@@ -11,9 +11,8 @@
         <Row Class="justify-content-between">
             <Column ColumnSize="ColumnSize.IsAuto">
                 <h4>@L["ManageSolutions"]</h4>
-            </Column>
-            <Column ColumnSize="ColumnSize.IsAuto">
-                <Button Color="Color.Primary" Size="Size.Medium" Clicked="OpenOpenSolutionModalAsync">@L["Open"]</Button>
+            </Column><Column ColumnSize="ColumnSize.IsAuto">
+                <Button Color="Color.Primary" Size="global::Blazorise.Size.Medium" Clicked="OpenOpenSolutionModalAsync">@L["Open"]</Button>
             </Column>
         </Row>
     </CardHeader>

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/package-lock.json b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/package-lock.json
diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/package.json b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/package.json
@@ -1,9 +1,9 @@
 {
-  "version": "1.3.2",
+  "version": "1.4.0",
   "name": "easyabp-abphelper-gui",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0",
-    "@abp/aspnetcore.components.server.basictheme": "^4.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "~4.4.0",
+    "@abp/aspnetcore.components.server.basictheme": "~4.4.0"
   }
-}
+}
diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/wwwroot/libs/abp/jquery/abp.jquery.js b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/wwwroot/libs/abp/jquery/abp.jquery.js
@@ -106,7 +106,7 @@ var abp = abp || {};
                     $dfd.resolve(data);
                     userOptions.success && userOptions.success(data);
                 }).fail(function (jqXHR) {
-                    if(jqXHR.status === 0 || jqXHR.statusText === 'abort') {
+                    if(jqXHR.statusText === 'abort') {
                         //ajax request is abort, ignore error handle.
                         return;
                     }