fix: 修复WebApi引用7.0MySql，Oracle的问题

dotnetcore · Oct 2, 2023 · d30481f · d30481f
1 parent f48a1ae
commit d30481f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/samples/web/Liuliu.Demo.WebApi/Liuliu.Demo.WebApi.csproj b/samples/web/Liuliu.Demo.WebApi/Liuliu.Demo.WebApi.csproj
@@ -4,7 +4,7 @@
   <Import Project="../../../build/version.props" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Liuliu.Demo.Web</RootNamespace>
     <UserSecretsId>38c51dba-31f4-4c29-a3b3-49164e38d32f</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -42,6 +42,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\OSharp.AutoMapper\OSharp.AutoMapper.csproj" />
+    <ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.MySql\OSharp.EntityFrameworkCore.MySql.csproj" />
+    <ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.Oracle\OSharp.EntityFrameworkCore.Oracle.csproj" />
     <ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.PostgreSql\OSharp.EntityFrameworkCore.PostgreSql.csproj" />
     <ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.Sqlite\OSharp.EntityFrameworkCore.Sqlite.csproj" />
     <ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.SqlServer\OSharp.EntityFrameworkCore.SqlServer.csproj" />
@@ -53,11 +55,6 @@
     <ProjectReference Include="..\..\..\src\OSharp.Swagger\OSharp.Swagger.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.MySql\OSharp.EntityFrameworkCore.MySql.csproj" />
-    <ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.Oracle\OSharp.EntityFrameworkCore.Oracle.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Folder Include="Migrations\" />
   </ItemGroup>

diff --git a/samples/web/Liuliu.Demo.WebApi/Startups/MySqlDefaultDbContextMigrationPack.cs b/samples/web/Liuliu.Demo.WebApi/Startups/MySqlDefaultDbContextMigrationPack.cs
@@ -6,7 +6,7 @@
 //  <last-editor>郭明锋</last-editor>
 //  <last-date>2018-08-13 20:35</last-date>
 // -----------------------------------------------------------------------
-#if NET6_0
+
 using System;
 using System.ComponentModel;
 
@@ -46,4 +46,3 @@ protected override DefaultDbContext CreateDbContext(IServiceProvider scopedProvi
         }
     }
 }
-#endif
diff --git a/samples/web/Liuliu.Demo.WebApi/Startups/OracleDefaultDbContextMigrationPack.cs b/samples/web/Liuliu.Demo.WebApi/Startups/OracleDefaultDbContextMigrationPack.cs
@@ -7,7 +7,6 @@
 //  <last-date>2019-04-18 20:57</last-date>
 // -----------------------------------------------------------------------
 
-#if NET6_0
 
 using System;
 using System.ComponentModel;
@@ -48,4 +47,3 @@ protected override DefaultDbContext CreateDbContext(IServiceProvider scopedProvi
         }
     }
 }
-#endif
diff --git a/samples/web/Liuliu.Demo.WebApi/appsettings.Development.json b/samples/web/Liuliu.Demo.WebApi/appsettings.Development.json
@@ -126,7 +126,7 @@
     },
     "Redis": {
       "Configuration": "localhost",
-      "InstanceName": "Liuliu.Demo:"
+      "InstanceName": "Liuliu.Demo.Dev:"
     },
     "Swagger": {
       "Endpoints": [

diff --git a/src/OSharp.EntityFrameworkCore.Oracle/OSharp.EntityFrameworkCore.Oracle.csproj b/src/OSharp.EntityFrameworkCore.Oracle/OSharp.EntityFrameworkCore.Oracle.csproj
@@ -4,7 +4,7 @@
   <Import Project="../../build/version.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <PackageId>OSharp.EntityFrameworkCore.Oracle</PackageId>
     <Description>OSharp 数据访问组件，封装EntityFrameworkCore的Oracle数据访问功能的实现</Description>
     <Summary>OSharp 数据访问组件Oracle</Summary>