Upgrade to ABP 8.0.0

EasyAbp · Dec 26, 2023 · 4e79be0 · 4e79be0
1 parent 1d41c52
commit 4e79be0
Show file tree

Hide file tree

Showing 40 changed files with 258 additions and 76 deletions.
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Install .NET SDK
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
 
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v1

diff --git a/AbpHelper.CLI b/AbpHelper.CLI
diff --git a/dotnet/Directory.Build.props b/dotnet/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>7.4.0</AbpVersion>
-    <AbpLeptonXThemeVersion>2.4.1</AbpLeptonXThemeVersion>
-    <BlazoriseVersion>1.3.1</BlazoriseVersion>
+    <AbpVersion>8.0.0</AbpVersion>
+    <AbpLeptonXThemeVersion>3.0.0</AbpLeptonXThemeVersion>
+    <BlazoriseVersion>1.3.2</BlazoriseVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/dotnet/common.props b/dotnet/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.10.1</Version>
+    <Version>2.11.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
 	<AbpProjectType>app</AbpProjectType>
   </PropertyGroup>

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/Bundle/Dtos/AbpBundleInput.cs b/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/Bundle/Dtos/AbpBundleInput.cs
@@ -9,13 +9,16 @@ public class AbpBundleInput : InputDtoWithDirectory
     {
         public virtual bool Force { get; set; }
 
+        public virtual ProjectType ProjectType { get; set; }
+
         public AbpBundleInput()
         {
         }
 
-        public AbpBundleInput([NotNull] string directory, bool force) : base(directory)
+        public AbpBundleInput([NotNull] string directory, bool force, ProjectType projectType) : base(directory)
         {
             Force = force;
+            ProjectType = projectType;
         }
     }
 }
diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/Bundle/Dtos/ProjectType.cs b/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/Bundle/Dtos/ProjectType.cs
@@ -0,0 +1,16 @@
+using System;
+using System.ComponentModel;
+using EasyAbp.AbpHelper.Gui.Shared;
+
+namespace EasyAbp.AbpHelper.Gui.AbpCli.Bundle.Dtos;
+
+[Flags]
+[ToStringUseDescription]
+public enum ProjectType
+{
+    [Description("webassembly")]
+    WebAssembly = 1,
+
+    [Description("maui-blazor")]
+    MauiBlazor = 2,
+}
diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/New/Dtos/AbpNewAppInput.cs b/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/New/Dtos/AbpNewAppInput.cs
@@ -31,20 +31,18 @@ public class AbpNewAppInput : AbpNewInputBase
 
         public virtual AbpThemes Theme { get; set; }
 
-        public virtual bool SkipBundling { get; set; }
-
         public AbpNewAppInput()
         {
         }
 
         public AbpNewAppInput([NotNull] string solutionName, [NotNull] string outputFolder, [CanBeNull] string version,
             bool preview, [CanBeNull] string templateSource, bool createSolutionFolder,
             [CanBeNull] string connectionString, Database databaseManagementSystem,
-            [CanBeNull] string localFrameworkRef, bool noRandomPort, bool skipInstallingLibs, AppUiFramework ui,
-            bool separateAuthServer, bool tiered, bool pwa, AppMobileApplicationFramework mobile,
-            AppDatabaseProvider databaseProvider, AbpThemes theme, bool skipBundling) : base(solutionName, outputFolder,
-            version, preview, templateSource, createSolutionFolder, connectionString, databaseManagementSystem,
-            localFrameworkRef, noRandomPort, skipInstallingLibs)
+            [CanBeNull] string localFrameworkRef, bool noRandomPort, bool skipInstallingLibs, bool skipCache,
+            bool withPublicWebsite, AppUiFramework ui, bool separateAuthServer, bool tiered, bool pwa,
+            AppMobileApplicationFramework mobile, AppDatabaseProvider databaseProvider, AbpThemes theme) : base(
+            solutionName, outputFolder, version, preview, templateSource, createSolutionFolder, connectionString,
+            databaseManagementSystem, localFrameworkRef, noRandomPort, skipInstallingLibs, skipCache, withPublicWebsite)
         {
             Ui = ui;
             SeparateAuthServer = separateAuthServer;
@@ -53,7 +51,6 @@ public AbpNewAppInput()
             Mobile = mobile;
             DatabaseProvider = databaseProvider;
             Theme = theme;
-            SkipBundling = skipBundling;
         }
     }
 }
