diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json
index 924306634e..0d67d9cca5 100644
--- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json
+++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json
@@ -565,7 +565,7 @@
"PrePayment_IyzicoRedirectionInfo": "您将被重定向到 Iyzico 支付网关以安全地完成您的购买。",
"PrePayment_IyzicoAcceptVisaAndMasterCard": "Iyzico 接受 Visa 和 MasterCard。",
"Purchase": "购买",
- "AcceptTermsAndConditions": "我已阅读、理解并接受隐私政策， 条款和条件和 EULA。",
+ "AcceptTermsAndConditions": "我已阅读、理解并接受隐私政策， 条款和条件和 EULA。",
"AcceptTermsAndConditionsWarningMessage": "请接受隐私政策和条款和条件",
"SelectGatewayToContinue": "请选择一个网关以继续！",
"GatewaySelection_SelectGateway": "选择支付网关",
diff --git a/docs/en/Road-Map.md b/docs/en/Road-Map.md
index d7fb13a9a8..ec9b8fac01 100644
--- a/docs/en/Road-Map.md
+++ b/docs/en/Road-Map.md
@@ -4,18 +4,18 @@ This document provides a road map, release schedule and planned features for the
## Next Versions
-### v6.0
+### v7.0
-In [6.0 milestone](https://github.com/abpframework/abp/milestone/61), we will be mostly working on the following topics:
+In the [7.0 milestone](https://github.com/abpframework/abp/milestone/75), we will be mostly working on the following topics:
-* Providing an OpenIddict integration to replace current IdentityServer4 integration.
+* Dapr integration ([#13337](https://github.com/abpframework/abp/issues/13337))
+* Upgrade to .NET 7.0 ([#13336](https://github.com/abpframework/abp/issues/13336))
+* Integration Services ([#12470](https://github.com/abpframework/abp/issues/12470))
* Maturing and documenting the [eShopOnAbp](https://github.com/abpframework/eShopOnAbp) project, writing a free e-book that explains the solution.
-* Working on the [LeptonX](https://blog.abp.io/abp/LeptonX-Theme-for-ABP-Framework-Alpha-Release) theme and making it as the default theme for the ABP Framework UI options.
+* Working on the [LeptonX](https://blog.abp.io/abp/LeptonX-Theme-for-ABP-Framework-Alpha-Release) theme.
* Improvements on the existing features and providing more guides.
-The planned stable release date for v6.0 is **July, 2022**.
-
-> After the version 6.0, we will be working for ABP 7.0 which will be released in the end of 2022 based on .NET 7.0.
+The planned stable release date for v7.0 is **December, 2022**. We will be publishing more than one pre-release versions before that date.
## Backlog Items
@@ -23,7 +23,6 @@ The *Next Versions* section above shows the main focus of the planned versions.
Here, a list of major items in the backlog we are considering to work on in the next versions.
-* [#2183](https://github.com/abpframework/abp/issues/2183) / Dapr integration
* [#6655](https://github.com/abpframework/abp/pull/6655) / Use Typescript for the MVC UI
* [#236](https://github.com/abpframework/abp/issues/236) / Resource based authorization system
* [#2882](https://github.com/abpframework/abp/issues/2882) / Providing a gRPC integration infrastructure (while it is [already possible](https://github.com/abpframework/abp-samples/tree/master/GrpcDemo) to create or consume gRPC endpoints for your application, we plan to create endpoints for the [standard application modules](https://docs.abp.io/en/abp/latest/Modules/Index))
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs
index 1d95297a88..7c21b9fe09 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs
@@ -1,6 +1,5 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.DependencyInjection;
using Volo.Abp.EventBus;
using Volo.Abp.Modularity;
using Volo.Abp.Threading;
@@ -20,6 +19,6 @@ public class AbpAspNetCoreMvcClientModule : AbpModule
public async override Task OnApplicationInitializationAsync(ApplicationInitializationContext context)
{
- await context.ServiceProvider.GetRequiredService().ServiceProvider.GetRequiredService().InitializeAsync();
+ await context.ServiceProvider.GetRequiredService().InitializeAsync();
}
}
diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Hosting/AbpHostingEnvironmentExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Hosting/AbpHostingEnvironmentExtensions.cs
index a6569d001b..15c1d74ccb 100644
--- a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Hosting/AbpHostingEnvironmentExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Hosting/AbpHostingEnvironmentExtensions.cs
@@ -9,7 +9,7 @@ public static class AbpHostingEnvironmentExtensions
this IWebHostEnvironment env,
AbpConfigurationBuilderOptions options = null)
{
- options = options ?? new AbpConfigurationBuilderOptions();
+ options ??= new AbpConfigurationBuilderOptions();
if (options.BasePath.IsNullOrEmpty())
{
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs
index dcf8496e66..916f861460 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs
@@ -141,6 +141,13 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
"AbpAspNetCoreComponentsWebAssemblyLeptonThemeModule"
);
+ ChangeNamespace(
+ context,
+ "/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs",
+ "Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXTheme",
+ "Volo.Abp.AspNetCore.Components.WebAssembly.LeptonTheme"
+ );
+
#endregion
#region MyCompanyName.MyProjectName.Blazor.Server && MyCompanyName.MyProjectName.Blazor.Server.Tiered
@@ -210,7 +217,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
}
AddProjectReference(file, $@"..\..\..\..\lepton-theme\src\Volo.Abp.LeptonTheme.Management.{projectName}\Volo.Abp.LeptonTheme.Management.{projectName}.csproj");
- AddModuleDependency(moduleFile, $"LeptonThemeManagement{ConvertProjectNameToModuleName($"{projectName}")}Module");
+ AddModuleDependency(moduleFile, projectName, $"LeptonThemeManagement{ConvertProjectNameToModuleName($"{projectName}")}Module");
}
}
@@ -325,21 +332,22 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
AddProjectReference(projectFile, reference);
- AddModuleDependency(moduleFile, $"LeptonThemeManagement{ConvertProjectNameToModuleName(projectInfo.Key)}Module",
+ AddModuleDependency(moduleFile, projectInfo.Key, $"LeptonThemeManagement{ConvertProjectNameToModuleName(projectInfo.Key)}Module",
underManagementFolder: projectInfo.Key != "HttpApi");
}
- private void AddModuleDependency(FileEntry moduleFile, string dependency, bool underManagementFolder = true)
+ private void AddModuleDependency(FileEntry moduleFile, string projectName, string dependency, bool underManagementFolder = true)
{
- var lines = moduleFile.GetLines();
+ var projectNames = new[] { "Blazor", "Blazor.Server", "Blazor.WebAssembly" };
+ var lines = moduleFile.GetLines();
for (var i = 0; i < lines.Length; i++)
{
if (lines[i].Contains("namespace MyCompanyName.MyProjectName"))
{
- lines[i - 1] = lines[i - 1] + "using Volo.Abp.LeptonTheme" + (underManagementFolder ? ".Management" : "").EnsureEndsWith(';') + Environment.NewLine;
+ lines[i - 1] = lines[i - 1] + ("using Volo.Abp.LeptonTheme" + (underManagementFolder ? ".Management." : ".") + (projectNames.Any(p => p == projectName) ? projectName : "")).TrimEnd('.').EnsureEndsWith(';') + Environment.NewLine;
}
-
+
if (lines[i].Contains("public class MyProjectName") && lines[i-1].Contains(")]"))
{
lines[i - 2] = lines[i - 2] + "," + Environment.NewLine + $"\ttypeof({dependency})";
@@ -584,9 +592,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
.Replace(".csproj", "Module")
.Replace(".", "");
- fileName = ConvertProjectNameToModuleName(fileName);
-
- return context.Files.FirstOrDefault(f => f.Name.Contains(splittedProjectFileName.Last() + "/" + fileName));
+ return context.Files.FirstOrDefault(f => f.Name.Contains(splittedProjectFileName.Last() + "/" + fileName) && f.Name.EndsWith("Module.cs"));
}
private static string ConvertProjectNameToModuleName(string moduleName)
@@ -796,6 +802,12 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
"BlazorLeptonXThemeBundles.Scripts.Global",
"BlazorLeptonThemeBundles.Scripts.Global"
);
+
+ RemoveLinesByStatement(
+ context,
+ $"/MyCompanyName.MyProjectName.{projectName}/MyProjectNameBlazorModule.cs",
+ "Volo.Abp.LeptonX.Shared;"
+ );
}
}
diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs
index a4dfa48db8..8a14528e03 100644
--- a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs
+++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs
@@ -9,7 +9,7 @@ public static class ConfigurationHelper
AbpConfigurationBuilderOptions options = null,
Action builderAction = null)
{
- options = options ?? new AbpConfigurationBuilderOptions();
+ options ??= new AbpConfigurationBuilderOptions();
if (options.BasePath.IsNullOrEmpty())
{
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml
index a3a99969ff..958621ea9c 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml
@@ -37,7 +37,7 @@