From ba432ff999d1277fddedc1b43004b9df5acd0a76 Mon Sep 17 00:00:00 2001
From: gdlcf88 <gdlcf88@outlook.com>
Date: Thu, 19 Oct 2023 17:58:09 +0800
Subject: [PATCH] Upgrade to ABP 7.4.0

---
 Directory.Build.props                                     | 6 +++---
 common.props                                              | 2 +-
 .../DynamicEntitySample.DbMigrator.csproj                 | 2 +-
 .../DynamicEntitySample.Domain.Shared.csproj              | 2 +-
 .../DynamicEntitySample.EntityFrameworkCore.csproj        | 2 +-
 .../DynamicEntitySample.Web.csproj                        | 4 ++--
 .../aspnet-core/src/DynamicEntitySample.Web/package.json  | 2 +-
 sample/aspnet-core/src/DynamicEntitySample.Web/yarn.lock  | 8 ++++----
 .../DynamicEntitySample.TestBase.csproj                   | 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 +-
 ...Abp.Abp.DynamicEntity.EntityFrameworkCore.Tests.csproj | 2 +-
 .../EasyAbp.Abp.DynamicEntity.TestBase.csproj             | 2 +-
 17 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index e695d69..ef7f8ed 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
     <PropertyGroup>
 
-        <AbpVersion>7.3.0</AbpVersion>
-        <EasyAbpAbpDynamicQueryModuleVersion>0.8.0</EasyAbpAbpDynamicQueryModuleVersion>
-        <EasyAbpAbpDynamicPermissionModuleVersion>1.4.0</EasyAbpAbpDynamicPermissionModuleVersion>
+        <AbpVersion>7.4.0</AbpVersion>
+        <EasyAbpAbpDynamicQueryModuleVersion>0.9.0</EasyAbpAbpDynamicQueryModuleVersion>
+        <EasyAbpAbpDynamicPermissionModuleVersion>1.5.0</EasyAbpAbpDynamicPermissionModuleVersion>
 
     </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/common.props b/common.props
index ff81cb6..8ad001e 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.11.0</Version>
+    <Version>0.12.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <AbpProjectType>module</AbpProjectType>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
diff --git a/sample/aspnet-core/src/DynamicEntitySample.DbMigrator/DynamicEntitySample.DbMigrator.csproj b/sample/aspnet-core/src/DynamicEntitySample.DbMigrator/DynamicEntitySample.DbMigrator.csproj
index 11ac4bb..49a9563 100644
--- a/sample/aspnet-core/src/DynamicEntitySample.DbMigrator/DynamicEntitySample.DbMigrator.csproj
+++ b/sample/aspnet-core/src/DynamicEntitySample.DbMigrator/DynamicEntitySample.DbMigrator.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
     <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" />
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 16b69fc..76cc69b 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
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sample/aspnet-core/src/DynamicEntitySample.EntityFrameworkCore/DynamicEntitySample.EntityFrameworkCore.csproj b/sample/aspnet-core/src/DynamicEntitySample.EntityFrameworkCore/DynamicEntitySample.EntityFrameworkCore.csproj
index e156ed2..0a26fb0 100644
--- a/sample/aspnet-core/src/DynamicEntitySample.EntityFrameworkCore/DynamicEntitySample.EntityFrameworkCore.csproj
+++ b/sample/aspnet-core/src/DynamicEntitySample.EntityFrameworkCore/DynamicEntitySample.EntityFrameworkCore.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
     </PackageReference>
diff --git a/sample/aspnet-core/src/DynamicEntitySample.Web/DynamicEntitySample.Web.csproj b/sample/aspnet-core/src/DynamicEntitySample.Web/DynamicEntitySample.Web.csproj
index b14a9d6..e9856b9 100644
--- a/sample/aspnet-core/src/DynamicEntitySample.Web/DynamicEntitySample.Web.csproj
+++ b/sample/aspnet-core/src/DynamicEntitySample.Web/DynamicEntitySample.Web.csproj
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
   </ItemGroup>
 
@@ -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="2.3.*-*" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="2.4.1" />
     <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/package.json b/sample/aspnet-core/src/DynamicEntitySample.Web/package.json