diff --git a/...src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/New/Dtos/AbpNewAppNoLayersInput.cs b/...src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/New/Dtos/AbpNewAppNoLayersInput.cs
@@ -21,10 +21,10 @@ public AbpNewAppNoLayersInput()
         public AbpNewAppNoLayersInput([NotNull] string solutionName, [NotNull] string outputFolder,
             [CanBeNull] string version, bool preview, [CanBeNull] string templateSource, bool createSolutionFolder,
             [CanBeNull] string connectionString, Database databaseManagementSystem,
-            [CanBeNull] string localFrameworkRef, bool noRandomPort, bool skipInstallingLibs, AppUiFramework ui,
-            AppDatabaseProvider databaseProvider, AbpThemes theme) : base(solutionName, outputFolder, version,
-            preview, templateSource, createSolutionFolder, connectionString, databaseManagementSystem,
-            localFrameworkRef, noRandomPort, skipInstallingLibs)
+            [CanBeNull] string localFrameworkRef, bool noRandomPort, bool skipInstallingLibs, bool skipCache,
+            bool withPublicWebsite, AppUiFramework ui, AppDatabaseProvider databaseProvider, AbpThemes theme) : base(
+            solutionName, outputFolder, version, preview, templateSource, createSolutionFolder, connectionString,
+            databaseManagementSystem, localFrameworkRef, noRandomPort, skipInstallingLibs, skipCache, withPublicWebsite)
         {
             Ui = ui;
             DatabaseProvider = databaseProvider;

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/New/Dtos/AbpNewConsoleInput.cs b/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/New/Dtos/AbpNewConsoleInput.cs
@@ -13,9 +13,10 @@ public AbpNewConsoleInput()
         public AbpNewConsoleInput([NotNull] string solutionName, [NotNull] string outputFolder,
             [CanBeNull] string version, bool preview, [CanBeNull] string templateSource, bool createSolutionFolder,
             [CanBeNull] string connectionString, Database databaseManagementSystem,
-            [CanBeNull] string localFrameworkRef, bool noRandomPort, bool skipInstallingLibs) : base(solutionName,
-            outputFolder, version, preview, templateSource, createSolutionFolder, connectionString,
-            databaseManagementSystem, localFrameworkRef, noRandomPort, skipInstallingLibs)
+            [CanBeNull] string localFrameworkRef, bool noRandomPort, bool skipInstallingLibs, bool skipCache,
+            bool withPublicWebsite) : base(solutionName, outputFolder, version, preview, templateSource,
+            createSolutionFolder, connectionString, databaseManagementSystem, localFrameworkRef, noRandomPort,
+            skipInstallingLibs, skipCache, withPublicWebsite)
         {
         }
     }

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/New/Dtos/AbpNewInputBase.cs b/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/New/Dtos/AbpNewInputBase.cs
@@ -40,14 +40,19 @@ public abstract class AbpNewInputBase
 
         public virtual bool SkipInstallingLibs { get; set; }
 
