Skip to content

Commit 88f23c0

Browse files
Build tests on Linux and Windows (#47106)
1 parent 83ead88 commit 88f23c0

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

eng/pipelines/templates/stages/vmr-build.yml

+12-10
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ stages:
364364

365365
- template: ../jobs/vmr-build.yml
366366
parameters:
367-
buildName: ${{ format('{0}_Ubuntu', variables.ubuntuName) }}
367+
buildName: ${{ format('{0}_Ubuntu_BuildTests', variables.ubuntuName) }}
368368
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
369369
vmrBranch: ${{ variables.VmrBranch }}
370370
pool: ${{ parameters.pool_Linux }}
@@ -373,17 +373,19 @@ stages:
373373
image: ${{ variables.ubuntuContainerImage }}
374374
targetOS: linux
375375
targetArchitecture: x64
376-
377-
- template: ../jobs/vmr-build.yml
378-
parameters:
379-
buildName: Windows_BuildTests
380-
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
381-
vmrBranch: ${{ variables.VmrBranch }}
382-
pool: ${{ parameters.pool_Windows }}
383-
targetOS: windows
384-
targetArchitecture: x64
385376
extraProperties: /p:DotNetBuildTests=true
386377

378+
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
379+
- template: ../jobs/vmr-build.yml
380+
parameters:
381+
buildName: Windows_BuildTests
382+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
383+
vmrBranch: ${{ variables.VmrBranch }}
384+
pool: ${{ parameters.pool_Windows }}
385+
targetOS: windows
386+
targetArchitecture: x64
387+
extraProperties: /p:DotNetBuildTests=true
388+
387389
#### VERTICAL BUILD (Official) ####
388390
- ${{ if not(parameters.isSourceOnlyBuild) }}:
389391
- stage: VMR_Vertical_Build

src/SourceBuild/content/repo-projects/sdk.proj

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<PropertyGroup>
44
<LogVerbosityOptOut>true</LogVerbosityOptOut>
55

6+
<!-- Tests are only building on Windows - https://github.com/dotnet/source-build/issues/4882 -->
7+
<DotNetBuildTestsOptOut Condition="'$(OS)' != 'Windows_NT'">true</DotNetBuildTestsOptOut>
8+
69
<BuildArgs Condition="'$(TargetOS)' == 'windows'">$(BuildArgs) -nativeToolsOnMachine</BuildArgs>
710
<BuildArgs>$(BuildArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk</BuildArgs>
811
<BuildArgs>$(BuildArgs) /p:PortableRid=$(PortableRid)</BuildArgs>

0 commit comments

Comments
 (0)