Upgrade SignalRDemo to v4.0.0

arkannet · Dec 8, 2020 · 1373317 · 1373317
1 parent c3ea66d
commit 1373317
Show file tree

Hide file tree

Showing 24 changed files with 4,052 additions and 731 deletions.
diff --git a/SignalRDemo/src/SignalRDemo.Application.Contracts/SignalRDemo.Application.Contracts.csproj b/SignalRDemo/src/SignalRDemo.Application.Contracts/SignalRDemo.Application.Contracts.csproj
@@ -12,12 +12,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.ObjectExtending" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="3.2.1" />
+    <PackageReference Include="Volo.Abp.ObjectExtending" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="4.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/SignalRDemo/src/SignalRDemo.Application/SignalRDemo.Application.csproj b/SignalRDemo/src/SignalRDemo.Application/SignalRDemo.Application.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>SignalRDemo</RootNamespace>
   </PropertyGroup>
 
@@ -13,11 +13,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Account.Application" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.Identity.Application" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="3.2.1" />
+    <PackageReference Include="Volo.Abp.Account.Application" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.Identity.Application" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="4.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/SignalRDemo/src/SignalRDemo.DbMigrator/SignalRDemo.DbMigrator.csproj b/SignalRDemo/src/SignalRDemo.DbMigrator/SignalRDemo.DbMigrator.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,11 +22,11 @@
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Autofac" Version="3.2.1" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="4.0.0" />
     <ProjectReference Include="..\SignalRDemo.Application.Contracts\SignalRDemo.Application.Contracts.csproj" />
     <ProjectReference Include="..\SignalRDemo.EntityFrameworkCore.DbMigrations\SignalRDemo.EntityFrameworkCore.DbMigrations.csproj" />
   </ItemGroup>

diff --git a/SignalRDemo/src/SignalRDemo.Domain.Shared/SignalRDemo.Domain.Shared.csproj b/SignalRDemo/src/SignalRDemo.Domain.Shared/SignalRDemo.Domain.Shared.csproj
@@ -8,14 +8,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="3.2.1" />
+    <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/SignalRDemo/src/SignalRDemo.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/SignalRDemo/src/SignalRDemo.Domain/IdentityServer/IdentityServerDataSeedContributor.cs
@@ -147,7 +147,7 @@ private async Task<Client> CreateClientAsync(
             string postLogoutRedirectUri = null,
             IEnumerable<string> permissions = null)
         {
-            var client = await _clientRepository.FindByCliendIdAsync(name);
+            var client = await _clientRepository.FindByClientIdAsync(name);
             if (client == null)
             {
                 client = await _clientRepository.InsertAsync(

diff --git a/SignalRDemo/src/SignalRDemo.Domain/SignalRDemo.Domain.csproj b/SignalRDemo/src/SignalRDemo.Domain/SignalRDemo.Domain.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>SignalRDemo</RootNamespace>
   </PropertyGroup>
 
@@ -12,15 +12,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Identity.Domain" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="3.2.1" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="3.2.1" />
+    <PackageReference Include="Volo.Abp.Identity.Domain" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="4.0.0" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="4.0.0" />
   </ItemGroup>
 
 </Project>