Merge pull request #15209 from abpframework/auto-merge/rel-7-0/1608

Merge branch dev with rel-7.0

docs/en/Themes/LeptonXLite/Angular.md

@@ -20,7 +20,9 @@ To add `LeptonX-lite` into your project,
 
 `yarn add bootstrap-icons`
 
-- Then, we need to edit the styles array in `angular.json` to replace the existing style with the new one.
+- Then, we need to edit the styles array in `angular.json` to replace the existing style with the new one in the following link : 
+
+* [Styles - Angular UI](../../UI/Angular/Theme-Configurations.md)
 
 Add the following style
 

docs/en/UI/Angular/Theme-Configurations.md

@@ -43,6 +43,16 @@ Theme packages no longer import styles as CSS modules as of ABP version 6.0. The
     "inject": false,
     "bundleName": "abp-bundle.rtl"
 },
+{
+    "input":"node_modules/@volo/ngx-lepton-x.lite/assets/css/font-bundle.rtl.css",
+    "inject":false,
+    "bundleName":"font-bundle.rtl"
+}
+,{
+    "input":"node_modules/@volo/ngx-lepton-x.lite/assets/css/font-bundle.css",
+    "inject":false,
+    "bundleName":"font-bundle"
+},
 ```
 
 ## Theme Basic
@@ -150,7 +160,18 @@ Theme packages no longer import styles as CSS modules as of ABP version 6.0. The
     "input": "node_modules/@volosoft/abp.ng.theme.lepton-x/assets/css/abp-bundle.rtl.css",
     "inject": false,
     "bundleName": "abp-bundle.rtl"
-}
+},        
+{
+    "input": "node_modules/@volosoft/ngx-lepton-x/assets/css/font-bundle.css",
+    "inject": false,
+    "bundleName": "font-bundle"
+},
+{
+    "input": "node_modules/@volosoft/ngx-lepton-x/assets/css/font-bundle.rtl.css",
+    "inject": false,
+    "bundleName": "font-bundle.rtl"
+},
+
 ```
 
 ## Theme Lepton

npm/ng-packs/packages/schematics/src/models/api-definition.ts

@@ -40,11 +40,11 @@ export interface Controller {
 export interface InterfaceDef {
   type: string;
   name: string;
-  methods: InterfaceMethodDef[];
+  methods?: InterfaceMethodDef[];
 }
 export interface InterfaceMethodDef {
   name: string;
-  parametersOnMethod: InterfaceParameterOnMethodDef[];
+  parametersOnMethod?: InterfaceParameterOnMethodDef[];
   returnValue: {
     type: string;
     typeSimple: string;

npm/ng-packs/packages/schematics/src/utils/common.ts

@@ -41,12 +41,12 @@ const sanitizeTypeName = (name: string) => name.replace(sanitizeTypeNameRegExp,
 export function sanitizeControllerTypeNames(
   controllers: Record<string, Controller>,
 ): Record<string, Controller> {
-  Object.values(controllers).forEach(controller => {
-    controller.interfaces.forEach(i => {
-      i.methods.forEach(m => {
+  Object.values(controllers || {}).forEach(controller => {
+    controller.interfaces?.forEach(i => {
+      i.methods?.forEach(m => {
         m.returnValue.type = sanitizeTypeName(m.returnValue.type);
         m.returnValue.typeSimple = sanitizeTypeName(m.returnValue.typeSimple);
-        m.parametersOnMethod.forEach(p => {
+        m.parametersOnMethod?.forEach(p => {
           p.type = sanitizeTypeName(p.type);
           p.typeAsString = sanitizeTypeName(p.typeAsString);
           p.typeSimple = sanitizeTypeName(p.typeSimple);
@@ -54,15 +54,15 @@ export function sanitizeControllerTypeNames(
       });
     });
 
-    Object.values(controller.actions).forEach(a => {
+    Object.values(controller.actions || {}).forEach(a => {
       a.returnValue.type = sanitizeTypeName(a.returnValue.type);
       a.returnValue.typeSimple = sanitizeTypeName(a.returnValue.typeSimple);
-      a.parametersOnMethod.forEach(p => {
+      a.parametersOnMethod?.forEach(p => {
         p.type = sanitizeTypeName(p.type);
         p.typeAsString = sanitizeTypeName(p.typeAsString);
         p.typeSimple = sanitizeTypeName(p.typeSimple);
       });
-      a.parameters.forEach(p => {
+      a.parameters?.forEach(p => {
         p.type = sanitizeTypeName(p.type);
         p.typeSimple = sanitizeTypeName(p.typeSimple);
       });

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Program.cs

@@ -35,11 +35,11 @@ public class Program
             builder.Host.AddAppSettingsSecretsJson()
                 .UseAutofac()
                 .UseSerilog();
-            await builder.AddApplicationAsync<MyProjectNameModule>();
             if (IsMigrateDatabase(args))
             {
                 builder.Services.AddDataMigrationEnvironment();
             }
+            await builder.AddApplicationAsync<MyProjectNameModule>();
             var app = builder.Build();
             await app.InitializeApplicationAsync();
 

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Program.cs

@@ -40,11 +40,11 @@ public class Program
             builder.Host.AddAppSettingsSecretsJson()
                 .UseAutofac()
                 .UseSerilog();
-            await builder.AddApplicationAsync<MyProjectNameModule>();
             if (IsMigrateDatabase(args))
             {
                 builder.Services.AddDataMigrationEnvironment();
             }
+            await builder.AddApplicationAsync<MyProjectNameModule>();
             var app = builder.Build();
             await app.InitializeApplicationAsync();
 

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Program.cs

@@ -35,11 +35,11 @@ public class Program
             builder.Host.AddAppSettingsSecretsJson()
                 .UseAutofac()
                 .UseSerilog();
-            await builder.AddApplicationAsync<MyProjectNameModule>();
             if (IsMigrateDatabase(args))
             {
                 builder.Services.AddDataMigrationEnvironment();
             }
+            await builder.AddApplicationAsync<MyProjectNameModule>();
             var app = builder.Build();
             await app.InitializeApplicationAsync();
 

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Program.cs

@@ -40,11 +40,11 @@ public class Program
             builder.Host.AddAppSettingsSecretsJson()
                 .UseAutofac()
                 .UseSerilog();
-            await builder.AddApplicationAsync<MyProjectNameModule>();
             if (IsMigrateDatabase(args))
             {
                 builder.Services.AddDataMigrationEnvironment();
             }
+            await builder.AddApplicationAsync<MyProjectNameModule>();
             var app = builder.Build();
             await app.InitializeApplicationAsync();
 

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/Program.cs

@@ -35,11 +35,11 @@ public class Program
             builder.Host.AddAppSettingsSecretsJson()
                 .UseAutofac()
                 .UseSerilog();
-            await builder.AddApplicationAsync<MyProjectNameModule>();
             if (IsMigrateDatabase(args))
             {
                 builder.Services.AddDataMigrationEnvironment();
             }
+            await builder.AddApplicationAsync<MyProjectNameModule>();
             var app = builder.Build();
             await app.InitializeApplicationAsync();
 

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Program.cs

@@ -40,11 +40,11 @@ public class Program
             builder.Host.AddAppSettingsSecretsJson()
                 .UseAutofac()
                 .UseSerilog();
-            await builder.AddApplicationAsync<MyProjectNameModule>();
             if (IsMigrateDatabase(args))
             {
                 builder.Services.AddDataMigrationEnvironment();
             }
+            await builder.AddApplicationAsync<MyProjectNameModule>();
             var app = builder.Build();
             await app.InitializeApplicationAsync();