Skip to content

Commit e537236

Browse files
committed
User Story 33636: Add Linux build support
- Updated CI test step to use new runtime-specific build.proj targets.
1 parent e5eb0ac commit e537236

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

BUILDGUIDE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ Once the environment is setup properly, execute the desired set of commands belo
3131
|`BuildTools`|net9.0|Builds the tool projects used by other targets.|
3232
|`Clean`|Cleans generated files.|
3333
|`Restore`|Restores Nuget packages required for `BuildAll`.|
34-
|`RunTests`|Runs the functional and manual tests for the .NET Framework and .NET drivers|
35-
|`RunFunctionalTests`|Runs just the functional tests for the .NET Framework and .NET drivers|
36-
|`RunManualTests`|Runs just the manual tests for the .NET Framework and .NET drivers|
34+
|`RunTests`|Runs the functional and manual tests for the runtimes supported on the host OS|
35+
|`RunFunctionalTests`|Runs just the functional tests for the runtimes supported on the host OS|
36+
|`RunManualTests`|Runs just the manual tests for the runtimes supported on the host OS|
3737

3838
### Parameters
3939

eng/pipelines/common/templates/steps/run-all-tests-step.yml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,16 @@ steps:
6060
msbuildArchitecture: ${{parameters.msbuildArchitecture }}
6161
platform: '${{parameters.platform }}'
6262
configuration: '${{parameters.configuration }}'
63-
${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
64-
msbuildArguments: '-t:RunFunctionalTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }}'
63+
${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
64+
${{ if contains(targetFramework, 'net4') }}:
65+
msbuildArguments: '-t:RunFunctionalTestsWindowsNetFx -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }}'
66+
${{ else }}:
67+
msbuildArguments: '-t:RunFunctionalTestsWindows -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }}'
6568
${{ else }}: # x86
66-
msbuildArguments: '-t:RunFunctionalTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:DotnetPath=${{parameters.dotnetx86RootPath }}'
69+
${{ if contains(targetFramework, 'net4') }}:
70+
msbuildArguments: '-t:RunFunctionalTestsWindowsNetFx -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:DotnetPath=${{parameters.dotnetx86RootPath }}'
71+
${{ else }}:
72+
msbuildArguments: '-t:RunFunctionalTestsWindows -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:DotnetPath=${{parameters.dotnetx86RootPath }}'
6773
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
6874
retryCountOnTaskFailure: 1
6975

@@ -75,9 +81,15 @@ steps:
7581
platform: '${{parameters.platform }}'
7682
configuration: '${{parameters.configuration }}'
7783
${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
78-
msbuildArguments: '-t:RunManualTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }}'
84+
${{ if contains(targetFramework, 'net4') }}:
85+
msbuildArguments: '-t:RunManualTestsWindowsNetFx -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }}'
86+
${{ else }}:
87+
msbuildArguments: '-t:RunManualTestsWindows -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }}'
7988
${{ else }}: # x86
80-
msbuildArguments: '-t:RunManualTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:DotnetPath=${{parameters.dotnetx86RootPath }}'
89+
${{ if contains(targetFramework, 'net4') }}:
90+
msbuildArguments: '-t:RunManualTestsWindowsNetFx -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:DotnetPath=${{parameters.dotnetx86RootPath }}'
91+
${{ else }}:
92+
msbuildArguments: '-t:RunManualTestsWindows -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:DotnetPath=${{parameters.dotnetx86RootPath }}'
8193
condition: eq(variables['Agent.OS'], 'Windows_NT')
8294
retryCountOnTaskFailure: 2
8395

@@ -88,7 +100,7 @@ steps:
88100
command: custom
89101
projects: build.proj
90102
custom: msbuild
91-
arguments: '-t:RunFunctionalTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:platform=${{parameters.platform }} -p:Configuration=${{parameters.configuration }}'
103+
arguments: '-t:RunFunctionalTestsUnix -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:platform=${{parameters.platform }} -p:Configuration=${{parameters.configuration }}'
92104
verbosityRestore: Detailed
93105
verbosityPack: Detailed
94106
retryCountOnTaskFailure: 1
@@ -100,7 +112,7 @@ steps:
100112
command: custom
101113
projects: build.proj
102114
custom: msbuild
103-
arguments: '-t:RunManualTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:platform=${{parameters.platform }} -p:Configuration=${{parameters.configuration }}'
115+
arguments: '-t:RunManualTestsUnix -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:platform=${{parameters.platform }} -p:Configuration=${{parameters.configuration }}'
104116
verbosityRestore: Detailed
105117
verbosityPack: Detailed
106118
retryCountOnTaskFailure: 2

0 commit comments

Comments
 (0)