Merge pull request #11029 from abpframework/auto-merge/rel-5-0/734

Merge branch dev with rel-5.0
4 years ago · ab6eedd52a
parent bc5f34814c 26cc75462b
commit ab6eedd52a
2 changed files with 3 additions and 3 deletions
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
@ -19,8 +19,8 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Devart.Data.Oracle.EFCore" Version="9.14.1369" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftPackageVersion)" />
+        <PackageReference Include="Devart.Data.Oracle.EFCore" Version="9.15.1410" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1" />
    </ItemGroup>

 </Project>
--- a/nupkg/common.ps1
+++ b/nupkg/common.ps1
@ -136,7 +136,7 @@ $projects = (
    "framework/src/Volo.Abp.EntityFrameworkCore",
    "framework/src/Volo.Abp.EntityFrameworkCore.MySQL",
    "framework/src/Volo.Abp.EntityFrameworkCore.Oracle",
-    # "framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart",
+    "framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart",
    "framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql",
    "framework/src/Volo.Abp.EntityFrameworkCore.Sqlite",
    "framework/src/Volo.Abp.EntityFrameworkCore.SqlServer",