Prepare release 7.0.1 (#1889)

* Prepare release 7.0.1. * Fix tests.
PomeloFoundation · Mar 17, 2024 · 29f8073 · 29f8073
1 parent 28c19dd
commit 29f8073
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 30 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,10 +31,10 @@ jobs:
         dbVersion:
           - 8.0.36-mysql
           - 5.7.44-mysql
-          # - 11.3.2-mariadb
-          # - 11.2.3-mariadb
-          # - 11.1.4-mariadb
-          # - 11.0.5-mariadb
+          - 11.3.2-mariadb
+          - 11.2.3-mariadb
+          - 11.1.4-mariadb
+          - 11.0.5-mariadb
           - 10.11.7-mariadb
           - 10.10.7-mariadb
           - 10.9.8-mariadb

diff --git a/Dependencies.targets b/Dependencies.targets
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup Label="Common Versions">
-    <EFCoreVersion>7.*</EFCoreVersion>
+    <EFCoreVersion>[7.0.17,7.0.999]</EFCoreVersion>
   </PropertyGroup>
 
   <ItemGroup Label="Dependencies">
@@ -12,17 +12,17 @@
     <PackageReference Update="MySqlConnector" Version="2.2.5" />
 
     <PackageReference Update="NetTopologySuite" Version="2.5.0" />
-    <PackageReference Update="System.Text.Json" Version="7.0.1" />
-    <PackageReference Update="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Update="System.Text.Json" Version="7.0.4" />
+    <PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
 
     <PackageReference Update="Castle.Core" Version="5.1.1" />
     <PackageReference Update="GitHubActionsTestLogger" Version="2.3.3" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.2" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.2" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.17" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.17" />
     <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
     <PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
     <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="7.0.2" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
     <PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
     <PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
     <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
@@ -35,7 +35,7 @@
     <PackageReference Update="Moq" Version="4.18.4" />
     <PackageReference Update="System.Collections.Immutable" Version="7.0.0" />
     <PackageReference Update="System.ComponentModel.TypeConverter" Version="4.3.0" />
-    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
+    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
     <PackageReference Update="xunit.assert" Version="2.4.2" />
     <PackageReference Update="xunit.core" Version="2.4.2" />
     <PackageReference Update="xunit.runner.console" Version="2.4.2" />

diff --git a/NuGet.config b/NuGet.config
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="Pomelo" value="https://pkgs.dev.azure.com/pomelo-efcore/Pomelo.EntityFrameworkCore.MySql/_packaging/pomelo-efcore-public/nuget/v3/index.json" />
-    <!--<add key="myget.org" value="https://www.myget.org/F/pomelo/api/v3/index.json" />-->
-    <!-- Package sources used by EF Core: -->
-    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
-    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
-    <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
-    <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
-    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
-    <add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
+    <add key="pomelo-nightly-public-azdo" value="https://pkgs.dev.azure.com/pomelo-efcore/Pomelo.EntityFrameworkCore.MySql/_packaging/pomelo-efcore-public/nuget/v3/index.json" />
+    <add key="pomelo-nightly-debug-azdo" value="https://pkgs.dev.azure.com/pomelo-efcore/Pomelo.EntityFrameworkCore.MySql/_packaging/pomelo-efcore-debug/nuget/v3/index.json" />
+    <add key="pomelo-nightly-public-myget" value="https://www.myget.org/F/pomelo/api/v3/index.json" />
+    <add key="pomelo-nightly-debug-myget" value="https://www.myget.org/F/pomelo-debug/api/v3/index.json" />
 
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/dotnet-tools.json b/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "7.0.11",
+      "version": "7.0.17",
       "commands": [
         "dotnet-ef"
       ]

diff --git a/src/EFCore.MySql/Infrastructure/MariaDbServerVersion.cs b/src/EFCore.MySql/Infrastructure/MariaDbServerVersion.cs
@@ -15,7 +15,7 @@ namespace Microsoft.EntityFrameworkCore
     public class MariaDbServerVersion : ServerVersion
     {
         public static readonly string MariaDbTypeIdentifier = nameof(ServerType.MariaDb).ToLowerInvariant();
-        public static readonly ServerVersion LatestSupportedServerVersion = new MariaDbServerVersion(new Version(10, 9, 4));
+        public static readonly ServerVersion LatestSupportedServerVersion = new MariaDbServerVersion(new Version(11, 3, 2));
 
         public override ServerVersionSupport Supports { get; }
 

diff --git a/src/EFCore.MySql/Infrastructure/MySqlServerVersion.cs b/src/EFCore.MySql/Infrastructure/MySqlServerVersion.cs
@@ -15,7 +15,7 @@ namespace Microsoft.EntityFrameworkCore
     public class MySqlServerVersion : ServerVersion
     {
         public static readonly string MySqlTypeIdentifier = nameof(ServerType.MySql).ToLowerInvariant();
-        public static readonly ServerVersion LatestSupportedServerVersion = new MySqlServerVersion(new Version(8, 0, 31));
+        public static readonly ServerVersion LatestSupportedServerVersion = new MySqlServerVersion(new Version(8, 0, 36));
 
         public override ServerVersionSupport Supports { get; }
 

diff --git a/test/EFCore.MySql.FunctionalTests/BulkUpdates/FiltersInheritanceBulkUpdatesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/BulkUpdates/FiltersInheritanceBulkUpdatesMySqlTest.cs
@@ -1,7 +1,10 @@
+using System;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.BulkUpdates;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using MySqlConnector;
+using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
+using Pomelo.EntityFrameworkCore.MySql.Tests;
 using Xunit;
 
 namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.BulkUpdates;
@@ -89,12 +92,12 @@ public override async Task Delete_GroupBy_Where_Select_First_2(bool async)
 
     public override async Task Delete_GroupBy_Where_Select_First_3(bool async)
     {
-        // Not supported by MySQL:
-        //     Error Code: 1093. You can't specify target table 'c' for update in FROM clause
-        await Assert.ThrowsAsync<MySqlException>(
-            () => base.Delete_GroupBy_Where_Select_First_3(async));
+        if (AppConfig.ServerVersion.Type == ServerType.MariaDb &&
+            AppConfig.ServerVersion.Version >= new Version(11, 1))
+        {
+            await base.Delete_GroupBy_Where_Select_First_3(async);
 
-        AssertSql(
+            AssertSql(
 """
 DELETE `a`
 FROM `Animals` AS `a`
@@ -108,8 +111,15 @@ GROUP BY `a0`.`CountryId`
         FROM `Animals` AS `a1`
         WHERE (`a1`.`CountryId` = 1) AND (`a0`.`CountryId` = `a1`.`CountryId`)
         LIMIT 1) = `a`.`Id`))
-"""
-);
+""");
+        }
+        else
+        {
+            // Not supported by MySQL:
+            //     Error Code: 1093. You can't specify target table 'c' for update in FROM clause
+            await Assert.ThrowsAsync<MySqlException>(
+                () => base.Delete_GroupBy_Where_Select_First_3(async));
+        }
     }
 
     public override async Task Delete_where_keyless_entity_mapped_to_sql_query(bool async)