diff --git a/Dependencies.targets b/Dependencies.targets index 24596c50c..e6c9b746d 100644 --- a/Dependencies.targets +++ b/Dependencies.targets @@ -15,7 +15,7 @@ - + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8e5c53b76..466a6c79b 100644 --- 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 index 5ce40ef2d..49ad910ce 100644 --- 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().Property(e => e.HasTemp).HasDefaultValue(777); + modelBuilder.Entity().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 index b459252bc..c944e6fa7 100644 --- 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 index 94d8e6dc8..72e0adc63 100644 --- 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 index b459252bc..c944e6fa7 100644 --- 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" }