Prepare release (#1687)

* Update dependencies. * Disable TLS usage for local database server connections in CI test runs. (#1651) (cherry picked from commit 43896e5) * Fix tests for compatibility with EF Core 6.0.7. * Install MySQL chocolatey package from local source on Windows CI platforms.
PomeloFoundation · Jul 22, 2022 · dbb3238 · dbb3238
1 parent ea268b7
commit dbb3238
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/Dependencies.targets b/Dependencies.targets
@@ -15,7 +15,7 @@
     <PackageReference Update="MySqlConnector" Version="2.1.2" />
 
     <PackageReference Update="NetTopologySuite" Version="2.3.0" />
-    <PackageReference Update="System.Text.Json" Version="6.0.7" />
+    <PackageReference Update="System.Text.Json" Version="6.0.5" />
     <PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
 
     <PackageReference Update="Castle.Core" Version="4.4.1" />

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -137,8 +137,16 @@ jobs:
             $mySqlIniPath = 'C:\tools\mysql\current\my.ini'
             $mySqlDataPath = 'C:\ProgramData\MySQL\data'
 
-            echo "Chocolatey command: choco install '$(databaseServerType)' '--version=$(databaseServerVersion)' --params `"/serviceName:$mySqlServiceName`""
-            choco install '$(databaseServerType)' '--version=$(databaseServerVersion)' --params "/serviceName:$mySqlServiceName"
+            # Manually install chocolatey package, because the files size can lead to the package being exempted on the official repository.
+            git clone https://github.com/mkevenaar/chocolatey-packages.git
+
+            $localChocolateyRepositoryName = 'local-chocolatey-repository'
+            mkdir $localChocolateyRepositoryName
+            choco pack '.\chocolatey-packages\automatic\$(databaseServerType)\$(databaseServerType).nuspec' --out $localChocolateyRepositoryName
+            choco source add -n $localChocolateyRepositoryName -s "$((Get-Item $localChocolateyRepositoryName).FullName)"
+
+            echo "Chocolatey command: choco install $(databaseServerType) -s `"$localChocolateyRepositoryName;chocolatey`" '--version=$(databaseServerVersion)' --params `"/serviceName:$mySqlServiceName`""
+            choco install $(databaseServerType) -s "$localChocolateyRepositoryName;chocolatey" '--version=$(databaseServerVersion)' --params "/serviceName:$mySqlServiceName"
 
             Get-Service *MySQL* -ErrorAction SilentlyContinue
             Stop-Service $mySqlServiceName -Verbose

diff --git a/test/EFCore.MySql.FunctionalTests/StoreGeneratedMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/StoreGeneratedMySqlTest.cs
@@ -122,6 +122,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
 
                 modelBuilder.Entity<NonStoreGenDependent>().Property(e => e.HasTemp).HasDefaultValue(777);
 
+                modelBuilder.Entity<CompositePrincipal>().Property(e => e.Id).UseMySqlIdentityColumn();
+
                 base.OnModelCreating(modelBuilder, context);
             }
         }

diff --git a/test/EFCore.MySql.FunctionalTests/config.json.example b/test/EFCore.MySql.FunctionalTests/config.json.example
@@ -1,6 +1,6 @@
 {
   "Data": {
-    "ConnectionString": "server=127.0.0.1;user id=root;password=Password12!;port=3306;",
+    "ConnectionString": "server=127.0.0.1;user id=root;password=Password12!;port=3306;sslmode=none;",
     "ServerVersion": "auto",
     "CommandTimeout": "600"
   }

diff --git a/test/EFCore.MySql.IntegrationTests/config.json.example b/test/EFCore.MySql.IntegrationTests/config.json.example
@@ -1,6 +1,6 @@
 {
   "Data": {
-    "ConnectionString": "server=127.0.0.1;user id=root;password=Password12!;port=3306;database=pomelo_test;",
+    "ConnectionString": "server=127.0.0.1;user id=root;password=Password12!;port=3306;sslmode=none;database=pomelo_test;",
     "ServerVersion": "auto",
     "CommandTimeout": "600"
   }

diff --git a/test/EFCore.MySql.Tests/config.json.example b/test/EFCore.MySql.Tests/config.json.example
@@ -1,6 +1,6 @@
 {
   "Data": {
-    "ConnectionString": "server=127.0.0.1;user id=root;password=Password12!;port=3306;",
+    "ConnectionString": "server=127.0.0.1;user id=root;password=Password12!;port=3306;sslmode=none;",
     "ServerVersion": "auto",
     "CommandTimeout": "600"
   }