Skip to content

Commit 33233c0

Browse files
committed
Run Conformance tests on .NET 6.0.
1 parent f76ca36 commit 33233c0

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.ci/build-steps.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ steps:
3838
displayName: 'Publish Conformance.Tests'
3939
inputs:
4040
command: 'publish'
41-
arguments: '-c Release -f netcoreapp3.1 --no-build tests/Conformance.Tests/Conformance.Tests.csproj'
41+
arguments: '-c Release -f net6.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-3.1-$(Agent.OS)'
47-
targetPath: 'tests/Conformance.Tests/bin/Release/netcoreapp3.1/publish'
46+
artifactName: 'Conformance.Tests-6.0-$(Agent.OS)'
47+
targetPath: 'tests/Conformance.Tests/bin/Release/net6.0/publish'
4848

4949
- task: DotNetCoreCLI@2
5050
displayName: 'Publish SideBySide (2.1)'

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

.ci/integration-tests-steps.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ parameters:
66
steps:
77
- bash: ${{ format('.ci/docker-run.sh {0} 3300 {1}', parameters.image, parameters.unsupportedFeatures) }}
88
displayName: 'Start Docker container'
9-
- template: 'conformance-test-steps.yml'
10-
parameters:
11-
image: ${{ parameters.image }}
12-
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=conformance;ssl mode=none;DefaultCommandTimeout=3600'
139
- template: 'sidebyside-test-steps.yml'
1410
parameters:
1511
image: ${{ parameters.image }}
@@ -31,6 +27,10 @@ steps:
3127
displayName: 'Install .NET Core'
3228
inputs:
3329
version: $(DotNetCoreSdkVersion)
30+
- template: 'conformance-test-steps.yml'
31+
parameters:
32+
image: ${{ parameters.image }}
33+
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=conformance;ssl mode=none;DefaultCommandTimeout=3600'
3434
- template: 'sidebyside-test-steps.yml'
3535
parameters:
3636
image: ${{ parameters.image }}

tests/Conformance.Tests/Conformance.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0</TargetFrameworks>
55
<VersionPrefix>0.1.0</VersionPrefix>
66
<SignAssembly>true</SignAssembly>
77
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>

0 commit comments

Comments
 (0)