From 44bb3c080e69b37c2c1965185fad9fee60b17ecc Mon Sep 17 00:00:00 2001
From: gdlcf88 <gdlcf88@outlook.com>
Date: Fri, 26 Jul 2024 17:52:34 +0800
Subject: [PATCH] Upgrade to ABP 8.2.0

---
 Directory.Build.props                                       | 6 +++---
 common.props                                                | 2 +-
 .../DynamicEntitySample.Application.Contracts.csproj        | 2 +-
 .../DynamicEntitySample.Domain.Shared.csproj                | 4 ++--
 .../EntityFrameworkCore/DynamicEntitySampleDbContext.cs     | 3 ++-
 .../DynamicEntitySample.HttpApi.Client.csproj               | 2 +-
 .../DynamicEntitySample.Web/DynamicEntitySample.Web.csproj  | 2 +-
 .../DynamicEntitySample.Web/DynamicEntitySampleWebModule.cs | 6 +++---
 sample/aspnet-core/src/DynamicEntitySample.Web/package.json | 2 +-
 .../DynamicEntitySampleEntityFrameworkCoreTestModule.cs     | 2 +-
 .../EasyAbp.Abp.DynamicEntity.Application.Contracts.csproj  | 2 +-
 .../EasyAbp.Abp.DynamicEntity.Domain.Shared.csproj          | 4 ++--
 .../EasyAbp.Abp.DynamicEntity.Domain.csproj                 | 2 +-
 .../EasyAbp.Abp.DynamicEntity.HttpApi.Client.csproj         | 2 +-
 .../EasyAbp.Abp.DynamicEntity.MongoDB.csproj                | 2 +-
 .../EasyAbp.Abp.DynamicEntity.Web.csproj                    | 2 +-
 .../DynamicEntityEntityFrameworkCoreTestModule.cs           | 2 +-
 17 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index d1ac4a8..fef2f9d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
     <PropertyGroup>
 
-        <AbpVersion>8.1.0</AbpVersion>
-        <EasyAbpAbpDynamicQueryModuleVersion>0.11.0</EasyAbpAbpDynamicQueryModuleVersion>
-        <EasyAbpAbpDynamicPermissionModuleVersion>1.7.0</EasyAbpAbpDynamicPermissionModuleVersion>
+        <AbpVersion>8.2.0</AbpVersion>
+        <EasyAbpAbpDynamicQueryModuleVersion>0.12.0</EasyAbpAbpDynamicQueryModuleVersion>
+        <EasyAbpAbpDynamicPermissionModuleVersion>1.8.0</EasyAbpAbpDynamicPermissionModuleVersion>
 
     </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/common.props b/common.props
index 4aa3d6a..da11b84 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.14.0</Version>
+    <Version>0.15.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <AbpProjectType>module</AbpProjectType>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
diff --git a/sample/aspnet-core/src/DynamicEntitySample.Application.Contracts/DynamicEntitySample.Application.Contracts.csproj b/sample/aspnet-core/src/DynamicEntitySample.Application.Contracts/DynamicEntitySample.Application.Contracts.csproj
index c5db9f6..64aaa1a 100644
--- a/sample/aspnet-core/src/DynamicEntitySample.Application.Contracts/DynamicEntitySample.Application.Contracts.csproj
+++ b/sample/aspnet-core/src/DynamicEntitySample.Application.Contracts/DynamicEntitySample.Application.Contracts.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>DynamicEntitySample</RootNamespace>
   </PropertyGroup>
 
diff --git a/sample/aspnet-core/src/DynamicEntitySample.Domain.Shared/DynamicEntitySample.Domain.Shared.csproj b/sample/aspnet-core/src/DynamicEntitySample.Domain.Shared/DynamicEntitySample.Domain.Shared.csproj
index 2ad6a9b..556e36c 100644
--- a/sample/aspnet-core/src/DynamicEntitySample.Domain.Shared/DynamicEntitySample.Domain.Shared.csproj
+++ b/sample/aspnet-core/src/DynamicEntitySample.Domain.Shared/DynamicEntitySample.Domain.Shared.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>DynamicEntitySample</RootNamespace>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sample/aspnet-core/src/DynamicEntitySample.EntityFrameworkCore/EntityFrameworkCore/DynamicEntitySampleDbContext.cs b/sample/aspnet-core/src/DynamicEntitySample.EntityFrameworkCore/EntityFrameworkCore/DynamicEntitySampleDbContext.cs
index 6e8eb02..ccb4f7c 100644
--- a/sample/aspnet-core/src/DynamicEntitySample.EntityFrameworkCore/EntityFrameworkCore/DynamicEntitySampleDbContext.cs
+++ b/sample/aspnet-core/src/DynamicEntitySample.EntityFrameworkCore/EntityFrameworkCore/DynamicEntitySampleDbContext.cs
@@ -48,7 +48,8 @@ public class DynamicEntitySampleDbContext :
         public DbSet<IdentitySecurityLog> SecurityLogs { get; set; }
         public DbSet<IdentityLinkUser> LinkUsers { get; set; }
         public DbSet<IdentityUserDelegation> UserDelegations { get; set; }
-        
+        public DbSet<IdentitySession> Sessions { get; set; }
+
         // Tenant Management
         public DbSet<Tenant> Tenants { get; set; }
         public DbSet<TenantConnectionString> TenantConnectionStrings { get; set; }
diff --git a/sample/aspnet-core/src/DynamicEntitySample.HttpApi.Client/DynamicEntitySample.HttpApi.Client.csproj b/sample/aspnet-core/src/DynamicEntitySample.HttpApi.Client/DynamicEntitySample.HttpApi.Client.csproj
index d93ee54..0c7269e 100644
--- a/sample/aspnet-core/src/DynamicEntitySample.HttpApi.Client/DynamicEntitySample.HttpApi.Client.csproj
+++ b/sample/aspnet-core/src/DynamicEntitySample.HttpApi.Client/DynamicEntitySample.HttpApi.Client.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>DynamicEntitySample</RootNamespace>
   </PropertyGroup>
 
diff --git a/sample/aspnet-core/src/DynamicEntitySample.Web/DynamicEntitySample.Web.csproj b/sample/aspnet-core/src/DynamicEntitySample.Web/DynamicEntitySample.Web.csproj
index 0f6f65c..5144951 100644
--- a/sample/aspnet-core/src/DynamicEntitySample.Web/DynamicEntitySample.Web.csproj
+++ b/sample/aspnet-core/src/DynamicEntitySample.Web/DynamicEntitySample.Web.csproj
@@ -40,7 +40,7 @@
     <ProjectReference Include="..\DynamicEntitySample.Application\DynamicEntitySample.Application.csproj" />
     <ProjectReference Include="..\DynamicEntitySample.HttpApi\DynamicEntitySample.HttpApi.csproj" />
     <ProjectReference Include="..\DynamicEntitySample.EntityFrameworkCore\DynamicEntitySample.EntityFrameworkCore.csproj" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="3.1.*-*" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="3.2.0" />
     <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Swashbuckle" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="$(AbpVersion)" />
diff --git a/sample/aspnet-core/src/DynamicEntitySample.Web/DynamicEntitySampleWebModule.cs b/sample/aspnet-core/src/DynamicEntitySample.Web/DynamicEntitySampleWebModule.cs
index 7e86c9f..730ea81 100644
--- a/sample/aspnet-core/src/DynamicEntitySample.Web/DynamicEntitySampleWebModule.cs
+++ b/sample/aspnet-core/src/DynamicEntitySample.Web/DynamicEntitySampleWebModule.cs
@@ -171,15 +171,15 @@ private void ConfigureLocalizationServices()
                 options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar"));
                 options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish"));
                 options.Languages.Add(new LanguageInfo("fr", "fr", "Français"));
-                options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in"));
-                options.Languages.Add(new LanguageInfo("it", "it", "Italian", "it"));
+                options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi"));
+                options.Languages.Add(new LanguageInfo("it", "it", "Italian"));
                 options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português"));
                 options.Languages.Add(new LanguageInfo("ru", "ru", "Русский"));
                 options.Languages.Add(new LanguageInfo("sk", "sk", "Slovak"));
                 options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe"));
                 options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文"));
                 options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文"));
-                options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch", "de"));
+                options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch"));
                 options.Languages.Add(new LanguageInfo("es", "es", "Español"));
             });
         }
diff --git a/sample/aspnet-core/src/DynamicEntitySample.Web/package.json b/sample/aspnet-core/src/DynamicEntitySample.Web/package.json
index f987600..d846e4a 100644
--- a/sample/aspnet-core/src/DynamicEntitySample.Web/package.json
+++ b/sample/aspnet-core/src/DynamicEntitySample.Web/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.1.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.2.0"
   }
 }
\ No newline at end of file
diff --git a/sample/aspnet-core/test/DynamicEntitySample.EntityFrameworkCore.Tests/EntityFrameworkCore/DynamicEntitySampleEntityFrameworkCoreTestModule.cs b/sample/aspnet-core/test/DynamicEntitySample.EntityFrameworkCore.Tests/EntityFrameworkCore/DynamicEntitySampleEntityFrameworkCoreTestModule.cs
index 322653a..857f3d8 100644
--- a/sample/aspnet-core/test/DynamicEntitySample.EntityFrameworkCore.Tests/EntityFrameworkCore/DynamicEntitySampleEntityFrameworkCoreTestModule.cs
+++ b/sample/aspnet-core/test/DynamicEntitySample.EntityFrameworkCore.Tests/EntityFrameworkCore/DynamicEntitySampleEntityFrameworkCoreTestModule.cs
@@ -46,7 +46,7 @@ public override void OnApplicationShutdown(ApplicationShutdownContext context)
 
         private static SqliteConnection CreateDatabaseAndGetConnection()
         {
-            var connection = new SqliteConnection("Data Source=:memory:");
+            var connection = new AbpUnitTestSqliteConnection("Data Source=:memory:");
             connection.Open();
 
             var options = new DbContextOptionsBuilder<DynamicEntitySampleDbContext>()
diff --git a/src/EasyAbp.Abp.DynamicEntity.Application.Contracts/EasyAbp.Abp.DynamicEntity.Application.Contracts.csproj b/src/EasyAbp.Abp.DynamicEntity.Application.Contracts/EasyAbp.Abp.DynamicEntity.Application.Contracts.csproj
index 967b0da..72e40ab 100644
--- a/src/EasyAbp.Abp.DynamicEntity.Application.Contracts/EasyAbp.Abp.DynamicEntity.Application.Contracts.csproj
+++ b/src/EasyAbp.Abp.DynamicEntity.Application.Contracts/EasyAbp.Abp.DynamicEntity.Application.Contracts.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace />
   </PropertyGroup>
 
diff --git a/src/EasyAbp.Abp.DynamicEntity.Domain.Shared/EasyAbp.Abp.DynamicEntity.Domain.Shared.csproj b/src/EasyAbp.Abp.DynamicEntity.Domain.Shared/EasyAbp.Abp.DynamicEntity.Domain.Shared.csproj
index 0e6d96f..b60f2ec 100644
--- a/src/EasyAbp.Abp.DynamicEntity.Domain.Shared/EasyAbp.Abp.DynamicEntity.Domain.Shared.csproj
+++ b/src/EasyAbp.Abp.DynamicEntity.Domain.Shared/EasyAbp.Abp.DynamicEntity.Domain.Shared.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace />
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EasyAbp.Abp.DynamicEntity.Domain/EasyAbp.Abp.DynamicEntity.Domain.csproj b/src/EasyAbp.Abp.DynamicEntity.Domain/EasyAbp.Abp.DynamicEntity.Domain.csproj
index bc6fcdf..94ebd0b 100644
--- a/src/EasyAbp.Abp.DynamicEntity.Domain/EasyAbp.Abp.DynamicEntity.Domain.csproj
+++ b/src/EasyAbp.Abp.DynamicEntity.Domain/EasyAbp.Abp.DynamicEntity.Domain.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace />
   </PropertyGroup>
 
diff --git a/src/EasyAbp.Abp.DynamicEntity.HttpApi.Client/EasyAbp.Abp.DynamicEntity.HttpApi.Client.csproj b/src/EasyAbp.Abp.DynamicEntity.HttpApi.Client/EasyAbp.Abp.DynamicEntity.HttpApi.Client.csproj
index a1d3ee3..8039882 100644
--- a/src/EasyAbp.Abp.DynamicEntity.HttpApi.Client/EasyAbp.Abp.DynamicEntity.HttpApi.Client.csproj
+++ b/src/EasyAbp.Abp.DynamicEntity.HttpApi.Client/EasyAbp.Abp.DynamicEntity.HttpApi.Client.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace />
   </PropertyGroup>
 
diff --git a/src/EasyAbp.Abp.DynamicEntity.MongoDB/EasyAbp.Abp.DynamicEntity.MongoDB.csproj b/src/EasyAbp.Abp.DynamicEntity.MongoDB/EasyAbp.Abp.DynamicEntity.MongoDB.csproj
index eee12e9..157e904 100644
--- a/src/EasyAbp.Abp.DynamicEntity.MongoDB/EasyAbp.Abp.DynamicEntity.MongoDB.csproj
+++ b/src/EasyAbp.Abp.DynamicEntity.MongoDB/EasyAbp.Abp.DynamicEntity.MongoDB.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace />
   </PropertyGroup>
 
diff --git a/src/EasyAbp.Abp.DynamicEntity.Web/EasyAbp.Abp.DynamicEntity.Web.csproj b/src/EasyAbp.Abp.DynamicEntity.Web/EasyAbp.Abp.DynamicEntity.Web.csproj
index d261e3a..747f691 100644
--- a/src/EasyAbp.Abp.DynamicEntity.Web/EasyAbp.Abp.DynamicEntity.Web.csproj
+++ b/src/EasyAbp.Abp.DynamicEntity.Web/EasyAbp.Abp.DynamicEntity.Web.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/EasyAbp.Abp.DynamicEntity.EntityFrameworkCore.Tests/EntityFrameworkCore/DynamicEntityEntityFrameworkCoreTestModule.cs b/test/EasyAbp.Abp.DynamicEntity.EntityFrameworkCore.Tests/EntityFrameworkCore/DynamicEntityEntityFrameworkCoreTestModule.cs
index 249bedf..0ba69ce 100644
--- a/test/EasyAbp.Abp.DynamicEntity.EntityFrameworkCore.Tests/EntityFrameworkCore/DynamicEntityEntityFrameworkCoreTestModule.cs
+++ b/test/EasyAbp.Abp.DynamicEntity.EntityFrameworkCore.Tests/EntityFrameworkCore/DynamicEntityEntityFrameworkCoreTestModule.cs
@@ -38,7 +38,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
         
         private static SqliteConnection CreateDatabaseAndGetConnection()
         {
-            var connection = new SqliteConnection("Data Source=:memory:");
+            var connection = new AbpUnitTestSqliteConnection("Data Source=:memory:");
             connection.Open();
 
             new DynamicEntityDbContext(