Skip to content

Commit e50affa

Browse files
bgraingerbgrainger
committed
Merge net7 into master.
Conflicts: tests/SideBySide/SideBySide.csproj
2 parents f5c299f + 78ef0a0 commit e50affa

File tree

140 files changed

+1119
-516
lines changed

Some content is hidden

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

140 files changed

+1119
-516
lines changed

‎.ci/build-steps.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,25 @@ steps:
2626
displayName: 'Publish MySqlConnector.Tests'
2727
inputs:
2828
command: 'publish'
29-
arguments: '-c Release -f net6.0 --no-build tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj'
29+
arguments: '-c Release -f net7.0 --no-build tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj'
3030
publishWebProjects: false
3131
zipAfterPublish: false
3232
- task: PublishPipelineArtifact@0
3333
inputs:
34-
artifactName: 'MySqlConnector.Tests-6.0-$(Agent.OS)'
35-
targetPath: 'tests/MySqlConnector.Tests/bin/Release/net6.0/publish'
34+
artifactName: 'MySqlConnector.Tests-7.0-$(Agent.OS)'
35+
targetPath: 'tests/MySqlConnector.Tests/bin/Release/net7.0/publish'
3636

3737
- task: DotNetCoreCLI@2
3838
displayName: 'Publish Conformance.Tests'
3939
inputs:
4040
command: 'publish'
41-
arguments: '-c Release -f net6.0 --no-build tests/Conformance.Tests/Conformance.Tests.csproj'
41+
arguments: '-c Release -f net7.0 --no-build tests/Conformance.Tests/Conformance.Tests.csproj'
4242
publishWebProjects: false
4343
zipAfterPublish: false
4444
- task: PublishPipelineArtifact@0
4545
inputs:
46-
artifactName: 'Conformance.Tests-6.0-$(Agent.OS)'
47-
targetPath: 'tests/Conformance.Tests/bin/Release/net6.0/publish'
46+
artifactName: 'Conformance.Tests-7.0-$(Agent.OS)'
47+
targetPath: 'tests/Conformance.Tests/bin/Release/net7.0/publish'
4848

4949
- task: DotNetCoreCLI@2
5050
displayName: 'Publish SideBySide (3.1)'
@@ -59,16 +59,16 @@ steps:
5959
targetPath: 'tests/SideBySide/bin/Release/netcoreapp3.1/publish'
6060

6161
- task: DotNetCoreCLI@2
62-
displayName: 'Publish SideBySide (5.0)'
62+
displayName: 'Publish SideBySide (7.0)'
6363
inputs:
6464
command: 'publish'
65-
arguments: '-c Release -f net5.0 --no-build tests/SideBySide/SideBySide.csproj'
65+
arguments: '-c Release -f net7.0 --no-build tests/SideBySide/SideBySide.csproj'
6666
publishWebProjects: false
6767
zipAfterPublish: false
6868
- task: PublishPipelineArtifact@0
6969
inputs:
70-
artifactName: 'SideBySide-net5.0-$(Agent.OS)'
71-
targetPath: 'tests/SideBySide/bin/Release/net5.0/publish'
70+
artifactName: 'SideBySide-net7.0-$(Agent.OS)'
71+
targetPath: 'tests/SideBySide/bin/Release/net7.0/publish'
7272

7373
- task: DotNetCoreCLI@2
7474
displayName: 'Publish SideBySide (6.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-6.0-$(Agent.OS)'
14-
targetPath: '$(Build.BinariesDirectory)/6.0'
13+
artifactName: 'Conformance.Tests-7.0-$(Agent.OS)'
14+
targetPath: '$(Build.BinariesDirectory)/7.0'
1515
- task: DotNetCoreCLI@2
1616
displayName: 'Conformance Tests'
1717
inputs:
1818
command: 'custom'
1919
custom: 'vstest'
20-
arguments: '$(Build.BinariesDirectory)/6.0/Conformance.Tests.dll /logger:trx'
20+
arguments: '$(Build.BinariesDirectory)/7.0/Conformance.Tests.dll /logger:trx'
2121
env:
2222
CONNECTION_STRING: ${{ parameters.connectionString }}
2323
- task: PublishTestResults@2

