From ae8d763bd8d2a4a5a610bfea1d93a5ff996457b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=86=9B?= <510423039@qq.com>
Date: Thu, 18 Nov 2021 13:06:44 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20Bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...jectName.DataDictionaryManagement.HttpApi.Host.csproj | 9 ++++-----
 .../DataDictionaryManagementHttpApiHostModule.cs         | 1 -
 .../Data/ProjectNameDbMigrationService.cs                | 2 +-
 .../Data/Seeds/IdentityServerDataSeedContributor.cs      | 3 ---
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host.csproj b/aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host.csproj
index cc572c13..97660b19 100644
--- a/aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host.csproj
+++ b/aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host.csproj
@@ -10,11 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
-    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
-    <PackageReference Include="IdentityModel" Version="5.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.*" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.*" />
+    <PackageReference Include="Serilog.AspNetCore" Version="$(SerilogAspNetCoreVersion)" />
+    <PackageReference Include="Serilog.Sinks.Async" Version="$(SerilogSinksAsyncVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="$(MicrosoftVersion)" />
     <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpPackageVersion)" />
     <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="$(AbpPackageVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="$(AbpPackageVersion)" />
diff --git a/aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/DataDictionaryManagementHttpApiHostModule.cs b/aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/DataDictionaryManagementHttpApiHostModule.cs
index e1245b9c..a529c956 100644
--- a/aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/DataDictionaryManagementHttpApiHostModule.cs
+++ b/aspnet-core/modules/DataDictionaryManagement/host/CompanyName.ProjectName.DataDictionaryManagement.HttpApi.Host/DataDictionaryManagementHttpApiHostModule.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Domain/Data/ProjectNameDbMigrationService.cs b/aspnet-core/services/src/CompanyName.ProjectName.Domain/Data/ProjectNameDbMigrationService.cs
index aab18d89..0002b278 100644
--- a/aspnet-core/services/src/CompanyName.ProjectName.Domain/Data/ProjectNameDbMigrationService.cs
+++ b/aspnet-core/services/src/CompanyName.ProjectName.Domain/Data/ProjectNameDbMigrationService.cs
@@ -150,7 +150,7 @@ namespace CompanyName.ProjectName.Data
         {
             var dbMigrationsProjectFolder = GetDbMigrationsProjectFolderPath();
 
-            return Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "Migrations"));
+            return Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "EntityFrameworkCore"));
         }
 
         private void AddInitialMigration()
diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Domain/Data/Seeds/IdentityServerDataSeedContributor.cs b/aspnet-core/services/src/CompanyName.ProjectName.Domain/Data/Seeds/IdentityServerDataSeedContributor.cs
index 774c8c2c..e8d86749 100644
--- a/aspnet-core/services/src/CompanyName.ProjectName.Domain/Data/Seeds/IdentityServerDataSeedContributor.cs
+++ b/aspnet-core/services/src/CompanyName.ProjectName.Domain/Data/Seeds/IdentityServerDataSeedContributor.cs
@@ -28,7 +28,6 @@ namespace CompanyName.ProjectName.IdentityServer
         private readonly IIdentityResourceDataSeeder _identityResourceDataSeeder;
         private readonly IGuidGenerator _guidGenerator;
         private readonly IPermissionDataSeeder _permissionDataSeeder;
-        private readonly IConfiguration _configuration;
         private readonly ICurrentTenant _currentTenant;
 
         public IdentityServerDataSeedContributor(
@@ -38,7 +37,6 @@ namespace CompanyName.ProjectName.IdentityServer
             IIdentityResourceDataSeeder identityResourceDataSeeder,
             IGuidGenerator guidGenerator,
             IPermissionDataSeeder permissionDataSeeder,
-            IConfiguration configuration,
             ICurrentTenant currentTenant)
         {
             _clientRepository = clientRepository;
@@ -47,7 +45,6 @@ namespace CompanyName.ProjectName.IdentityServer
             _identityResourceDataSeeder = identityResourceDataSeeder;
             _guidGenerator = guidGenerator;
             _permissionDataSeeder = permissionDataSeeder;
-            _configuration = configuration;
             _currentTenant = currentTenant;
         }