Merge pull request #10 from jxnkwlp/feature/abp-8.2

jxnkwlp · web-flow · commit 233a95813f4b · 2024-07-07T14:56:53.000+08:00
update abp version to 8.2.0
diff --git a/common.props b/common.props
@@ -1,8 +1,8 @@
 ﻿<Project>
 
   <PropertyGroup>
-    <MicrosoftPackageVersion>8.0.0</MicrosoftPackageVersion>
-    <AbpVersion>8.1.1</AbpVersion>
+    <MicrosoftPackageVersion>8.0.4</MicrosoftPackageVersion>
+    <AbpVersion>8.2.0</AbpVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/host/common.props b/host/common.props
@@ -10,10 +10,6 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <AbpVersion>8.1.1</AbpVersion>    
-  </PropertyGroup>
-  
   <Target Name="NoWarnOnRazorViewImportedTypeConflicts" BeforeTargets="RazorCoreCompile">
     <PropertyGroup>
       <NoWarn>$(NoWarn);0436</NoWarn>
diff --git a/host/src/Sample.Domain/SampleDomainModule.cs b/host/src/Sample.Domain/SampleDomainModule.cs
@@ -44,7 +44,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
     {
         Configure<AbpLocalizationOptions>(options =>
         {
-            options.Languages.Add(new LanguageInfo("en", "en", "English", "gb"));
+            options.Languages.Add(new LanguageInfo("en", "English", "gb"));
             options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文"));
         });
 
diff --git a/host/src/Sample.EntityFrameworkCore/EntityFrameworkCore/SampleDbContext.cs b/host/src/Sample.EntityFrameworkCore/EntityFrameworkCore/SampleDbContext.cs
@@ -52,6 +52,7 @@ public class SampleDbContext :
     public DbSet<IdentitySecurityLog> SecurityLogs { get; set; }
     public DbSet<IdentityLinkUser> LinkUsers { get; set; }
     public DbSet<IdentityUserDelegation> UserDelegations { get; set; }
+    public DbSet<IdentitySession> Sessions { get; set; }
 
     /// <summary>
     /// Tenant Management
diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.Domain/Passingwind.Abp.ApiKey.Domain.csproj b/modules/api-keys/src/Passingwind.Abp.ApiKey.Domain/Passingwind.Abp.ApiKey.Domain.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.ApiKey</RootNamespace>
   </PropertyGroup>
diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.MongoDB/Passingwind.Abp.ApiKey.MongoDB.csproj b/modules/api-keys/src/Passingwind.Abp.ApiKey.MongoDB/Passingwind.Abp.ApiKey.MongoDB.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.ApiKey</RootNamespace>
   </PropertyGroup>
diff --git a/modules/common.props b/modules/common.props
@@ -40,13 +40,6 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <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="$(RoslynatorVersion)">
       <PrivateAssets>all</PrivateAssets>
diff --git a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain/Passingwind.Abp.IdentityClient.Domain.csproj b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain/Passingwind.Abp.IdentityClient.Domain.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.IdentityClient</RootNamespace>
   </PropertyGroup>
diff --git a/modules/identity-client/src/Passingwind.Abp.IdentityClient.MongoDB/Passingwind.Abp.IdentityClient.MongoDB.csproj b/modules/identity-client/src/Passingwind.Abp.IdentityClient.MongoDB/Passingwind.Abp.IdentityClient.MongoDB.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.IdentityClient</RootNamespace>
   </PropertyGroup>
diff --git a/modules/identity/src/Passingwind.Abp.Identity.Domain/Passingwind.Abp.Identity.Domain.csproj b/modules/identity/src/Passingwind.Abp.Identity.Domain/Passingwind.Abp.Identity.Domain.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.Identity</RootNamespace>
   </PropertyGroup>
diff --git a/modules/identity/src/Passingwind.Abp.Identity.EntityFrameworkCore/EntityFrameworkCore/IdentityDbContextV2.cs b/modules/identity/src/Passingwind.Abp.Identity.EntityFrameworkCore/EntityFrameworkCore/IdentityDbContextV2.cs
@@ -20,6 +20,7 @@ public class IdentityDbContextV2 : AbpDbContext<IdentityDbContextV2>, IIdentityD
     public DbSet<IdentityUserDelegation> UserDelegations { get; set; }
 
     public DbSet<IdentityUserTwoFactor> UserTwoFactors { get; set; }
+    public DbSet<IdentitySession> Sessions { get; set; }
 
     public IdentityDbContextV2(DbContextOptions<IdentityDbContextV2> options)
         : base(options)
diff --git a/modules/identity/src/Passingwind.Abp.Identity.MongoDB/Passingwind.Abp.Identity.MongoDB.csproj b/modules/identity/src/Passingwind.Abp.Identity.MongoDB/Passingwind.Abp.Identity.MongoDB.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Passingwind.Abp.Identity</RootNamespace>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)`
`44`	`44`	`{`
`45`	`45`	`Configure<AbpLocalizationOptions>(options =>`
`46`	`46`	`{`
`47`		`- options.Languages.Add(new LanguageInfo("en", "en", "English", "gb"));`
	`47`	`+ options.Languages.Add(new LanguageInfo("en", "English", "gb"));`
`48`	`48`	`options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文"));`
`49`	`49`	`});`
`50`	`50`