Skip to content

Commit 135beb5

Browse files
authored
Add .NET 10 support. (#1595)
2 parents 8497ffc + 440809b commit 135beb5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+222
-273
lines changed

.ci/build-steps.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,52 +27,52 @@ steps:
2727
displayName: 'Publish MySqlConnector.Tests'
2828
inputs:
2929
command: 'publish'
30-
arguments: '-c Release -f net9.0 --no-build tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj'
30+
arguments: '-c Release -f net10.0 --no-build tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj'
3131
publishWebProjects: false
3232
zipAfterPublish: false
3333
- task: PublishPipelineArtifact@1
3434
inputs:
35-
artifact: 'MySqlConnector.Tests-9.0-$(Agent.OS)'
36-
targetPath: 'artifacts/publish/MySqlConnector.Tests/release_net9.0'
35+
artifact: 'MySqlConnector.Tests-10.0-$(Agent.OS)'
36+
targetPath: 'artifacts/publish/MySqlConnector.Tests/release_net10.0'
3737
publishLocation: 'pipeline'
3838

3939
- task: DotNetCoreCLI@2
4040
displayName: 'Publish Conformance.Tests'
4141
inputs:
4242
command: 'publish'
43-
arguments: '-c Release -f net9.0 --no-build tests/Conformance.Tests/Conformance.Tests.csproj'
43+
arguments: '-c Release -f net10.0 --no-build tests/Conformance.Tests/Conformance.Tests.csproj'
4444
publishWebProjects: false
4545
zipAfterPublish: false
4646
- task: PublishPipelineArtifact@1
4747
inputs:
48-
artifact: 'Conformance.Tests-9.0-$(Agent.OS)'
49-
targetPath: 'artifacts/publish/Conformance.Tests/release_net9.0'
48+
artifact: 'Conformance.Tests-10.0-$(Agent.OS)'
49+
targetPath: 'artifacts/publish/Conformance.Tests/release_net10.0'
5050
publishLocation: 'pipeline'
5151

5252
- task: DotNetCoreCLI@2
5353
displayName: 'Publish MySqlConnector.DependencyInjection.Tests'
5454
inputs:
5555
command: 'publish'
56-
arguments: '-c Release -f net9.0 --no-build tests/MySqlConnector.DependencyInjection.Tests/MySqlConnector.DependencyInjection.Tests.csproj'
56+
arguments: '-c Release -f net10.0 --no-build tests/MySqlConnector.DependencyInjection.Tests/MySqlConnector.DependencyInjection.Tests.csproj'
5757
publishWebProjects: false
5858
zipAfterPublish: false
5959
- task: PublishPipelineArtifact@1
6060
inputs:
61-
artifact: 'MySqlConnector.DependencyInjection.Tests-9.0-$(Agent.OS)'
62-
targetPath: 'artifacts/publish/MySqlConnector.DependencyInjection.Tests/release_net9.0'
61+
artifact: 'MySqlConnector.DependencyInjection.Tests-10.0-$(Agent.OS)'
62+
targetPath: 'artifacts/publish/MySqlConnector.DependencyInjection.Tests/release_net10.0'
6363
publishLocation: 'pipeline'
6464

6565
- task: DotNetCoreCLI@2
66-
displayName: 'Publish IntegrationTests (9.0)'
66+
displayName: 'Publish IntegrationTests (10.0)'
6767
inputs:
6868
command: 'publish'
69-
arguments: '-c Release -f net9.0 --no-build tests/IntegrationTests/IntegrationTests.csproj'
69+
arguments: '-c Release -f net10.0 --no-build tests/IntegrationTests/IntegrationTests.csproj'
7070
publishWebProjects: false
7171
zipAfterPublish: false
7272
- task: PublishPipelineArtifact@1
7373
inputs:
74-
artifact: 'IntegrationTests-net9.0-$(Agent.OS)'
75-
targetPath: 'artifacts/publish/IntegrationTests/release_net9.0'
74+
artifact: 'IntegrationTests-net10.0-$(Agent.OS)'
75+
targetPath: 'artifacts/publish/IntegrationTests/release_net10.0'
7676
publishLocation: 'pipeline'
7777

7878
- task: DotNetCoreCLI@2

.ci/conformance-test-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ steps:
1111
condition: always()
1212
inputs:
1313
buildType: 'current'
14-
artifactName: 'Conformance.Tests-9.0-$(Agent.OS)'
14+
artifactName: 'Conformance.Tests-10.0-$(Agent.OS)'
1515
targetPath: '$(Build.BinariesDirectory)/9.0'
1616
- task: DotNetCoreCLI@2
1717
displayName: 'Conformance Tests'

.ci/integration-tests-steps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ steps:
4545
image: ${{ parameters.image }}
4646
unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
4747
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;${{ parameters.connectionStringExtra }}'
48-
platform: 'net9.0'
48+
platform: 'net10.0'
4949
description: 'No SSL'
5050
- template: 'integration-test-steps.yml'
5151
parameters:
5252
image: ${{ parameters.image }}
5353
unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
5454
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 }}
55-
platform: 'net9.0'
55+
platform: 'net10.0'
5656
description: 'SSL'

.ci/mysqlconnector-tests-steps.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
- task: DownloadPipelineArtifact@2
88
inputs:
99
buildType: 'current'
10-
artifactName: 'MySqlConnector.Tests-9.0-$(Agent.OS)'
10+
artifactName: 'MySqlConnector.Tests-10.0-$(Agent.OS)'
1111
targetPath: $(System.DefaultWorkingDirectory)
1212
- task: DotNetCoreCLI@2
1313
displayName: 'Run MySqlConnector.Tests'
@@ -18,7 +18,7 @@ steps:
1818
- task: DownloadPipelineArtifact@2
1919
inputs:
2020
buildType: 'current'
21-
artifactName: 'MySqlConnector.DependencyInjection.Tests-9.0-$(Agent.OS)'
21+
artifactName: 'MySqlConnector.DependencyInjection.Tests-10.0-$(Agent.OS)'
2222
targetPath: $(System.DefaultWorkingDirectory)
2323
- task: DotNetCoreCLI@2
2424
displayName: 'Run MySqlConnector.DependencyInjection.Tests'
@@ -30,4 +30,4 @@ steps:
3030
inputs:
3131
testResultsFormat: VSTest
3232
testResultsFiles: '**/*.trx'
33-
testRunTitle: 'MySqlConnector.Tests-9.0-$(Agent.OS)'
33+
testRunTitle: 'MySqlConnector.Tests-10.0-$(Agent.OS)'

.ci/test.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dotnet test -c Release -f net462
3838
if ($LASTEXITCODE -ne 0){
3939
exit $LASTEXITCODE;
4040
}
41-
dotnet test -c Release -f net9.0
41+
dotnet test -c Release -f net10.0
4242
if ($LASTEXITCODE -ne 0){
4343
exit $LASTEXITCODE;
4444
}

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
strategy:
3434
matrix:
35-
tfm: [ 'net8.0', 'net9.0' ]
35+
tfm: [ 'net8.0', 'net10.0' ]
3636
services:
3737
mysql:
3838
image: mysql:9.4

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
5-
<LangVersion>preview</LangVersion>
5+
<LangVersion>14.0</LangVersion>
66
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
77
<NoWarn>$(NoWarn);1591;CA1708;CA1835;CA2215;CA5397;NU5105;SYSLIB0039</NoWarn>
88
<ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath>

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ 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"
1111
- ps: .\install-dotnet.ps1 -Channel 8.0 -InstallDir "dotnetcli"
12-
- ps: .\install-dotnet.ps1 -Channel 9.0 -InstallDir "dotnetcli"
12+
- ps: .\install-dotnet.ps1 -Channel 10.0 -InstallDir "dotnetcli"
1313
build_script:
1414
- dotnet --info
1515
before_test:

azure-pipelines.yml

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

55
jobs:
@@ -107,18 +107,18 @@ jobs:
107107
displayName: 'Remove target frameworks'
108108
inputs:
109109
targetType: 'inline'
110-
script: '((Get-Content .\tests\IntegrationTests\IntegrationTests.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>net481;net9.0</TargetFrameworks>'')) | Set-Content .\tests\IntegrationTests\IntegrationTests.csproj'
110+
script: '((Get-Content .\tests\IntegrationTests\IntegrationTests.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>net481;net10.0</TargetFrameworks>'')) | Set-Content .\tests\IntegrationTests\IntegrationTests.csproj'
111111
- task: DotNetCoreCLI@2
112112
displayName: 'Restore packages'
113113
inputs:
114114
command: 'restore'
115115
- task: DotNetCoreCLI@2
116-
displayName: 'Integration tests (net481/net9.0)'
116+
displayName: 'Integration tests (net481/net10.0)'
117117
inputs:
118118
command: 'test'
119119
projects: 'tests/IntegrationTests/IntegrationTests.csproj'
120120
arguments: '-c Release --no-restore -p:TestTfmsInParallel=false'
121-
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net481/net9.0', 'No SSL') }}
121+
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net481/net10.0', 'No SSL') }}
122122
env:
123123
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,ParsecAuthentication,Redirection,StreamingResults,Tls11,TlsFingerprintValidation,UnixDomainSocket,Vector'
124124
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True;UseCompression=True'

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.200",
3+
"version": "10.0.100-rc.1",
44
"rollForward": "latestFeature"
55
}
66
}

0 commit comments

Comments
 (0)