+        public virtual bool SkipCache { get; set; }
+
+        public virtual bool WithPublicWebsite { get; set; }
+
         public AbpNewInputBase()
         {
         }
 
         public AbpNewInputBase([NotNull] string solutionName, [NotNull] string outputFolder, [CanBeNull] string version,
             bool preview, [CanBeNull] string templateSource, bool createSolutionFolder,
             [CanBeNull] string connectionString, Database databaseManagementSystem,
-            [CanBeNull] string localFrameworkRef, bool noRandomPort, bool skipInstallingLibs)
+            [CanBeNull] string localFrameworkRef, bool noRandomPort, bool skipInstallingLibs, bool skipCache,
+            bool withPublicWebsite)
         {
             SolutionName = solutionName;
             OutputFolder = outputFolder;
@@ -60,6 +65,8 @@ public AbpNewInputBase()
             LocalFrameworkRef = localFrameworkRef;
             NoRandomPort = noRandomPort;
             SkipInstallingLibs = skipInstallingLibs;
+            SkipCache = skipCache;
+            WithPublicWebsite = withPublicWebsite;
         }
     }
 }
diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/New/Dtos/AbpNewMauiInput.cs b/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/New/Dtos/AbpNewMauiInput.cs
@@ -13,9 +13,10 @@ public AbpNewMauiInput()
         public AbpNewMauiInput([NotNull] string solutionName, [NotNull] string outputFolder,
             [CanBeNull] string version, bool preview, [CanBeNull] string templateSource, bool createSolutionFolder,
             [CanBeNull] string connectionString, Database databaseManagementSystem,
-            [CanBeNull] string localFrameworkRef, bool noRandomPort, bool skipInstallingLibs) : base(solutionName,
-            outputFolder, version, preview, templateSource, createSolutionFolder, connectionString,
-            databaseManagementSystem, localFrameworkRef, noRandomPort, skipInstallingLibs)
+            [CanBeNull] string localFrameworkRef, bool noRandomPort, bool skipInstallingLibs, bool skipCache,
+            bool withPublicWebsite) : base(solutionName, outputFolder, version, preview, templateSource,
+            createSolutionFolder, connectionString, databaseManagementSystem, localFrameworkRef, noRandomPort,
+            skipInstallingLibs, skipCache, withPublicWebsite)
         {
         }
     }

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/New/Dtos/AbpNewModuleInput.cs b/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/New/Dtos/AbpNewModuleInput.cs
@@ -15,9 +15,10 @@ public AbpNewModuleInput()
         public AbpNewModuleInput([NotNull] string solutionName, [NotNull] string outputFolder,
             [CanBeNull] string version, bool preview, [CanBeNull] string templateSource, bool createSolutionFolder,
             [CanBeNull] string connectionString, Database databaseManagementSystem,
-            [CanBeNull] string localFrameworkRef, bool noRandomPort, bool skipInstallingLibs, bool noUi) : base(
-            solutionName, outputFolder, version, preview, templateSource, createSolutionFolder, connectionString,
-            databaseManagementSystem, localFrameworkRef, noRandomPort, skipInstallingLibs)
+            [CanBeNull] string localFrameworkRef, bool noRandomPort, bool skipInstallingLibs, bool skipCache,
+            bool withPublicWebsite, bool noUi) : base(solutionName, outputFolder, version, preview, templateSource,
+            createSolutionFolder, connectionString, databaseManagementSystem, localFrameworkRef, noRandomPort,
+            skipInstallingLibs, skipCache, withPublicWebsite)
         {
             NoUi = noUi;
         }

diff --git a/...pHelper.Gui.Application.Contracts/AbpCli/Proxy/Dtos/AbpGenerateRemoveAngularProxyInput.cs b/...pHelper.Gui.Application.Contracts/AbpCli/Proxy/Dtos/AbpGenerateRemoveAngularProxyInput.cs
@@ -21,24 +21,29 @@ public class AbpGenerateRemoveAngularProxyInput : InputDtoWithDirectory
         [CanBeNull]
         public virtual string Target { get; set; }
 
+        [CanBeNull]
+        public virtual string EntryPoint { get; set; }
+
         [CanBeNull]
         public virtual string Url { get; set; }
 
