fixed issues #727

3 years ago · 365b9cde93
17 changed files with 127 additions and 12 deletions
--- a/aspnet-core/common.props
+++ b/aspnet-core/common.props
@ -3,7 +3,7 @@
    <LangVersion>latest</LangVersion>
    <Version>6.0.0.1</Version>
    <Authors>colin</Authors>
-    <NoWarn>$(NoWarn);CS1591;CS0436;CS8618</NoWarn>
+    <NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
    <PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
    <RepositoryType>git</RepositoryType>
--- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj
+++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj
@ -47,8 +47,8 @@
 		<ProjectReference Include="..\..\modules\common\LINGYUN.Abp.EventBus.CAP\LINGYUN.Abp.EventBus.CAP.csproj" />
 		<ProjectReference Include="..\..\modules\common\LINGYUN.Abp.ExceptionHandling.Emailing\LINGYUN.Abp.ExceptionHandling.Emailing.csproj" />
 		<ProjectReference Include="..\..\modules\common\LINGYUN.Abp.Sms.Aliyun\LINGYUN.Abp.Sms.Aliyun.csproj" />
-		<ProjectReference Include="..\..\modules\openiddict\LINGYUN.Abp.OpenIddict.Application\LINGYUN.Abp.OpenIddict.Application.csproj" />
-		<ProjectReference Include="..\..\modules\openiddict\LINGYUN.Abp.OpenIddict.HttpApi\LINGYUN.Abp.OpenIddict.HttpApi.csproj" />
+		<ProjectReference Include="..\..\modules\openIddict\LINGYUN.Abp.OpenIddict.Application\LINGYUN.Abp.OpenIddict.Application.csproj" />
+		<ProjectReference Include="..\..\modules\openIddict\LINGYUN.Abp.OpenIddict.HttpApi\LINGYUN.Abp.OpenIddict.HttpApi.csproj" />
 		<ProjectReference Include="..\..\modules\identity\LINGYUN.Abp.Identity.Application\LINGYUN.Abp.Identity.Application.csproj" />
 		<ProjectReference Include="..\..\modules\identity\LINGYUN.Abp.Identity.EntityFrameworkCore\LINGYUN.Abp.Identity.EntityFrameworkCore.csproj" />
 		<ProjectReference Include="..\..\modules\identity\LINGYUN.Abp.Identity.HttpApi\LINGYUN.Abp.Identity.HttpApi.csproj" />
--- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Program.cs
+++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Program.cs
@ -54,6 +54,12 @@ public class Program
        }
        catch (Exception ex)
        {
+            var type = ex.GetType().Name;
+            if (type.Equals("StopTheHostException", StringComparison.Ordinal))
+            {
+                throw;
+            }
+
            Log.Fatal(ex, "Host terminated unexpectedly!");
            Console.WriteLine("Host terminated unexpectedly!");
            Console.WriteLine(ex.ToString());
--- a/aspnet-core/services/LY.MicroService.AuthServer/Program.cs
+++ b/aspnet-core/services/LY.MicroService.AuthServer/Program.cs
@ -54,6 +54,12 @@ public class Program
        }
        catch (Exception ex)
        {
+            var type = ex.GetType().Name;
+            if (type.Equals("StopTheHostException", StringComparison.Ordinal))
+            {
+                throw;
+            }
+
            Log.Fatal(ex, "Host terminated unexpectedly!");
            Console.WriteLine("Host terminated unexpectedly!");
            Console.WriteLine(ex.ToString());
--- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Program.cs
+++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Program.cs
@ -55,6 +55,12 @@ public class Program
        }
        catch (Exception ex)
        {
+            var type = ex.GetType().Name;
+            if (type.Equals("StopTheHostException", StringComparison.Ordinal))
+            {
+                throw;
+            }
+
            Log.Fatal(ex, "Host terminated unexpectedly!");
            Console.WriteLine("Host terminated unexpectedly!");
            Console.WriteLine(ex.ToString());
--- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Program.cs
+++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Program.cs
@ -54,6 +54,12 @@ public class Program
        }
        catch (Exception ex)
        {
+            var type = ex.GetType().Name;
+            if (type.Equals("StopTheHostException", StringComparison.Ordinal))
+            {
+                throw;
+            }
+
            Log.Fatal(ex, "Host terminated unexpectedly!");
            Console.WriteLine("Host terminated unexpectedly!");
            Console.WriteLine(ex.ToString());
--- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Program.cs
+++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Program.cs
@ -54,6 +54,12 @@ public class Program
        }
        catch (Exception ex)
        {
+            var type = ex.GetType().Name;
+            if (type.Equals("StopTheHostException", StringComparison.Ordinal))
+            {
+                throw;
+            }
+
            Log.Fatal(ex, "Host terminated unexpectedly!");
            Console.WriteLine("Host terminated unexpectedly!");
            Console.WriteLine(ex.ToString());
--- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Program.cs
+++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Program.cs
@ -54,6 +54,12 @@ public class Program
        }
        catch (Exception ex)
        {
+            var type = ex.GetType().Name;
+            if (type.Equals("StopTheHostException", StringComparison.Ordinal))
+            {
+                throw;
+            }
+
            Log.Fatal(ex, "Host terminated unexpectedly!");
            Console.WriteLine("Host terminated unexpectedly!");
            Console.WriteLine(ex.ToString());
--- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Program.cs
+++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Program.cs
@ -54,6 +54,12 @@ public class Program
        }
        catch (Exception ex)
        {
+            var type = ex.GetType().Name;
+            if (type.Equals("StopTheHostException", StringComparison.Ordinal))
+            {
+                throw;
+            }
+
            Log.Fatal(ex, "Host terminated unexpectedly!");
            Console.WriteLine("Host terminated unexpectedly!");
            Console.WriteLine(ex.ToString());
--- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Program.cs
+++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Program.cs
@ -52,6 +52,19 @@ public class Program
            await app.RunAsync();
            return 0;
        }