index 24d9c85..2f90441 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": "~2.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.1"
   }
 }
\ No newline at end of file
diff --git a/sample/aspnet-core/src/DynamicEntitySample.Web/yarn.lock b/sample/aspnet-core/src/DynamicEntitySample.Web/yarn.lock
index d521b89..d135a7c 100644
--- a/sample/aspnet-core/src/DynamicEntitySample.Web/yarn.lock
+++ b/sample/aspnet-core/src/DynamicEntitySample.Web/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0":
-  version "2.3.0"
-  resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be"
-  integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww==
+"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.4.1":
+  version "2.4.1"
+  resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.4.1.tgz#414d28d6347aecc7a0246ada8dfa2f447781613c"
+  integrity sha512-qbWEVchynWGGvGbXP/M6KGJHy0ip3DlIIvkBpaCld6n1aisizJ9lz8yatMb/BKVwejPqOROtOOCYRJiz4oI0WA==
   dependencies:
     "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1"
 
diff --git a/sample/aspnet-core/test/DynamicEntitySample.TestBase/DynamicEntitySample.TestBase.csproj b/sample/aspnet-core/test/DynamicEntitySample.TestBase/DynamicEntitySample.TestBase.csproj
index 379f7c3..333f619 100644
--- a/sample/aspnet-core/test/DynamicEntitySample.TestBase/DynamicEntitySample.TestBase.csproj
+++ b/sample/aspnet-core/test/DynamicEntitySample.TestBase/DynamicEntitySample.TestBase.csproj
@@ -17,7 +17,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="NSubstitute" Version="4.3.0" />
-    <PackageReference Include="Shouldly" Version="4.0.3" />
+    <PackageReference Include="Shouldly" Version="4.1.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
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 c852922..62ec776 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>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
     <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 0696490..e32e0e6 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>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
     <RootNamespace />
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </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 baf7d6f..afad0b9 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>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>netstandard2.1;net7.0</TargetFrameworks>
     <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 dfab2d4..329a003 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>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
     <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 910b437..4b1ee27 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>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>netstandard2.1;net7.0</TargetFrameworks>
     <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 7e1bc43..ce17281 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="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/EasyAbp.Abp.DynamicEntity.EntityFrameworkCore.Tests/EasyAbp.Abp.DynamicEntity.EntityFrameworkCore.Tests.csproj b/test/EasyAbp.Abp.DynamicEntity.EntityFrameworkCore.Tests/EasyAbp.Abp.DynamicEntity.EntityFrameworkCore.Tests.csproj
index 843f3af..b4fe712 100644
--- a/test/EasyAbp.Abp.DynamicEntity.EntityFrameworkCore.Tests/EasyAbp.Abp.DynamicEntity.EntityFrameworkCore.Tests.csproj
+++ b/test/EasyAbp.Abp.DynamicEntity.EntityFrameworkCore.Tests/EasyAbp.Abp.DynamicEntity.EntityFrameworkCore.Tests.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.10" />
     <ProjectReference Include="..\..\src\EasyAbp.Abp.DynamicEntity.EntityFrameworkCore\EasyAbp.Abp.DynamicEntity.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\EasyAbp.Abp.DynamicEntity.TestBase\EasyAbp.Abp.DynamicEntity.TestBase.csproj" />
     <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="$(AbpVersion)" />
diff --git a/test/EasyAbp.Abp.DynamicEntity.TestBase/EasyAbp.Abp.DynamicEntity.TestBase.csproj b/test/EasyAbp.Abp.DynamicEntity.TestBase/EasyAbp.Abp.DynamicEntity.TestBase.csproj
index 12e7a65..aebc1bf 100644
--- a/test/EasyAbp.Abp.DynamicEntity.TestBase/EasyAbp.Abp.DynamicEntity.TestBase.csproj
+++ b/test/EasyAbp.Abp.DynamicEntity.TestBase/EasyAbp.Abp.DynamicEntity.TestBase.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="NSubstitute" Version="4.3.0" />
-    <PackageReference Include="Shouldly" Version="3.0.2" />
+    <PackageReference Include="Shouldly" Version="4.1.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />