Skip to content

Commit d402cdc

Browse files
committed
Fix MySql.Data build.
Signed-off-by: Bradley Grainger <[email protected]>
1 parent ec7f8e0 commit d402cdc

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
arguments: '-c Release --no-restore'
137137
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net472/net8.0', 'No SSL') }}
138138
env:
139-
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,Redirection,StreamingResults,Tls11,UnixDomainSocket'
139+
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,Redirection,StreamingResults,Tls11,TlsValidationFingerprint,UnixDomainSocket'
140140
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True;UseCompression=True'
141141

142142
- job: windows_integration_tests_2
@@ -174,7 +174,7 @@ jobs:
174174
arguments: '-c Release --no-restore'
175175
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net6.0', 'No SSL') }}
176176
env:
177-
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,Redirection,StreamingResults,Tls11,UnixDomainSocket'
177+
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,Redirection,StreamingResults,Tls11,TlsValidationFingerprint,UnixDomainSocket'
178178
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True'
179179

180180
- job: linux_integration_tests

tests/IntegrationTests/SslTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System.Runtime.InteropServices;
22
using System.Security.Authentication;
33
using System.Security.Cryptography.X509Certificates;
4-
using MySqlConnector.Authentication.Ed25519;
54

65
namespace IntegrationTests;
76

@@ -206,7 +205,6 @@ public async Task ConnectSslRemoteCertificateValidationCallback(MySqlSslMode ssl
206205
}
207206
#endif
208207

209-
#if !MYSQL_DATA
210208
[SkippableFact(ServerFeatures.TlsFingerprintValidation)]
211209
public async Task ConnectZeroConfigurationSslNative()
212210
{
@@ -222,10 +220,11 @@ public async Task ConnectZeroConfigurationSslNative()
222220
await connection.OpenAsync();
223221
}
224222

223+
#if !MYSQL_DATA
225224
[SkippableFact(ServerFeatures.TlsFingerprintValidation | ServerFeatures.Ed25519)]
226225
public async Task ConnectZeroConfigurationSslEd25519()
227226
{
228-
Ed25519AuthenticationPlugin.Install();
227+
MySqlConnector.Authentication.Ed25519.Ed25519AuthenticationPlugin.Install();
229228
var csb = AppConfig.CreateConnectionStringBuilder();
230229
csb.CertificateFile = null;
231230
csb.SslMode = MySqlSslMode.VerifyFull;

0 commit comments

Comments
 (0)