Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit294c406

Browse files
committed
Disable UnitTest targets and skip unit test stages when using package reference type.
1 parent4226beb commit294c406

File tree

2 files changed

+29
-27
lines changed

2 files changed

+29
-27
lines changed

‎build.proj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,10 @@
206206
<TargetName="RunTests"DependsOnTargets="RunUnitTests;RunFunctionalTests;RunManualTests"/>
207207

208208
<!-- Run all unit tests applicable to the host OS.-->
209-
<TargetName="RunUnitTests"DependsOnTargets="RunUnitTestsWindows;RunUnitTestsUnix"/>
209+
<TargetName="RunUnitTests"DependsOnTargets="RunUnitTestsWindows;RunUnitTestsUnix"Condition="$(ReferenceType.Contains('Project'))"/>
210210

211211
<!-- Run all unit tests applicable to Windows.-->
212-
<TargetName="RunUnitTestsWindows"Condition="'$(IsEnabledWindows)' == 'true'">
212+
<TargetName="RunUnitTestsWindows"Condition="'$(IsEnabledWindows)' == 'true' AND $(ReferenceType.Contains('Project'))">
213213
<PropertyGroup>
214214
<TestCommand>
215215
$(DotnetPath)dotnet test "@(UnitTestsProj)"
@@ -229,7 +229,7 @@
229229
</Target>
230230

231231
<!-- Run all unit tests applicable to Unix.-->
232-
<TargetName="RunUnitTestsUnix"Condition="'$(IsEnabledWindows)' != 'true'">
232+
<TargetName="RunUnitTestsUnix"Condition="'$(IsEnabledWindows)' != 'true' AND $(ReferenceType.Contains('Project'))">
233233
<PropertyGroup>
234234
<TestCommand>
235235
$(DotnetPath)dotnet test "@(UnitTestsProj)"

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

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,20 @@ steps:
5353
condition:succeededOrFailed()
5454

5555
-${{if eq(parameters.operatingSystem, 'Windows')}}:
56-
-task:MSBuild@1
57-
displayName:'Run Unit Tests ${{parameters.msbuildArchitecture }}'
58-
inputs:
59-
solution:build.proj
60-
msbuildArchitecture:${{parameters.msbuildArchitecture }}
61-
platform:'${{parameters.platform }}'
62-
configuration:'${{parameters.configuration }}'
63-
${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
64-
msbuildArguments:'-t:RunUnitTests -p:TF=${{parameters.targetFramework }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }}'
65-
${{ else }}:# x86
66-
msbuildArguments:'-t:RunUnitTests -p:TF=${{parameters.targetFramework }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:DotnetPath=${{parameters.dotnetx86RootPath }}'
67-
condition:and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
68-
retryCountOnTaskFailure:1
56+
-${{if eq(parameters.referenceType, 'Project')}}:
57+
-task:MSBuild@1
58+
displayName:'Run Unit Tests ${{parameters.msbuildArchitecture }}'
59+
inputs:
60+
solution:build.proj
61+
msbuildArchitecture:${{parameters.msbuildArchitecture }}
62+
platform:'${{parameters.platform }}'
63+
configuration:'${{parameters.configuration }}'
64+
${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
65+
msbuildArguments:'-t:RunUnitTests -p:TF=${{parameters.targetFramework }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }}'
66+
${{ else }}:# x86
67+
msbuildArguments:'-t:RunUnitTests -p:TF=${{parameters.targetFramework }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:DotnetPath=${{parameters.dotnetx86RootPath }}'
68+
condition:and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
69+
retryCountOnTaskFailure:1
6970

7071
-task:MSBuild@1
7172
displayName:'Run Functional Tests ${{parameters.msbuildArchitecture }}'
@@ -96,17 +97,18 @@ steps:
9697
retryCountOnTaskFailure:2
9798

9899
-${{ else }}:# Linux or macOS
99-
-task:DotNetCoreCLI@2
100-
displayName:'Run Unit Tests'
101-
inputs:
102-
command:custom
103-
projects:build.proj
104-
custom:msbuild
105-
arguments:'-t:RunUnitTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:platform=${{parameters.platform }} -p:Configuration=${{parameters.configuration }}'
106-
verbosityRestore:Detailed
107-
verbosityPack:Detailed
108-
retryCountOnTaskFailure:1
109-
condition:and(succeeded(), ne(variables['Agent.OS'], 'Windows_NT'))
100+
-${{if eq(parameters.referenceType, 'Project')}}:
101+
-task:DotNetCoreCLI@2
102+
displayName:'Run Unit Tests'
103+
inputs:
104+
command:custom
105+
projects:build.proj
106+
custom:msbuild
107+
arguments:'-t:RunUnitTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:platform=${{parameters.platform }} -p:Configuration=${{parameters.configuration }}'
108+
verbosityRestore:Detailed
109+
verbosityPack:Detailed
110+
retryCountOnTaskFailure:1
111+
condition:and(succeeded(), ne(variables['Agent.OS'], 'Windows_NT'))
110112

111113
-task:DotNetCoreCLI@2
112114
displayName:'Run Functional Tests'

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp