Merge pull request #4 from jxnkwlp/feature/abp-8

Bump to abp 8.0
jxnkwlp · Feb 21, 2024 · a677e77 · a677e77
2 parents b76e633 + 28afa4d
commit a677e77
Show file tree

Hide file tree

Showing 57 changed files with 147 additions and 87 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -490,9 +490,12 @@ roslynator_compiler_diagnostic_fixes.enabled = true
 tab_width = 4
 
 #
+dotnet_diagnostic.ide0011.severity = silent
 dotnet_diagnostic.CA1848.severity = silent
 dotnet_diagnostic.CA1305.severity = silent
 dotnet_diagnostic.CA2016.severity = warning
+dotnet_diagnostic.RCS1141.severity = silent
+dotnet_diagnostic.RCS1251.severity = silent
 
 [{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config}]
 indent_style = space

diff --git a/.github/workflows/build-pack.yml b/.github/workflows/build-pack.yml
@@ -32,9 +32,9 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: |
-            6.0.x
+          dotnet-version: | 
             7.0.x
+            8.0.x
 
       - name: Install Dotnet Tool
         run: |

diff --git a/host/common.props b/host/common.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
     <Version>1.0.0</Version>
-    <AbpVersion>7.3.3</AbpVersion>
+    <AbpVersion>8.0.0</AbpVersion>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <AbpProjectType>app</AbpProjectType>
     <IsPackable>false</IsPackable>

diff --git a/host/src/Sample.Application/Sample.Application.csproj b/host/src/Sample.Application/Sample.Application.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Sample</RootNamespace>
   </PropertyGroup>

diff --git a/host/src/Sample.DbMigrator/Sample.DbMigrator.csproj b/host/src/Sample.DbMigrator/Sample.DbMigrator.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
@@ -13,7 +13,7 @@
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/host/src/Sample.Domain.Shared/Sample.Domain.Shared.csproj b/host/src/Sample.Domain.Shared/Sample.Domain.Shared.csproj
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.*" />
   </ItemGroup>
 
 </Project>
diff --git a/host/src/Sample.Domain/OpenIddict/OpenIddictDataSeedContributor.cs b/host/src/Sample.Domain/OpenIddict/OpenIddictDataSeedContributor.cs
@@ -234,7 +234,7 @@ private async Task CreateApplicationAsync(
             var application = new AbpApplicationDescriptor
             {
                 ClientId = name,
-                Type = type,
+                ClientType = type,
                 ClientSecret = secret,
                 ConsentType = consentType,
                 DisplayName = displayName,

diff --git a/host/src/Sample.Domain/Sample.Domain.csproj b/host/src/Sample.Domain/Sample.Domain.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Sample</RootNamespace>
   </PropertyGroup>

diff --git a/host/src/Sample.EntityFrameworkCore/Sample.EntityFrameworkCore.csproj b/host/src/Sample.EntityFrameworkCore/Sample.EntityFrameworkCore.csproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Sample</RootNamespace>
   </PropertyGroup>
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.*">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/host/src/Sample.HttpApi.Host/Sample.HttpApi.Host.csproj b/host/src/Sample.HttpApi.Host/Sample.HttpApi.Host.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Sample</RootNamespace>
     <PreserveCompilationReferences>true</PreserveCompilationReferences>

diff --git a/host/src/Sample.HttpApi/Sample.HttpApi.csproj b/host/src/Sample.HttpApi/Sample.HttpApi.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Sample</RootNamespace>
   </PropertyGroup>

diff --git a/modules/account/common.props b/modules/account/common.props
@@ -5,8 +5,8 @@
     <Product>Passingwind.Abp.Account</Product>
     <Description>an abp module that provider account service, such as login, 2fa, account link, impersonation, settings. </Description>
     <PackageTags>abp-module</PackageTags>
-    <Version>0.2.0</Version>
-    <PackageVersion>0.2.10</PackageVersion>
+    <Version>1.0.0</Version>
+    <PackageVersion>1.0.0</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...ccount/src/Passingwind.Abp.Account.Application/Passingwind.Abp.Account.Application.csproj b/...ccount/src/Passingwind.Abp.Account.Application/Passingwind.Abp.Account.Application.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.Account</RootNamespace>
   </PropertyGroup>

diff --git a/...ccount.AspNetCore.IdentityClient/Passingwind.Abp.Account.AspNetCore.IdentityClient.csproj b/...ccount.AspNetCore.IdentityClient/Passingwind.Abp.Account.AspNetCore.IdentityClient.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.Account</RootNamespace>
   </PropertyGroup>

diff --git a/.../account/src/Passingwind.Abp.Account.AspNetCore/Passingwind.Abp.Account.AspNetCore.csproj b/.../account/src/Passingwind.Abp.Account.AspNetCore/Passingwind.Abp.Account.AspNetCore.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.Account</RootNamespace>
   </PropertyGroup>

diff --git a/...nt/src/Passingwind.Abp.Account.Domain.Shared/Passingwind.Abp.Account.Domain.Shared.csproj b/...nt/src/Passingwind.Abp.Account.Domain.Shared/Passingwind.Abp.Account.Domain.Shared.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/modules/account/src/Passingwind.Abp.Account.HttpApi/Passingwind.Abp.Account.HttpApi.csproj b/modules/account/src/Passingwind.Abp.Account.HttpApi/Passingwind.Abp.Account.HttpApi.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.Account</RootNamespace>
   </PropertyGroup>

diff --git a/modules/api-keys/common.props b/modules/api-keys/common.props
@@ -5,8 +5,8 @@
     <Product>Passingwind.Abp.ApiKey</Product>
     <Description>an abp module that provider api key authentication and key management.</Description>
     <PackageTags>abp-module, apikey</PackageTags>
-    <Version>0.2.0</Version>
-    <PackageVersion>0.2.2</PackageVersion>
+    <Version>1.0.0</Version>
+    <PackageVersion>1.0.0</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...api-keys/src/Passingwind.Abp.ApiKey.Application/Passingwind.Abp.ApiKey.Application.csproj b/...api-keys/src/Passingwind.Abp.ApiKey.Application/Passingwind.Abp.ApiKey.Application.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.ApiKey</RootNamespace>
   </PropertyGroup>

diff --git a/...s/api-keys/src/Passingwind.Abp.ApiKey.AspNetCore/Passingwind.Abp.ApiKey.AspNetCore.csproj b/...s/api-keys/src/Passingwind.Abp.ApiKey.AspNetCore/Passingwind.Abp.ApiKey.AspNetCore.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.ApiKey</RootNamespace>
   </PropertyGroup>

diff --git a/...keys/src/Passingwind.Abp.ApiKey.Domain.Shared/Passingwind.Abp.ApiKey.Domain.Shared.csproj b/...keys/src/Passingwind.Abp.ApiKey.Domain.Shared/Passingwind.Abp.ApiKey.Domain.Shared.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...singwind.Abp.ApiKey.EntityFrameworkCore/Passingwind.Abp.ApiKey.EntityFrameworkCore.csproj b/...singwind.Abp.ApiKey.EntityFrameworkCore/Passingwind.Abp.ApiKey.EntityFrameworkCore.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.ApiKey</RootNamespace>
   </PropertyGroup>

diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.HttpApi.Client/ApiKeyHttpApiClientModule.cs b/modules/api-keys/src/Passingwind.Abp.ApiKey.HttpApi.Client/ApiKeyHttpApiClientModule.cs
@@ -17,10 +17,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             ApiKeyRemoteServiceConsts.RemoteServiceName
         );
 
-        Configure<AbpVirtualFileSystemOptions>(options =>
-        {
-            options.FileSets.AddEmbedded<ApiKeyHttpApiClientModule>();
-        });
-
+        Configure<AbpVirtualFileSystemOptions>(options => options.FileSets.AddEmbedded<ApiKeyHttpApiClientModule>());
     }
 }
diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.HttpApi/Passingwind.Abp.ApiKey.HttpApi.csproj b/modules/api-keys/src/Passingwind.Abp.ApiKey.HttpApi/Passingwind.Abp.ApiKey.HttpApi.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.ApiKey</RootNamespace>
   </PropertyGroup>

