From a6a938c715648d26eca6bc456ad4ee13818c946a Mon Sep 17 00:00:00 2001
From: token <239573049@qq.com>
Date: Sat, 2 Dec 2023 22:31:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Directory.Build.props                                         | 4 +++-
 .../Masa.BuildingBlocks.Data/Masa.BuildingBlocks.Data.csproj  | 1 -
 .../Masa.Contrib.Data.EFCore.Cosmos.csproj                    | 1 -
 .../Masa.Contrib.Data.EFCore.InMemory.csproj                  | 1 -
 .../Masa.Contrib.Data.EFCore.MySql.csproj                     | 1 -
 .../Masa.Contrib.Data.EFCore.Pomelo.MySql.csproj              | 3 +--
 .../Masa.Contrib.Data.EFCore.PostgreSql.csproj                | 3 +--
 .../Masa.Contrib.Data.EFCore.SqlServer.csproj                 | 1 -
 .../Masa.Contrib.Data.EFCore.Sqlite.csproj                    | 1 -
 .../Masa.Contrib.Data.EFCore.Tests.csproj                     | 1 -
 .../Masa.Contrib.Data.EFCore/Masa.Contrib.Data.EFCore.csproj  | 1 -
 .../Masa.Contrib.Data.UoW.EFCore.csproj                       | 1 -
 .../Masa.Contrib.Ddd.Domain.Repository.EFCore.csproj          | 1 -
 .../Masa.Contrib.Ddd.Domain/Masa.Contrib.Ddd.Domain.csproj    | 1 -
 14 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 13c4f2243..7f5be45dc 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,8 @@
 <Project>
   <PropertyGroup>
-    <MicrosoftPackageVersion>6.0.0</MicrosoftPackageVersion>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net6.0'">6.0.0</MicrosoftPackageVersion>
+    <MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net7.0'">7.0.0</MicrosoftPackageVersion>
     <BenchmarkDotNetPackageVersion>0.13.1</BenchmarkDotNetPackageVersion>
     <MSTestPackageVersion>2.2.3</MSTestPackageVersion>
     <MicrosoftTeskSdkPackageVersion>16.9.4</MicrosoftTeskSdkPackageVersion>
