From 83403d37d305ae704769bf72982f6f5bc64d6234 Mon Sep 17 00:00:00 2001 From: Bradley Grainger Date: Mon, 4 Dec 2023 09:29:37 -0800 Subject: [PATCH] Update Appveyor build to MySQL 8.0. This mirrors changes other projects have made in response to this issue: https://github.com/appveyor/ci/issues/3894 --- .ci/config/config.compression.json | 4 ++-- .ci/config/config.json | 4 ++-- appveyor.yml | 13 ++++++++----- tests/Conformance.Tests/DbFactoryFixture.cs | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.ci/config/config.compression.json b/.ci/config/config.compression.json index ca3199da0..f42f53ab6 100644 --- a/.ci/config/config.compression.json +++ b/.ci/config/config.compression.json @@ -1,10 +1,10 @@ { "Data": { - "ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;UseCompression=true;DefaultCommandTimeout=3600", + "ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;UseCompression=true;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=true", "SocketPath": "./../../../../.ci/run/mysql/mysqld.sock", "PasswordlessUser": "no_password", "SecondaryDatabase": "testdb2", - "UnsupportedFeatures": "Ed25519,RsaEncryption,CachingSha2Password,QueryAttributes,Tls12,Tls13,UnixDomainSocket,UuidToBin", + "UnsupportedFeatures": "Ed25519,QueryAttributes,StreamingResults,Tls11,UnixDomainSocket,ZeroDateTime", "MySqlBulkLoaderLocalCsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.CSV", "MySqlBulkLoaderLocalTsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.TSV" } diff --git a/.ci/config/config.json b/.ci/config/config.json index fa5908d80..183b2299c 100644 --- a/.ci/config/config.json +++ b/.ci/config/config.json @@ -1,10 +1,10 @@ { "Data": { - "ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600", + "ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=true", "SocketPath": "./../../../../.ci/run/mysql/mysqld.sock", "PasswordlessUser": "no_password", "SecondaryDatabase": "testdb2", - "UnsupportedFeatures": "Ed25519,RsaEncryption,CachingSha2Password,QueryAttributes,Tls12,Tls13,UnixDomainSocket,UuidToBin", + "UnsupportedFeatures": "Ed25519,QueryAttributes,StreamingResults,Tls11,UnixDomainSocket,ZeroDateTime", "MySqlBulkLoaderLocalCsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.CSV", "MySqlBulkLoaderLocalTsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.TSV" } diff --git a/appveyor.yml b/appveyor.yml index 7e9cc531f..df9959cd6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,4 @@ -image: Previous Visual Studio 2022 -services: -- mysql +image: Visual Studio 2022 environment: global: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true @@ -15,9 +13,14 @@ install: build_script: - dotnet --info before_test: +- ps: Start-Service MySQL80 - cmd: |- - "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql.exe" -u root --password=Password12! < .ci\server\init.sql - "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql.exe" -u root --password=Password12! < .ci\server\init_sha256.sql + "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! -e "SET GLOBAL log_bin_trust_function_creators = 1;" + "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! -e "SET GLOBAL local_infile = 1;" + "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! -e "SET GLOBAL max_connections = 250;" + "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! < .ci\server\init.sql + "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! < .ci\server\init_sha256.sql + "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql.exe" -u root --password=Password12! < .ci\server\init_caching_sha2.sql test_script: - ps: .\.ci\test.ps1 after_test: diff --git a/tests/Conformance.Tests/DbFactoryFixture.cs b/tests/Conformance.Tests/DbFactoryFixture.cs index 358226069..d52ea741b 100644 --- a/tests/Conformance.Tests/DbFactoryFixture.cs +++ b/tests/Conformance.Tests/DbFactoryFixture.cs @@ -9,7 +9,7 @@ public class DbFactoryFixture : IDbFactoryFixture { public DbFactoryFixture() { - ConnectionString = Environment.GetEnvironmentVariable("CONNECTION_STRING") ?? "Server=localhost;User Id=mysqltest;Password=test;SSL Mode=None"; + ConnectionString = Environment.GetEnvironmentVariable("CONNECTION_STRING") ?? "Server=localhost;User Id=mysqltest;Password=test;SSL Mode=None;AllowPublicKeyRetrieval=true"; } public string ConnectionString { get; }