Merge pull request #12715 from abpframework/auto-merge/rel-5-3/1096

Merge branch dev with rel-5.3
4 years ago · ebc2f21710
27 changed files with 67 additions and 87 deletions
--- a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor
@ -7,7 +7,7 @@
    @if(Options.Value.RenderPageTitle)
    {   
        <Column ColumnSize="ColumnSize.IsAuto">
-            <h5 class="content-header-title">@PageLayout.Title</h5>
+            <h1 class="content-header-title">@PageLayout.Title</h1>
        </Column>
    }

--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
@ -406,7 +406,12 @@ public abstract class AppTemplateBase : TemplateInfo
                        "https://localhost:44301",
                        "https://localhost:44302",
                        "https://localhost:44303",
-                        "https://localhost:44305"
+                        "https://localhost:44304",
+                        "https://localhost:44305",
+                        "https://localhost:44306",
+                        "https://localhost:44307",
+                        "https://localhost:44308",
+                        "https://localhost:44309"
                }
            )
        );
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs
@ -90,7 +90,9 @@ public abstract class ModuleTemplateBase : TemplateInfo
                "https://localhost:44300",
                "https://localhost:44301",
                "https://localhost:44302",
-                "https://localhost:44303"
+                "https://localhost:44303",
+                "https://localhost:44304",
+                "https://localhost:44305"
            }));
    }

--- a/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj
+++ b/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj
@ -15,7 +15,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.28" />
+    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.29" />
  </ItemGroup>

  <ItemGroup>
--- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj
+++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj
@ -6,7 +6,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Hangfire.SqlServer" Version="1.7.*" />
+    <PackageReference Include="Hangfire.SqlServer" Version="1.7.29" />
    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.BackgroundJobs.HangFire\Volo.Abp.BackgroundJobs.HangFire.csproj" />
    <ProjectReference Include="..\Volo.Abp.BackgroundJobs.DemoApp.Shared\Volo.Abp.BackgroundJobs.DemoApp.Shared.csproj" />
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Properties/launchSettings.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Properties/launchSettings.json
@ -3,8 +3,8 @@
    "windowsAuthentication": false,
    "anonymousAuthentication": true,
    "iisExpress": {
-      "applicationUrl": "https://localhost:44313/",
-      "sslPort": 44313
+      "applicationUrl": "https://localhost:44300/",
+      "sslPort": 44300
    }
  },
  "profiles": {
@ -19,7 +19,7 @@
      "commandName": "Project",
      "dotnetRunMessages": "true",
      "launchBrowser": true,
-      "applicationUrl": "https://localhost:44313/",
+      "applicationUrl": "https://localhost:44300/",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/appsettings.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/appsettings.json
@ -1,13 +1,13 @@
 {
  "App": {
-    "SelfUrl": "https://localhost:44313",
-    "RedirectAllowedUrls": "https://localhost:44313"
+    "SelfUrl": "https://localhost:44300",
+    "RedirectAllowedUrls": "https://localhost:44300"
  },
  "ConnectionStrings": {
    "Default": "mongodb://localhost:27017/MyProjectName",
  },
  "AuthServer": {
-    "Authority": "https://localhost:44313",
+    "Authority": "https://localhost:44300",
    "RequireHttpsMetadata": "false"
  },
  "StringEncryption": {
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Properties/launchSettings.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Properties/launchSettings.json
@ -3,8 +3,8 @@
    "windowsAuthentication": false,
    "anonymousAuthentication": true,
    "iisExpress": {
-      "applicationUrl": "https://localhost:44313/",
-      "sslPort": 44313
+      "applicationUrl": "https://localhost:44300/",
+      "sslPort": 44300
    }
  },
  "profiles": {
@ -19,7 +19,7 @@
      "commandName": "Project",
      "dotnetRunMessages": "true",
      "launchBrowser": true,
-      "applicationUrl": "https://localhost:44313/",
+      "applicationUrl": "https://localhost:44300/",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/appsettings.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/appsettings.json
@ -1,13 +1,13 @@
 {
  "App": {
-    "SelfUrl": "https://localhost:44313",
-    "RedirectAllowedUrls": "https://localhost:44313"
+    "SelfUrl": "https://localhost:44300",
+    "RedirectAllowedUrls": "https://localhost:44300"
  },
  "ConnectionStrings": {
    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True"
  },
  "AuthServer": {
-    "Authority": "https://localhost:44313",
+    "Authority": "https://localhost:44300",
    "RequireHttpsMetadata": "false"
  },
  "StringEncryption": {
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Properties/launchSettings.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Properties/launchSettings.json
@ -3,8 +3,8 @@
    "windowsAuthentication": false,
    "anonymousAuthentication": true,
    "iisExpress": {
-      "applicationUrl": "https://localhost:44305",
-      "sslPort": 44305
+      "applicationUrl": "https://localhost:44300",
+      "sslPort": 44300
    }
  },
  "profiles": {
@ -18,7 +18,7 @@
    "MyCompanyName.MyProjectName": {
      "commandName": "Project",
      "launchBrowser": true,
-      "applicationUrl": "https://localhost:44305",
+      "applicationUrl": "https://localhost:44300",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/appsettings.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/appsettings.json
@ -1,6 +1,6 @@
 {
  "App": {
-    "SelfUrl": "https://localhost:44305",
+    "SelfUrl": "https://localhost:44300",
    "ClientUrl": "http://localhost:4200",
    "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200",
    "RedirectAllowedUrls": "http://localhost:4200"
@ -12,7 +12,7 @@
    "Configuration": "127.0.0.1"
  },
  "AuthServer": {
-    "Authority": "https://localhost:44305",
+    "Authority": "https://localhost:44300",
    "RequireHttpsMetadata": "false",
    "SwaggerClientId": "MyProjectName_Swagger"
  },
@ -27,7 +27,7 @@
      },
      "MyProjectName_Swagger": {
        "ClientId": "MyProjectName_Swagger",
-        "RootUrl": "https://localhost:44305"
+        "RootUrl": "https://localhost:44300"
      }
    }
  }
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Properties/launchSettings.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Properties/launchSettings.json
@ -3,8 +3,8 @@
    "windowsAuthentication": false,
    "anonymousAuthentication": true,
    "iisExpress": {
-      "applicationUrl": "https://localhost:44305",
-      "sslPort": 44305
+      "applicationUrl": "https://localhost:44300",
+      "sslPort": 44300
    }
  },
  "profiles": {
@ -18,7 +18,7 @@
    "MyCompanyName.MyProjectName": {
      "commandName": "Project",
      "launchBrowser": true,
-      "applicationUrl": "https://localhost:44305",
+      "applicationUrl": "https://localhost:44300",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/appsettings.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/appsettings.json
@ -1,6 +1,6 @@
 {
  "App": {
-    "SelfUrl": "https://localhost:44305",
+    "SelfUrl": "https://localhost:44300",
    "ClientUrl": "http://localhost:4200",
    "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200",
    "RedirectAllowedUrls": "http://localhost:4200"
@ -12,7 +12,7 @@
    "Configuration": "127.0.0.1"
  },
  "AuthServer": {
-    "Authority": "https://localhost:44305",
+    "Authority": "https://localhost:44300",
    "RequireHttpsMetadata": "false",
    "SwaggerClientId": "MyProjectName_Swagger"
  },
@ -27,7 +27,7 @@
      },
      "MyProjectName_Swagger": {
        "ClientId": "MyProjectName_Swagger",
-        "RootUrl": "https://localhost:44305"
+        "RootUrl": "https://localhost:44300"
      }
    }
  }
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/Properties/launchSettings.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/Properties/launchSettings.json
@ -3,8 +3,8 @@
    "windowsAuthentication": false,
    "anonymousAuthentication": true,
    "iisExpress": {
-      "applicationUrl": "https://localhost:44303/",
-      "sslPort": 44303
+      "applicationUrl": "https://localhost:44300/",
+      "sslPort": 44300
    }
  },
  "profiles": {
@ -21,7 +21,7 @@
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      },
-      "applicationUrl": "https://localhost:44303/"
+      "applicationUrl": "https://localhost:44300/"
    }
  }
 }
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/appsettings.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/appsettings.json
@ -1,12 +1,12 @@
 {
  "App": {
-    "SelfUrl": "https://localhost:44303"
+    "SelfUrl": "https://localhost:44300"
  },
  "ConnectionStrings": {
    "Default": "mongodb://localhost:27017/MyProjectName"
  },
  "AuthServer": {
-    "Authority": "https://localhost:44303",
+    "Authority": "https://localhost:44300",
    "RequireHttpsMetadata": "false"
  },
  "StringEncryption": {
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Properties/launchSettings.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Properties/launchSettings.json
@ -3,8 +3,8 @@
    "windowsAuthentication": false,
    "anonymousAuthentication": true,
    "iisExpress": {
-      "applicationUrl": "https://localhost:44303/",
-      "sslPort": 44303
+      "applicationUrl": "https://localhost:44300/",
+      "sslPort": 44300
    }
  },
  "profiles": {
@ -21,7 +21,7 @@
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      },
-      "applicationUrl": "https://localhost:44303/"
+      "applicationUrl": "https://localhost:44300/"
    }
  }
 }
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/appsettings.json
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/appsettings.json
@ -1,12 +1,12 @@
 {
  "App": {
-    "SelfUrl": "https://localhost:44303"
+    "SelfUrl": "https://localhost:44300"
  },
  "ConnectionStrings": {
    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True"
  },
  "AuthServer": {
-    "Authority": "https://localhost:44303",
+    "Authority": "https://localhost:44300",
    "RequireHttpsMetadata": "false"
  },
  "StringEncryption": {
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Properties/launchSettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Properties/launchSettings.json
@ -3,8 +3,8 @@
    "windowsAuthentication": false,
    "anonymousAuthentication": true,
    "iisExpress": {
-      "applicationUrl": "https://localhost:44314/",
-      "sslPort": 44314
+      "applicationUrl": "https://localhost:44309/",
+      "sslPort": 44309
    }
  },
  "profiles": {
@ -19,7 +19,7 @@
      "commandName": "Project",
      "dotnetRunMessages": "true",
      "launchBrowser": true,
-      "applicationUrl": "https://localhost:44314/",
+      "applicationUrl": "https://localhost:44309/",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/appsettings.json
@ -1,6 +1,6 @@
 {
  "App": {
-    "SelfUrl": "https://localhost:44314"
+    "SelfUrl": "https://localhost:44309"
  },
  "RemoteServices": {
    "Default": {
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Properties/launchSettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Properties/launchSettings.json
@ -3,8 +3,8 @@
    "windowsAuthentication": false,
    "anonymousAuthentication": true,
    "iisExpress": {
-      "applicationUrl": "https://localhost:44313/",
-      "sslPort": 44313
+      "applicationUrl": "https://localhost:44308/",
+      "sslPort": 44308
    }
  },
  "profiles": {
@ -19,7 +19,7 @@
      "commandName": "Project",
      "dotnetRunMessages": "true",
      "launchBrowser": true,
-      "applicationUrl": "https://localhost:44313/",
+      "applicationUrl": "https://localhost:44308/",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/appsettings.json
@ -1,13 +1,13 @@
 {
  "App": {
-    "SelfUrl": "https://localhost:44313",
-    "RedirectAllowedUrls": "https://localhost:44313"
+    "SelfUrl": "https://localhost:44308",
+    "RedirectAllowedUrls": "https://localhost:44308"
  },
  "ConnectionStrings": {
    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True"
  },
  "AuthServer": {
-    "Authority": "https://localhost:44313",
+    "Authority": "https://localhost:44308",
    "RequireHttpsMetadata": "false"
  },
  "StringEncryption": {
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
@ -20,7 +20,7 @@
      "MyProjectName_BlazorServerTiered": {
        "ClientId": "MyProjectName_BlazorServerTiered",
        "ClientSecret": "1q2w3e*",
-        "RootUrl": "https://localhost:44314"
+        "RootUrl": "https://localhost:44309"
      },
      "MyProjectName_Swagger": {
        "ClientId": "MyProjectName_Swagger",
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/Properties/launchSettings.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/Properties/launchSettings.json
@ -3,8 +3,8 @@
    "windowsAuthentication": false,
    "anonymousAuthentication": true,
    "iisExpress": {
-      "applicationUrl": "https://localhost:44307",
-      "sslPort": 44307
+      "applicationUrl": "https://localhost:44305",
+      "sslPort": 44305
    }
  },
  "profiles": {
@ -20,7 +20,7 @@
      "commandName": "Project",
      "launchBrowser": true,
      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "https://localhost:44307",
+      "applicationUrl": "https://localhost:44305",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/wwwroot/appsettings.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/wwwroot/appsettings.json
@ -1,6 +1,6 @@
 {
  "App": {
-    "SelfUrl": "https://localhost:44307"
+    "SelfUrl": "https://localhost:44305"
  },
  "AuthServer": {
    "Authority": "https://localhost:44301",
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Properties/launchSettings.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Properties/launchSettings.json
@ -3,8 +3,8 @@
    "windowsAuthentication": false,
    "anonymousAuthentication": true,
    "iisExpress": {
-      "applicationUrl": "https://localhost:44313/",
-      "sslPort": 44313
+      "applicationUrl": "https://localhost:44304/",
+      "sslPort": 44304
    }
  },
  "profiles": {
@ -19,7 +19,7 @@
      "commandName": "Project",
      "dotnetRunMessages": "true",
      "launchBrowser": true,
-      "applicationUrl": "https://localhost:44313/",
+      "applicationUrl": "https://localhost:44304/",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/appsettings.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/appsettings.json
@ -1,13 +1,13 @@
 {
  "App": {
-    "SelfUrl": "https://localhost:44313",
-    "RedirectAllowedUrls": "https://localhost:44313"
+    "SelfUrl": "https://localhost:44304",
+    "RedirectAllowedUrls": "https://localhost:44304"
  },
  "ConnectionStrings": {
    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName_Unified;Trusted_Connection=True"
  },
  "AuthServer": {
-    "Authority": "https://localhost:44313",
+    "Authority": "https://localhost:44304",
    "RequireHttpsMetadata": "false"
  }
 }
--- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Properties/launchSettings.json
+++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Properties/launchSettings.json
@ -1,27 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:64779/",
-      "sslPort": 44326
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "MyCompanyName.MyProjectName.Web": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:5001;http://localhost:5000"
-    }
-  }
-}