+        catch (Exception ex)
+        {
+            var type = ex.GetType().Name;
+            if (type.Equals("StopTheHostException", StringComparison.Ordinal))
+            {
+                throw;
+            }
+
+            Log.Fatal(ex, "Host terminated unexpectedly!");
+            Console.WriteLine("Host terminated unexpectedly!");
+            Console.WriteLine(ex.ToString());
+            return 1;
+        }
        finally
        {
            Log.CloseAndFlush();
--- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Program.cs
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Program.cs
@ -52,6 +52,19 @@ public class Program
            await app.RunAsync();
            return 0;
        }
+        catch (Exception ex)
+        {
+            var type = ex.GetType().Name;
+            if (type.Equals("StopTheHostException", StringComparison.Ordinal))
+            {
+                throw;
+            }
+
+            Log.Fatal(ex, "Host terminated unexpectedly!");
+            Console.WriteLine("Host terminated unexpectedly!");
+            Console.WriteLine(ex.ToString());
+            return 1;
+        }
        finally
        {
            Log.CloseAndFlush();
--- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs
+++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs
@ -54,6 +54,12 @@ public class Program
        }
        catch (Exception ex)
        {
+            var type = ex.GetType().Name;
+            if (type.Equals("StopTheHostException", StringComparison.Ordinal))
+            {
+                throw;
+            }
+
            Log.Fatal(ex, "Host terminated unexpectedly!");
            Console.WriteLine("Host terminated unexpectedly!");
            Console.WriteLine(ex.ToString());
--- a/aspnet-core/services/LY.MicroService.identityServer/Program.cs
+++ b/aspnet-core/services/LY.MicroService.identityServer/Program.cs
@ -54,6 +54,12 @@ public class Program
        }
        catch (Exception ex)
        {
+            var type = ex.GetType().Name;
+            if (type.Equals("StopTheHostException", StringComparison.Ordinal))
+            {
+                throw;
+            }
+
            Log.Fatal(ex, "Host terminated unexpectedly!");
            Console.WriteLine("Host terminated unexpectedly!");
            Console.WriteLine(ex.ToString());
--- a/build/build-aspnetcore-common.ps1
+++ b/build/build-aspnetcore-common.ps1
@ -6,8 +6,8 @@ $rootFolder = (Get-Item -Path "./" -Verbose).FullName
 [PsObject[]]$serviceArray = @()

 $serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/"; Service = "admin" }
-$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/LY.MicroService.IdentityServer/"; Service = "identityserver" }
-$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/"; Service = "identityserver4-admin" }
+$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/LY.MicroService.identityServer/"; Service = "identityserver" }
+$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/"; Service = "identityserver4-admin" }
 $serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/"; Service = "localization" }
 $serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/"; Service = "platform" }
 $serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/"; Service = "messages" }
--- a/common.props
+++ b/common.props
@ -1,9 +1,9 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-    <Version>5.3.5</Version>
-    <Authors>LINGYUN</Authors>
-    <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
+    <Version>6.0.0.1</Version>
+    <Authors>colin</Authors>
+    <NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
    <PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
    <RepositoryType>git</RepositoryType>
@ -11,6 +11,18 @@
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
  </PropertyGroup>

+  <ItemGroup>
+	  <Compile Remove="LocalNuget\**" />
+	  <EmbeddedResource Remove="LocalNuget\**" />
+	  <None Remove="LocalNuget\**" />
+	</ItemGroup>
+
+  <ItemGroup>
+	  <Compile Remove="Modules\**" />
+	  <EmbeddedResource Remove="Modules\**" />
+	  <None Remove="Modules\**" />
+	</ItemGroup>
+
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
    <OutputPath>$(SolutionDir)LocalNuget</OutputPath>
  </PropertyGroup>
--- a/gateways/Directory.Build.props
+++ b/gateways/Directory.Build.props
@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
-		<VoloAbpPackageVersion>5.3.4</VoloAbpPackageVersion>
-		<LINGYUNAbpPackageVersion>5.3.4</LINGYUNAbpPackageVersion>
+		<VoloAbpPackageVersion>6.0.0</VoloAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>6.0.0</LINGYUNAbpPackageVersion>
 		<DaprPackageVersion>1.8.0</DaprPackageVersion>
 		<DotNetCoreCAPPackageVersion>6.0.1</DotNetCoreCAPPackageVersion>
 		<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion>
--- a/gateways/common.props
+++ b/gateways/common.props
@ -1,7 +1,30 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-    <Version>5.3.5</Version>
-    <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
+    <Version>6.0.0.1</Version>
+    <Authors>colin</Authors>
+    <NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
+    <PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/colinin/abp-next-admin</RepositoryUrl>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
  </PropertyGroup>
+
+  <ItemGroup>
+	  <Compile Remove="LocalNuget\**" />
+	  <EmbeddedResource Remove="LocalNuget\**" />
+	  <None Remove="LocalNuget\**" />
+	</ItemGroup>
+
+  <ItemGroup>
+	  <Compile Remove="Modules\**" />
+	  <EmbeddedResource Remove="Modules\**" />
+	  <None Remove="Modules\**" />
+	</ItemGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>$(SolutionDir)LocalNuget</OutputPath>
+  </PropertyGroup>
+
 </Project>