Prepare release 6.0.3.

lauxjpn · Mar 16, 2024 · a3a0bc7 · a3a0bc7
1 parent 38f7f25
commit a3a0bc7
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 23 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,7 +1,7 @@
 <Project>
   <PropertyGroup Label="Common Versions">
-    <DotnetRuntimeVersion>6.0.7</DotnetRuntimeVersion>
-    <EFCoreVersion>[$(DotnetRuntimeVersion), 7.0.0)</EFCoreVersion>
+    <DotnetRuntimeVersion>6.0.28</DotnetRuntimeVersion>
+    <EFCoreVersion>[$(DotnetRuntimeVersion),6.0.999]</EFCoreVersion>
     <DependencyPreviewVersion>$(DotnetRuntimeVersion)</DependencyPreviewVersion>
     <AspNetCoreVersion>$(DotnetRuntimeVersion)</AspNetCoreVersion>
   </PropertyGroup>
@@ -15,8 +15,8 @@
     <PackageReference Update="MySqlConnector" Version="2.1.2" />
 
     <PackageReference Update="NetTopologySuite" Version="2.3.0" />
-    <PackageReference Update="System.Text.Json" Version="6.0.5" />
-    <PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Update="System.Text.Json" Version="6.0.9" />
+    <PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
 
     <PackageReference Update="Castle.Core" Version="4.4.1" />
     <PackageReference Update="GitHubActionsTestLogger" Version="2.3.3" />
@@ -30,16 +30,16 @@
     <PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
     <PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
     <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration" Version="6.0.0" />
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration" Version="6.0.1" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
     <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
     <PackageReference Update="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageReference Update="Moq" Version="4.16.1" />
     <PackageReference Update="System.Collections.Immutable" Version="6.0.0" />
     <PackageReference Update="System.ComponentModel.TypeConverter" Version="4.3.0" />
-    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
+    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
     <PackageReference Update="xunit.assert" Version="2.4.1" />
     <PackageReference Update="xunit.core" Version="2.4.1" />
     <PackageReference Update="xunit.runner.console" Version="2.4.1" />

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": "6.0.7",
+      "version": "6.0.28",
       "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, 5, 5));
+        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, 21));
+        public static readonly ServerVersion LatestSupportedServerVersion = new MySqlServerVersion(new Version(8, 0, 36));
 
         public override ServerVersionSupport Supports { get; }