Skip to content

Commit c2240ff

Browse files
bgraingerbgrainger
committed
Merge net9 into master.
Signed-off-by: Bradley Grainger <[email protected]>
2 parents 9d17f7f + 3ae8fc1 commit c2240ff

29 files changed

+142
-101
lines changed

‎.ci/build-steps.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,58 +27,58 @@ steps:
2727
displayName: 'Publish MySqlConnector.Tests'
2828
inputs:
2929
command: 'publish'
30-
arguments: '-c Release -f net8.0 --no-build tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj'
30+
arguments: '-c Release -f net9.0 --no-build tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj'
3131
publishWebProjects: false
3232
zipAfterPublish: false
3333
- task: PublishPipelineArtifact@0
3434
inputs:
35-
artifactName: 'MySqlConnector.Tests-8.0-$(Agent.OS)'
36-
targetPath: 'artifacts/publish/MySqlConnector.Tests/release_net8.0'
35+
artifactName: 'MySqlConnector.Tests-9.0-$(Agent.OS)'
36+
targetPath: 'artifacts/publish/MySqlConnector.Tests/release_net9.0'
3737

3838
- task: DotNetCoreCLI@2
3939
displayName: 'Publish Conformance.Tests'
4040
inputs:
4141
command: 'publish'
42-
arguments: '-c Release -f net8.0 --no-build tests/Conformance.Tests/Conformance.Tests.csproj'
42+
arguments: '-c Release -f net9.0 --no-build tests/Conformance.Tests/Conformance.Tests.csproj'
4343
publishWebProjects: false
4444
zipAfterPublish: false
4545
- task: PublishPipelineArtifact@0
4646
inputs:
47-
artifactName: 'Conformance.Tests-8.0-$(Agent.OS)'
48-
targetPath: 'artifacts/publish/Conformance.Tests/release_net8.0'
47+
artifactName: 'Conformance.Tests-9.0-$(Agent.OS)'
48+
targetPath: 'artifacts/publish/Conformance.Tests/release_net9.0'
4949

5050
- task: DotNetCoreCLI@2
5151
displayName: 'Publish MySqlConnector.DependencyInjection.Tests'
5252
inputs:
5353
command: 'publish'
54-
arguments: '-c Release -f net8.0 --no-build tests/MySqlConnector.DependencyInjection.Tests/MySqlConnector.DependencyInjection.Tests.csproj'
54+
arguments: '-c Release -f net9.0 --no-build tests/MySqlConnector.DependencyInjection.Tests/MySqlConnector.DependencyInjection.Tests.csproj'
5555
publishWebProjects: false
5656
zipAfterPublish: false
5757
- task: PublishPipelineArtifact@0
5858
inputs:
59-
artifactName: 'MySqlConnector.DependencyInjection.Tests-8.0-$(Agent.OS)'
60-
targetPath: 'artifacts/publish/MySqlConnector.DependencyInjection.Tests/release_net8.0'
59+
artifactName: 'MySqlConnector.DependencyInjection.Tests-9.0-$(Agent.OS)'
60+
targetPath: 'artifacts/publish/MySqlConnector.DependencyInjection.Tests/release_net9.0'
6161

6262
- task: DotNetCoreCLI@2
63-
displayName: 'Publish IntegrationTests (7.0)'
63+
displayName: 'Publish IntegrationTests (9.0)'
6464
inputs:
6565
command: 'publish'
66-
arguments: '-c Release -f net8.0 --no-build tests/IntegrationTests/IntegrationTests.csproj'
66+
arguments: '-c Release -f net9.0 --no-build tests/IntegrationTests/IntegrationTests.csproj'
6767
publishWebProjects: false
6868
zipAfterPublish: false
6969
- task: PublishPipelineArtifact@0
7070
inputs:
71-
artifactName: 'IntegrationTests-net8.0-$(Agent.OS)'
72-
targetPath: 'artifacts/publish/IntegrationTests/release_net8.0'
71+
artifactName: 'IntegrationTests-net9.0-$(Agent.OS)'
72+
targetPath: 'artifacts/publish/IntegrationTests/release_net9.0'
7373

7474
- task: DotNetCoreCLI@2
75-
displayName: 'Publish IntegrationTests (6.0)'
75+
displayName: 'Publish IntegrationTests (8.0)'
7676
inputs:
7777
command: 'publish'
78-
arguments: '-c Release -f net6.0 --no-build tests/IntegrationTests/IntegrationTests.csproj'
78+
arguments: '-c Release -f net8.0 --no-build tests/IntegrationTests/IntegrationTests.csproj'
7979
publishWebProjects: false
8080
zipAfterPublish: false
8181
- task: PublishPipelineArtifact@0
8282
inputs:
83-
artifactName: 'IntegrationTests-net6.0-$(Agent.OS)'
84-
targetPath: 'artifacts/publish/IntegrationTests/release_net6.0'
83+
artifactName: 'IntegrationTests-net8.0-$(Agent.OS)'
84+
targetPath: 'artifacts/publish/IntegrationTests/release_net8.0'

‎.ci/conformance-test-steps.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ steps:
1010
- task: DownloadPipelineArtifact@0
1111
condition: always()
1212
inputs:
13-
artifactName: 'Conformance.Tests-8.0-$(Agent.OS)'
14-
targetPath: '$(Build.BinariesDirectory)/8.0'
13+
artifactName: 'Conformance.Tests-9.0-$(Agent.OS)'
14+
targetPath: '$(Build.BinariesDirectory)/9.0'
1515
- task: DotNetCoreCLI@2
1616
displayName: 'Conformance Tests'
1717
inputs:
1818
command: 'custom'
1919
custom: 'vstest'
20-
arguments: '$(Build.BinariesDirectory)/8.0/Conformance.Tests.dll /logger:trx'
20+
arguments: '$(Build.BinariesDirectory)/9.0/Conformance.Tests.dll /logger:trx'
2121
env:
2222
CONNECTION_STRING: ${{ parameters.connectionString }}
2323
- task: PublishTestResults@2

‎.ci/integration-tests-steps.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ steps:
88
- bash: ${{ format('.ci/docker-run.sh {0} 3300 {1}', parameters.image, parameters.unsupportedFeatures) }}
99
displayName: 'Start Docker container'
1010
- task: UseDotNet@2
11-
displayName: 'Install .NET 6.0'
11+
displayName: 'Install .NET 8.0'
1212
inputs:
13-
version: 6.0.x
13+
version: 8.0.x
1414
packageType: runtime
1515
- task: UseDotNet@2
1616
displayName: 'Install .NET'
@@ -33,19 +33,19 @@ steps:
3333
image: ${{ parameters.image }}
3434
unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
3535
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;UseCompression=True;DefaultCommandTimeout=3600;${{ parameters.connectionStringExtra }}'
36-
platform: 'net6.0'
36+
platform: 'net8.0'
3737
description: 'Compression'
3838
- template: 'integration-test-steps.yml'
3939
parameters:
4040
image: ${{ parameters.image }}
4141
unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
4242
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;${{ parameters.connectionStringExtra }}'
43-
platform: 'net6.0'
43+
platform: 'net9.0'
4444
description: 'No SSL'
4545
- template: 'integration-test-steps.yml'
4646
parameters:
4747
image: ${{ parameters.image }}
4848
unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
4949
connectionString: server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=required;DefaultCommandTimeout=3600;certificate file=$(Build.Repository.LocalPath)/.ci/server/certs/ssl-client.pfx;${{ parameters.connectionStringExtra }}
50-
platform: 'net6.0'
50+
platform: 'net9.0'
5151
description: 'SSL'