diff --git a/modules/common.props b/modules/common.props
@@ -22,38 +22,38 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <AbpVersion>7.3.3</AbpVersion>    
+    <AbpVersion>8.0.0</AbpVersion>    
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All" />
-    <PackageReference Include="Fody" Version="6.5.3">
+    <PackageReference Include="ConfigureAwait.Fody" Version="3.3.2" PrivateAssets="All" />
+    <PackageReference Include="Fody" Version="6.8.0">
       <PrivateAssets>All</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.*">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Roslynator.Analyzers" Version="4.5.0">
+    <PackageReference Include="Roslynator.Analyzers" Version="4.11.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.5.0">
+    <PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.11.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.5.0">
+    <PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.11.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/modules/dictionary-management/common.props b/modules/dictionary-management/common.props
@@ -6,8 +6,8 @@
     <Product>Passingwind.Abp.DictionaryManagement</Product>
     <Description>an abp module that provider dynamic dictionary management service</Description>
     <PackageTags>abp-module</PackageTags>
-    <Version>0.2.0</Version>
-    <PackageVersion>0.2.1</PackageVersion>
+    <Version>1.0.0</Version>
+    <PackageVersion>1.0.0</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/....DictionaryManagement.Application/Passingwind.Abp.DictionaryManagement.Application.csproj b/....DictionaryManagement.Application/Passingwind.Abp.DictionaryManagement.Application.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.DictionaryManagement</RootNamespace> 
   </PropertyGroup>

diff --git a/...tionaryManagement.Domain.Shared/Passingwind.Abp.DictionaryManagement.Domain.Shared.csproj b/...tionaryManagement.Domain.Shared/Passingwind.Abp.DictionaryManagement.Domain.Shared.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ement.EntityFrameworkCore/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.csproj b/...ement.EntityFrameworkCore/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.DictionaryManagement</RootNamespace>
   </PropertyGroup>

diff --git a/...wind.Abp.DictionaryManagement.HttpApi/Passingwind.Abp.DictionaryManagement.HttpApi.csproj b/...wind.Abp.DictionaryManagement.HttpApi/Passingwind.Abp.DictionaryManagement.HttpApi.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.DictionaryManagement</RootNamespace>
   </PropertyGroup>

diff --git a/modules/dynamic-permission-management/common.props b/modules/dynamic-permission-management/common.props
@@ -6,8 +6,8 @@
     <Product>Passingwind.Abp.DynamicPermissionManagement</Product>
     <Description>an abp module that provider dynamic permission management service</Description>
     <PackageTags>abp-module</PackageTags>
-    <Version>0.2.0</Version>
-    <PackageVersion>0.2.1</PackageVersion>
+    <Version>1.0.0</Version>
+    <PackageVersion>1.0.0</PackageVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/...sionManagement.Application/Passingwind.Abp.DynamicPermissionManagement.Application.csproj b/...sionManagement.Application/Passingwind.Abp.DynamicPermissionManagement.Application.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.DynamicPermissionManagement</RootNamespace>
   </PropertyGroup>

diff --git a/...Management.Domain.Shared/Passingwind.Abp.DynamicPermissionManagement.Domain.Shared.csproj b/...Management.Domain.Shared/Passingwind.Abp.DynamicPermissionManagement.Domain.Shared.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.*" />
   </ItemGroup>
 
 </Project>
diff --git a/...ntityFrameworkCore/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.csproj b/...ntityFrameworkCore/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.csproj
@@ -3,7 +3,7 @@
     <Import Project="..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <RootNamespace>Passingwind.Abp.DynamicPermissionManagement</RootNamespace>
     </PropertyGroup>

diff --git a/...icPermissionManagement.HttpApi/Passingwind.Abp.DynamicPermissionManagement.HttpApi.csproj b/...icPermissionManagement.HttpApi/Passingwind.Abp.DynamicPermissionManagement.HttpApi.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.DynamicPermissionManagement</RootNamespace>
   </PropertyGroup>