diff --git a/src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Masa.BuildingBlocks.Data.csproj b/src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Masa.BuildingBlocks.Data.csproj
index 0de4bf36d..d75c1814f 100644
--- a/src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Masa.BuildingBlocks.Data.csproj
+++ b/src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Masa.BuildingBlocks.Data.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Cosmos/Masa.Contrib.Data.EFCore.Cosmos.csproj b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Cosmos/Masa.Contrib.Data.EFCore.Cosmos.csproj
index c27dc0b36..f88838a07 100644
--- a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Cosmos/Masa.Contrib.Data.EFCore.Cosmos.csproj
+++ b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Cosmos/Masa.Contrib.Data.EFCore.Cosmos.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.InMemory/Masa.Contrib.Data.EFCore.InMemory.csproj b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.InMemory/Masa.Contrib.Data.EFCore.InMemory.csproj
index 0cebec5a3..c5a2e2ac2 100644
--- a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.InMemory/Masa.Contrib.Data.EFCore.InMemory.csproj
+++ b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.InMemory/Masa.Contrib.Data.EFCore.InMemory.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.MySql/Masa.Contrib.Data.EFCore.MySql.csproj b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.MySql/Masa.Contrib.Data.EFCore.MySql.csproj
index e06862443..04e309711 100644
--- a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.MySql/Masa.Contrib.Data.EFCore.MySql.csproj
+++ b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.MySql/Masa.Contrib.Data.EFCore.MySql.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Pomelo.MySql/Masa.Contrib.Data.EFCore.Pomelo.MySql.csproj b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Pomelo.MySql/Masa.Contrib.Data.EFCore.Pomelo.MySql.csproj
index 50f2f48fa..ddd7aa9d9 100644
--- a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Pomelo.MySql/Masa.Contrib.Data.EFCore.Pomelo.MySql.csproj
+++ b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Pomelo.MySql/Masa.Contrib.Data.EFCore.Pomelo.MySql.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(MicrosoftPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.PostgreSql/Masa.Contrib.Data.EFCore.PostgreSql.csproj b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.PostgreSql/Masa.Contrib.Data.EFCore.PostgreSql.csproj
index 18a076cc3..6e6cadbe4 100644
--- a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.PostgreSql/Masa.Contrib.Data.EFCore.PostgreSql.csproj
+++ b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.PostgreSql/Masa.Contrib.Data.EFCore.PostgreSql.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(MicrosoftPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.SqlServer/Masa.Contrib.Data.EFCore.SqlServer.csproj b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.SqlServer/Masa.Contrib.Data.EFCore.SqlServer.csproj
index 24598e8a1..58bbc1c1e 100644
--- a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.SqlServer/Masa.Contrib.Data.EFCore.SqlServer.csproj
+++ b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.SqlServer/Masa.Contrib.Data.EFCore.SqlServer.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Sqlite/Masa.Contrib.Data.EFCore.Sqlite.csproj b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Sqlite/Masa.Contrib.Data.EFCore.Sqlite.csproj
index 7203a3919..08af8ea70 100644
--- a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Sqlite/Masa.Contrib.Data.EFCore.Sqlite.csproj
+++ b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Sqlite/Masa.Contrib.Data.EFCore.Sqlite.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Tests/Masa.Contrib.Data.EFCore.Tests.csproj b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Tests/Masa.Contrib.Data.EFCore.Tests.csproj
index 1be6e4d2b..f9fec6989 100644
--- a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Tests/Masa.Contrib.Data.EFCore.Tests.csproj
+++ b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Tests/Masa.Contrib.Data.EFCore.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>enable</ImplicitUsings>
diff --git a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore/Masa.Contrib.Data.EFCore.csproj b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore/Masa.Contrib.Data.EFCore.csproj
index 36caa704c..a4f87c05b 100644
--- a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore/Masa.Contrib.Data.EFCore.csproj
+++ b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore/Masa.Contrib.Data.EFCore.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Contrib/Data/UoW/Masa.Contrib.Data.UoW.EFCore/Masa.Contrib.Data.UoW.EFCore.csproj b/src/Contrib/Data/UoW/Masa.Contrib.Data.UoW.EFCore/Masa.Contrib.Data.UoW.EFCore.csproj
index 5c46d77bb..df564e1b4 100644
--- a/src/Contrib/Data/UoW/Masa.Contrib.Data.UoW.EFCore/Masa.Contrib.Data.UoW.EFCore.csproj
+++ b/src/Contrib/Data/UoW/Masa.Contrib.Data.UoW.EFCore/Masa.Contrib.Data.UoW.EFCore.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Contrib/Ddd/Domain/Masa.Contrib.Ddd.Domain.Repository.EFCore/Masa.Contrib.Ddd.Domain.Repository.EFCore.csproj b/src/Contrib/Ddd/Domain/Masa.Contrib.Ddd.Domain.Repository.EFCore/Masa.Contrib.Ddd.Domain.Repository.EFCore.csproj
index abb965221..ddabfe6b1 100644
--- a/src/Contrib/Ddd/Domain/Masa.Contrib.Ddd.Domain.Repository.EFCore/Masa.Contrib.Ddd.Domain.Repository.EFCore.csproj
+++ b/src/Contrib/Ddd/Domain/Masa.Contrib.Ddd.Domain.Repository.EFCore/Masa.Contrib.Ddd.Domain.Repository.EFCore.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Contrib/Ddd/Domain/Masa.Contrib.Ddd.Domain/Masa.Contrib.Ddd.Domain.csproj b/src/Contrib/Ddd/Domain/Masa.Contrib.Ddd.Domain/Masa.Contrib.Ddd.Domain.csproj
index e7e6e0a15..562eaf606 100644
--- a/src/Contrib/Ddd/Domain/Masa.Contrib.Ddd.Domain/Masa.Contrib.Ddd.Domain.csproj
+++ b/src/Contrib/Ddd/Domain/Masa.Contrib.Ddd.Domain/Masa.Contrib.Ddd.Domain.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

From 917ae859749b66dad695e7929452b03e7d82e736 Mon Sep 17 00:00:00 2001
From: token <239573049@qq.com>
Date: Sat, 2 Dec 2023 22:55:51 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9Oracle=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Masa.Contrib.Data.EFCore.Oracle.csproj        | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Oracle/Masa.Contrib.Data.EFCore.Oracle.csproj b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Oracle/Masa.Contrib.Data.EFCore.Oracle.csproj
index 7466a4ae5..a4c93a7d3 100644
--- a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Oracle/Masa.Contrib.Data.EFCore.Oracle.csproj
+++ b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Oracle/Masa.Contrib.Data.EFCore.Oracle.csproj
@@ -1,15 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Oracle.EntityFrameworkCore" Version="6.21.5" />
   </ItemGroup>
 
+  <Choose>
+    <When Condition="'$(TargetFramework)' == 'net6.0'">
+      <ItemGroup>
+        <PackageReference Include="Oracle.EntityFrameworkCore" Version="6.21.120" />
+      </ItemGroup>
+    </When>
+    <When Condition="'$(TargetFramework)' == 'net7.0'">
+      <ItemGroup>
+        <PackageReference Include="Oracle.EntityFrameworkCore" Version="7.21.12" />
+      </ItemGroup>
+    </When>
+  </Choose>
+
   <ItemGroup>
     <ProjectReference Include="..\Masa.Contrib.Data.EFCore\Masa.Contrib.Data.EFCore.csproj" />
   </ItemGroup>

From 48009c2fee061811cf5d3e120c8320f0f4ec9caf Mon Sep 17 00:00:00 2001
From: Token <239573049@qq.com>
Date: Wed, 21 Feb 2024 11:39:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=AF=E6=8C=81`.net8.0`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Directory.Build.props                                        | 3 ++-
 .../Masa.Contrib.Data.EFCore.Oracle.csproj                   | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 7f5be45dc..c6dc5b2d4 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,9 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net6.0'">6.0.0</MicrosoftPackageVersion>
     <MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net7.0'">7.0.0</MicrosoftPackageVersion>
+    <MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">8.0.0</MicrosoftPackageVersion>
     <BenchmarkDotNetPackageVersion>0.13.1</BenchmarkDotNetPackageVersion>
     <MSTestPackageVersion>2.2.3</MSTestPackageVersion>
     <MicrosoftTeskSdkPackageVersion>16.9.4</MicrosoftTeskSdkPackageVersion>
diff --git a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Oracle/Masa.Contrib.Data.EFCore.Oracle.csproj b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Oracle/Masa.Contrib.Data.EFCore.Oracle.csproj
index a4c93a7d3..db8444b45 100644
--- a/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Oracle/Masa.Contrib.Data.EFCore.Oracle.csproj
+++ b/src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore.Oracle/Masa.Contrib.Data.EFCore.Oracle.csproj
@@ -19,6 +19,11 @@
         <PackageReference Include="Oracle.EntityFrameworkCore" Version="7.21.12" />
       </ItemGroup>
     </When>
+    <When Condition="'$(TargetFramework)' == 'net8.0'">
+      <ItemGroup>
+        <PackageReference Include="Oracle.EntityFrameworkCore" Version="8.21.121" />
+      </ItemGroup>
+    </When>
   </Choose>
 
   <ItemGroup>