‎.ci/mysqlconnector-tests-steps.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ steps:
66
includePreviewVersions: true
77
- task: DownloadPipelineArtifact@0
88
inputs:
9-
artifactName: 'MySqlConnector.Tests-8.0-$(Agent.OS)'
9+
artifactName: 'MySqlConnector.Tests-9.0-$(Agent.OS)'
1010
targetPath: $(System.DefaultWorkingDirectory)
1111
- task: DotNetCoreCLI@2
1212
displayName: 'Run MySqlConnector.Tests'
@@ -16,7 +16,7 @@ steps:
1616
arguments: 'MySqlConnector.Tests.dll /logger:trx'
1717
- task: DownloadPipelineArtifact@0
1818
inputs:
19-
artifactName: 'MySqlConnector.DependencyInjection.Tests-8.0-$(Agent.OS)'
19+
artifactName: 'MySqlConnector.DependencyInjection.Tests-9.0-$(Agent.OS)'
2020
targetPath: $(System.DefaultWorkingDirectory)
2121
- task: DotNetCoreCLI@2
2222
displayName: 'Run MySqlConnector.DependencyInjection.Tests'
@@ -28,4 +28,4 @@ steps:
2828
inputs:
2929
testResultsFormat: VSTest
3030
testResultsFiles: '**/*.trx'
31-
testRunTitle: 'MySqlConnector.Tests-8.0-$(Agent.OS)'
31+
testRunTitle: 'MySqlConnector.Tests-9.0-$(Agent.OS)'

‎.ci/test.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ dotnet test -c Release -f net462
3838
if ($LASTEXITCODE -ne 0){
3939
exit $LASTEXITCODE;
4040
}
41-
dotnet test -c Release -f net7.0
41+
dotnet test -c Release -f net9.0
4242
if ($LASTEXITCODE -ne 0){
4343
exit $LASTEXITCODE;
4444
}
4545

4646
echo "Executing integration tests with Compression, No SSL"
4747
Copy-Item -Force ..\..\.ci\config\config.compression.json config.json
48-
dotnet test -c Release -f net6.0
48+
dotnet test -c Release -f net8.0
4949
if ($LASTEXITCODE -ne 0){
5050
exit $LASTEXITCODE;
5151
}

‎.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ jobs:
1515
- name: Checkout repository
1616
uses: actions/checkout@v4
1717

18-
- name: Set up .NET 8.0
18+
- name: Set up .NET
1919
uses: actions/setup-dotnet@v4
20-
with:
21-
dotnet-version: 8.x
2220

2321
- name: Restore
2422
run: dotnet restore

‎.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ jobs:
2626
- name: Check out
2727
uses: actions/checkout@v4
2828

29-
- name: Set up .NET 8.0
29+
- name: Set up .NET
3030
uses: actions/setup-dotnet@v4
31-
with:
32-
dotnet-version: 8.x
3331

3432
- name: Initialize CodeQL
3533
uses: github/codeql-action/init@v3

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ cache:
88
install:
99
- ps: Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile "install-dotnet.ps1"
1010
- ps: .\install-dotnet.ps1 -Channel 6.0 -InstallDir "dotnetcli"
11-
- ps: .\install-dotnet.ps1 -Channel 7.0 -InstallDir "dotnetcli"
1211
- ps: .\install-dotnet.ps1 -Channel 8.0 -InstallDir "dotnetcli"
12+
- ps: .\install-dotnet.ps1 -Channel 9.0 -InstallDir "dotnetcli"
1313
build_script:
1414
- dotnet --info
1515
before_test:

‎azure-pipelines.yml

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
DotNetCoreSdkVersion: '8.x'
2+
DotNetCoreSdkVersion: '9.x'
33
NUGET_PACKAGES: '$(Pipeline.Workspace)/.nuget/packages'
44

55
jobs:
@@ -16,17 +16,6 @@ jobs:
1616
vmimage: 'windows-latest'
1717
steps:
1818
- template: '.ci/build-steps.yml'
19-
- task: DotNetCoreCLI@2
20-
displayName: 'Publish IntegrationTests (net472)'
21-
inputs:
22-
command: 'publish'
23-
arguments: '-c Release -f net472 tests/IntegrationTests/IntegrationTests.csproj'
24-
publishWebProjects: false
25-
zipAfterPublish: false
26-
- task: PublishPipelineArtifact@0
27-
inputs:
28-
artifactName: 'IntegrationTests-net472-$(Agent.OS)'
29-
targetPath: 'artifacts/publish/IntegrationTests/release_net472'
3019

3120
- job: windows_mysql_data
3221
displayName: 'MySql.Data Tests'
@@ -41,9 +30,9 @@ jobs:
4130
contents: 'config.json'
4231
targetFolder: 'tests/IntegrationTests'
4332
- task: UseDotNet@2
44-
displayName: 'Install .NET 7.0'
33+
displayName: 'Install .NET 8.0'
4534
inputs:
46-
version: '7.0.x'
35+
version: '8.0.x'
4736
- task: UseDotNet@2
4837
displayName: 'Install .NET'
4938
inputs:
@@ -91,11 +80,6 @@ jobs:
9180
vmimage: 'windows-2019'
9281
steps:
9382
- template: '.ci/install-mysql-windows.yml'
94-
- task: UseDotNet@2
95-
displayName: 'Install .NET Core 3.1'
96-
inputs:
97-
version: 3.1.x
98-
packageType: runtime
9983
- template: '.ci/mysqlconnector-tests-steps.yml'
10084
- template: '.ci/conformance-test-steps.yml'
10185
parameters:
@@ -123,18 +107,18 @@ jobs:
123107
displayName: 'Remove target frameworks'
124108
inputs:
125109
targetType: 'inline'
126-
script: '((Get-Content .\tests\IntegrationTests\IntegrationTests.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>net472;net8.0</TargetFrameworks>'')) | Set-Content .\tests\IntegrationTests\IntegrationTests.csproj'
110+
script: '((Get-Content .\tests\IntegrationTests\IntegrationTests.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>net481;net9.0</TargetFrameworks>'')) | Set-Content .\tests\IntegrationTests\IntegrationTests.csproj'
127111
- task: DotNetCoreCLI@2
128112
displayName: 'Restore packages'
129113
inputs:
130114
command: 'restore'
131115
- task: DotNetCoreCLI@2
132-
displayName: 'Integration tests (net472/net8.0)'
116+
displayName: 'Integration tests (net481/net9.0)'
133117
inputs:
134118
command: 'test'
135119
projects: 'tests/IntegrationTests/IntegrationTests.csproj'
136-
arguments: '-c Release --no-restore'
137-
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net472/net8.0', 'No SSL') }}
120+
arguments: '-c Release --no-restore -p:TestTfmsInParallel=false'
121+
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net481/net9.0', 'No SSL') }}
138122
env:
139123
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,Redirection,StreamingResults,Tls11,TlsFingerprintValidation,UnixDomainSocket'
140124
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True;UseCompression=True'
@@ -146,9 +130,9 @@ jobs:
146130
steps:
147131
- template: '.ci/install-mysql-windows.yml'
148132
- task: UseDotNet@2
149-
displayName: 'Install .NET 6.0'
133+
displayName: 'Install .NET 8.0'
150134
inputs:
151-
version: 6.0.x
135+
version: 8.0.x
152136
packageType: runtime
153137
- task: UseDotNet@2
154138
displayName: 'Install .NET'
@@ -161,18 +145,18 @@ jobs:
161145
displayName: 'Remove target frameworks'
162146
inputs:
163147
targetType: 'inline'
164-
script: '((Get-Content .\tests\IntegrationTests\IntegrationTests.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>net6.0</TargetFrameworks>'')) | Set-Content .\tests\IntegrationTests\IntegrationTests.csproj'
148+
script: '((Get-Content .\tests\IntegrationTests\IntegrationTests.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>net8.0</TargetFrameworks>'')) | Set-Content .\tests\IntegrationTests\IntegrationTests.csproj'
165149
- task: DotNetCoreCLI@2
166150
displayName: 'Restore packages'
167151
inputs:
168152
command: 'restore'
169153
- task: DotNetCoreCLI@2
170-
displayName: 'Integration tests (net6.0)'
154+
displayName: 'Integration tests (net8.0)'
171155
inputs:
172156
command: 'test'
173157
projects: 'tests/IntegrationTests/IntegrationTests.csproj'
174-
arguments: '-c Release --no-restore'
175-
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net6.0', 'No SSL') }}
158+
arguments: '-c Release --no-restore -p:TestTfmsInParallel=false'
159+
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net8.0', 'No SSL') }}
176160
env:
177161
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,Redirection,StreamingResults,Tls11,TlsFingerprintValidation,UnixDomainSocket'
178162
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True'

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "8.0"
3+
"version": "9.0"
44
}
55
}

0 commit comments

Comments
 (0)