Skip to content

Commit b176fac

Browse files
committed
Run SideBySide tests with .NET 6.0.
1 parent dcc8bfe commit b176fac

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

.ci/build-steps.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,15 @@ steps:
8181
inputs:
8282
artifactName: 'SideBySide-net5.0-$(Agent.OS)'
8383
targetPath: 'tests/SideBySide/bin/Release/net5.0/publish'
84+
85+
- task: DotNetCoreCLI@2
86+
displayName: 'Publish SideBySide (6.0)'
87+
inputs:
88+
command: 'publish'
89+
arguments: '-c Release -f net6.0 --no-build tests/SideBySide/SideBySide.csproj'
90+
publishWebProjects: false
91+
zipAfterPublish: false
92+
- task: PublishPipelineArtifact@0
93+
inputs:
94+
artifactName: 'SideBySide-net6.0-$(Agent.OS)'
95+
targetPath: 'tests/SideBySide/bin/Release/net6.0/publish'

.ci/integration-tests-steps.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,26 @@ steps:
4343
image: ${{ parameters.image }}
4444
unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
4545
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'
46-
platform: 'netcoreapp3.1'
46+
platform: 'net5.0'
4747
description: 'SSL'
4848
- template: 'sidebyside-test-steps.yml'
4949
parameters:
5050
image: ${{ parameters.image }}
5151
unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
5252
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;UseCompression=True;DefaultCommandTimeout=3600'
53-
platform: 'netcoreapp3.1'
53+
platform: 'net5.0'
5454
description: 'Compression'
5555
- template: 'sidebyside-test-steps.yml'
5656
parameters:
5757
image: ${{ parameters.image }}
5858
unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
5959
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600'
60-
platform: 'net5.0'
60+
platform: 'net6.0'
6161
description: 'No SSL'
6262
- template: 'sidebyside-test-steps.yml'
6363
parameters:
6464
image: ${{ parameters.image }}
6565
unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
6666
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'
67-
platform: 'net5.0'
67+
platform: 'net6.0'
6868
description: 'SSL'

tests/SideBySide/SideBySide.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 Condition=" '$(Configuration)' != 'Baseline' ">
4-
<TargetFrameworks>net452;net461;net472;netcoreapp1.1.2;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
4+
<TargetFrameworks>net452;net461;net472;netcoreapp1.1.2;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup Condition=" '$(Configuration)' == 'Baseline' ">

0 commit comments

Comments
 (0)