‎.ci/integration-tests-steps.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ steps:
1313
version: 3.1.x
1414
packageType: runtime
1515
- task: UseDotNet@2
16-
displayName: 'Install .NET Core 5.0'
16+
displayName: 'Install .NET Core 6.0'
1717
inputs:
18-
version: '5.0.x'
18+
version: 6.0.x
1919
packageType: runtime
2020
- task: UseDotNet@2
2121
displayName: 'Install .NET Core'
@@ -37,7 +37,7 @@ steps:
3737
image: ${{ parameters.image }}
3838
unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
3939
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 }}
40-
platform: 'net5.0'
40+
platform: 'net7.0'
4141
description: 'SSL'
4242
- template: 'sidebyside-test-steps.yml'
4343
parameters:

‎.ci/mysqlconnector-tests-steps.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
steps:
2-
- task: UseDotNet@2
3-
displayName: 'Install .NET Core 5.0'
4-
inputs:
5-
version: '5.0.x'
6-
packageType: runtime
72
- task: UseDotNet@2
83
displayName: 'Install .NET Core'
94
inputs:
105
version: $(DotNetCoreSdkVersion)
116
- task: DownloadPipelineArtifact@0
127
inputs:
13-
artifactName: 'MySqlConnector.Tests-6.0-$(Agent.OS)'
8+
artifactName: 'MySqlConnector.Tests-7.0-$(Agent.OS)'
149
targetPath: $(System.DefaultWorkingDirectory)
1510
- task: DotNetCoreCLI@2
1611
displayName: 'Run MySqlConnector.Tests'
@@ -22,4 +17,4 @@ steps:
2217
inputs:
2318
testResultsFormat: VSTest
2419
testResultsFiles: '**/*.trx'
25-
testRunTitle: 'MySqlConnector.Tests-6.0-$(Agent.OS)'
20+
testRunTitle: 'MySqlConnector.Tests-7.0-$(Agent.OS)'

‎.ci/test.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ pushd .\tests\SideBySide
2828

2929
echo "Executing tests with No Compression, No SSL"
3030
Copy-Item -Force ..\..\.ci\config\config.json config.json
31-
dotnet test -c Release -f net452
31+
dotnet test -c Release -f net462
3232
if ($LASTEXITCODE -ne 0){
3333
exit $LASTEXITCODE;
3434
}
35-
dotnet test -c Release -f net461
35+
dotnet test -c Release -f net7.0
3636
if ($LASTEXITCODE -ne 0){
3737
exit $LASTEXITCODE;
3838
}

‎.editorconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ dotnet_diagnostic.CA5398.severity = none # Avoid hardcoded SslProtocols values.
8484
dotnet_diagnostic.SA1003.severity = none # Operator must not be followed by whitespace.
8585
dotnet_diagnostic.SA1008.severity = none # Opening parenthesis must not be preceded by a space.
8686
dotnet_diagnostic.SA1009.severity = none # Closing parenthesis must not be followed by a space.
87+
dotnet_diagnostic.SA1010.severity = silent # https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3503
88+
dotnet_diagnostic.SA1011.severity = silent # https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3503
8789
dotnet_diagnostic.SA1027.severity = none # Tabs must not be used.
8890
dotnet_diagnostic.SA1101.severity = none # Prefix local calls with this.
8991
dotnet_diagnostic.SA1116.severity = none # Split parameters should start on line after declaration.

‎.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ jobs:
2626
- name: Checkout repository
2727
uses: actions/checkout@v3
2828

29-
- name: Set up .NET 6.0
29+
- name: Set up .NET 7.0
3030
uses: actions/setup-dotnet@v2
3131
with:
32-
dotnet-version: 6.0.x
32+
dotnet-version: 7.0.x
33+
include-prerelease: true
3334

3435
- name: Initialize CodeQL
3536
uses: github/codeql-action/init@v2

‎appveyor.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: Visual Studio 2019
1+
image: Visual Studio 2022
22
services:
33
- mysql
44
environment:
@@ -9,9 +9,9 @@ cache:
99
- '%USERPROFILE%\.nuget\packages -> **\*.csproj'
1010
install:
1111
- ps: Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile "install-dotnet.ps1"
12-
- ps: .\install-dotnet.ps1 -Version 3.1.410 -InstallDir "dotnetcli"
13-
- ps: .\install-dotnet.ps1 -Version 5.0.301 -InstallDir "dotnetcli"
14-
- ps: .\install-dotnet.ps1 -Version 6.0.100 -InstallDir "dotnetcli"
12+
- ps: .\install-dotnet.ps1 -Channel 3.1 -InstallDir "dotnetcli"
13+
- ps: .\install-dotnet.ps1 -Channel 5.0 -InstallDir "dotnetcli"
14+
- ps: .\install-dotnet.ps1 -Channel 7.0 -Quality preview -InstallDir "dotnetcli"
1515
build_script:
1616
- dotnet --info
1717
before_test:

‎azure-pipelines.yml

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

55
jobs:
@@ -41,9 +41,9 @@ jobs:
4141
contents: 'config.json'
4242
targetFolder: 'tests/SideBySide'
4343
- task: UseDotNet@2
44-
displayName: 'Install .NET Core 5.0'
44+
displayName: 'Install .NET Core 6.0'
4545
inputs:
46-
version: '5.0.x'
46+
version: '6.0.x'
4747
- task: UseDotNet@2
4848
displayName: 'Install .NET Core'
4949
inputs:
@@ -112,6 +112,11 @@ jobs:
112112
inputs:
113113
targetType: inline
114114
script: "mysql -u$(Azure MySQL Root User) -p$(Azure MySQL Root Password) -h '$(Azure MySQL Host)' -e 'create schema mysqltest_$(Build.BuildId) collate utf8mb4_0900_ai_ci;'"
115+
- task: UseDotNet@2
116+
displayName: 'Install .NET Core 6.0'
117+
inputs:
118+
version: 6.0.x
119+
packageType: runtime
115120
- task: UseDotNet@2
116121
displayName: 'Install .NET Core'
117122
inputs:
@@ -148,11 +153,6 @@ jobs:
148153
vmimage: 'windows-2019'
149154
steps:
150155
- template: '.ci/install-mysql-windows.yml'
151-
- task: UseDotNet@2
152-
displayName: 'Install .NET Core 5.0'
153-
inputs:
154-
version: '5.0.x'
155-
packageType: runtime
156156
- task: UseDotNet@2
157157
displayName: 'Install .NET Core'
158158
inputs:
@@ -167,18 +167,18 @@ jobs:
167167
displayName: 'Remove target frameworks'
168168
inputs:
169169
targetType: 'inline'
170-
script: '((Get-Content .\tests\SideBySide\SideBySide.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>net472;net5.0</TargetFrameworks>'')) | Set-Content .\tests\SideBySide\SideBySide.csproj'
170+
script: '((Get-Content .\tests\SideBySide\SideBySide.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>net472;net7.0</TargetFrameworks>'')) | Set-Content .\tests\SideBySide\SideBySide.csproj'
171171
- task: DotNetCoreCLI@2
172172
displayName: 'Restore packages'
173173
inputs:
174174
command: 'restore'
175175
- task: DotNetCoreCLI@2
176-
displayName: 'Side by Side tests (net472/net5.0)'
176+
displayName: 'Side by Side tests (net472/net7.0)'
177177
inputs:
178178
command: 'test'
179179
projects: 'tests/SideBySide/SideBySide.csproj'
180180
arguments: '-c Release --no-restore'
181-
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net472/net5.0', 'No SSL') }}
181+
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net472/net7.0', 'No SSL') }}
182182
env:
183183
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,StreamingResults,Tls11,UnixDomainSocket'
184184
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True;UseCompression=True'
@@ -194,6 +194,11 @@ jobs:
194194
inputs:
195195
version: 3.1.x
196196
packageType: runtime
197+
- task: UseDotNet@2
198+
displayName: 'Install .NET Core 6.0'
199+
inputs:
200+
version: 6.0.x
201+
packageType: runtime
197202
- task: UseDotNet@2
198203
displayName: 'Install .NET Core'
199204
inputs:

‎docs/content/api/MySqlConnector/MySqlBatch/Cancel.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)