-        public virtual bool WithoutContracts { get; set; }
+        public virtual ServiceType ServiceType { get; set; }
 
         public AbpGenerateRemoveAngularProxyInput()
         {
         }
 
         public AbpGenerateRemoveAngularProxyInput([CanBeNull] string module, [CanBeNull] string apiName,
-            [CanBeNull] string source, [CanBeNull] string target, [CanBeNull] string url, bool withoutContracts)
+            [CanBeNull] string source, [CanBeNull] string target, [CanBeNull] string entryPoint, [CanBeNull] string url,
+            ServiceType serviceType)
         {
             Module = module;
             ApiName = apiName;
             Source = source;
             Target = target;
+            EntryPoint = entryPoint;
             Url = url;
-            WithoutContracts = withoutContracts;
+            ServiceType = serviceType;
         }
     }
 }
diff --git a/...bpHelper.Gui.Application.Contracts/AbpCli/Proxy/Dtos/AbpGenerateRemoveCSharpProxyInput.cs b/...bpHelper.Gui.Application.Contracts/AbpCli/Proxy/Dtos/AbpGenerateRemoveCSharpProxyInput.cs
@@ -9,26 +9,32 @@ namespace EasyAbp.AbpHelper.Gui.AbpCli.Proxy.Dtos
     public class AbpGenerateRemoveCSharpProxyInput : InputDtoWithDirectory
     {
         public virtual ProxyType Type => ProxyType.CSharp;
-        
+
         [Required]
         [NotNull]
         public virtual string Url { get; set; }
-
+
+        public virtual ServiceType ServiceType { get; set; }
+
         [CanBeNull]
         public virtual string Module { get; set; }
 
+        public virtual bool WithoutContracts { get; set; }
+
         [CanBeNull]
         public virtual string Folder { get; set; }
 
         public AbpGenerateRemoveCSharpProxyInput()
         {
         }
 
-        public AbpGenerateRemoveCSharpProxyInput([NotNull] string url, [CanBeNull] string module,
-            [CanBeNull] string folder)
+        public AbpGenerateRemoveCSharpProxyInput([NotNull] string url, ServiceType serviceType,
+            [CanBeNull] string module, bool withoutContracts, [CanBeNull] string folder)
         {
             Url = url;
+            ServiceType = serviceType;
             Module = module;
+            WithoutContracts = withoutContracts;
             Folder = folder;
         }
     }

diff --git a/...lper.Gui.Application.Contracts/AbpCli/Proxy/Dtos/AbpGenerateRemoveJavaScriptProxyInput.cs b/...lper.Gui.Application.Contracts/AbpCli/Proxy/Dtos/AbpGenerateRemoveJavaScriptProxyInput.cs
@@ -14,6 +14,8 @@ public class AbpGenerateRemoveJavaScriptProxyInput : InputDtoWithDirectory
         [NotNull]
         public virtual string Url { get; set; }
 
+        public virtual ServiceType ServiceType { get; set; }
+
         [CanBeNull]
         public virtual string Module { get; set; }
 
@@ -24,10 +26,11 @@ public AbpGenerateRemoveJavaScriptProxyInput()
         {
         }
 
-        public AbpGenerateRemoveJavaScriptProxyInput([NotNull] string url, [CanBeNull] string module,
-            [CanBeNull] string output)
+        public AbpGenerateRemoveJavaScriptProxyInput([NotNull] string url, ServiceType serviceType,
+            [CanBeNull] string module, [CanBeNull] string output)
         {
             Url = url;
+            ServiceType = serviceType;
             Module = module;
             Output = output;
         }

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/Proxy/Dtos/ServiceType.cs b/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/Proxy/Dtos/ServiceType.cs
@@ -0,0 +1,19 @@
+using System;
+using System.ComponentModel;
+using EasyAbp.AbpHelper.Gui.Shared;
+
+namespace EasyAbp.AbpHelper.Gui.AbpCli.Proxy.Dtos;
+
+[Flags]
+[ToStringUseDescription]
+public enum ServiceType
+{
+    [Description("all")]
+    All = 1,
+
+    [Description("integration")]
+    Integration = 2,
+
+    [Description("application")]
+    Application = 4
+}
diff --git a/...bp.AbpHelper.Gui.Application.Contracts/EasyAbp.AbpHelper.Gui.Application.Contracts.csproj b/...bp.AbpHelper.Gui.Application.Contracts/EasyAbp.AbpHelper.Gui.Application.Contracts.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/Localization/Gui/en.json b/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/Localization/Gui/en.json
@@ -85,7 +85,8 @@
     "AbpCli_New:CreateSolutionFolder": "Create solution folder",
     "AbpCli_New:NoRandomPort": "No random port",
     "AbpCli_New:SkipInstallingLibs": "Skip installing libraries",
-    "AbpCli_New:SkipBundling": "Skip running bundle command",
+    "AbpCli_New:SkipCache": "Skip cache",
+    "AbpCli_New:WithPublicWebsite": "With public website",
     "AbpCli_Update": "Update ABP version",
     "AbpCli_Update:SolutionPath": "Solution path",
     "AbpCli_Update:SolutionName": "Solution name",
@@ -114,6 +115,7 @@
     "AbpCli_Proxy:AngularProxy": "Angular",
     "AbpCli_Proxy:JavaScriptProxy": "JavaScript",
     "AbpCli_Proxy:Type": "Type",
+    "AbpCli_Proxy:EntryPoint": "Entry point",
     "AbpCli_Proxy:Url": "Url",
     "AbpCli_Proxy:Module": "Module",
     "AbpCli_Proxy:Folder": "Folder",
@@ -125,18 +127,32 @@
     "AbpCli_Proxy:ProxyType:CSharp": "CSharp",
     "AbpCli_Proxy:ProxyType:Angular": "Angular",
     "AbpCli_Proxy:ProxyType:JavaScript": "JavaScript",
+    "AbpCli_Proxy:ServiceType": "Service type",
+    "AbpCli_Proxy:ServiceType:Application": "Application services",
+    "AbpCli_Proxy:ServiceType:Integration": "Integration services",
+    "AbpCli_Proxy:ServiceType:All": "All",
     "AbpCli_Switch:SwitchToPreview": "To preview",
     "AbpCli_Switch:SwitchToNightly": "To nightly",
     "AbpCli_Switch:SwitchToStable": "To stable",
     "AbpCli_Switch:SwitchToLocal": "To local",
     "AbpCli_Switch:Paths": "Paths",
+    "AbpCli_Translate:CreateTranslationFile": "Create translation file",
+    "AbpCli_Translate:ApplyChanges": "Apply changes",
+    "AbpCli_Translate:Culture": "Culture",
+    "AbpCli_Translate:ReferenceCulture": "Reference culture",
+    "AbpCli_Translate:Output": "Output",
+    "AbpCli_Translate:AllValues": "All values",
+    "AbpCli_Translate:File": "File",
     "AbpCli_Login:Login": "Login",
     "AbpCli_Login:Logout": "Logout",
     "AbpCli_Login:Username": "Username",
     "AbpCli_Login:Password": "Password",
     "AbpCli_Login:Organization": "Organization",
     "AbpCli_Bundle": "Bundle Blazor",
     "AbpCli_Bundle:Force": "Force",
+    "AbpCli_Bundle:ProjectType": "Project type",
+    "AbpCli_Bundle:ProjectType:WebAssembly": "WebAssembly",
+    "AbpCli_Bundle:ProjectType:MauiBlazor": "MAUI Blazor",
     "AbpCli_InstallLibs": "Install libs",
     "CodeGeneration_Crud": "CRUD",
     "CodeGeneration_Crud:GenerateCrudCode": "Generate CRUD code",
@@ -187,4 +203,4 @@
     "Info:FunctionIsBasedOnAbpCliPart2_Document": "document",
     "Info:FunctionIsBasedOnAbpCliPart3": "for help."
   }
-}
+}