Skip to content

Commit ca7cf2e

Browse files
committed
Add a win-x86 join job to run the cross-os DAC signing.
1 parent d0bd3e4 commit ca7cf2e

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -830,6 +830,24 @@ stages:
830830
- Windows_x86
831831
- Windows_arm64
832832

833+
- template: ../jobs/vmr-build.yml
834+
parameters:
835+
buildName: Windows
836+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
837+
vmrBranch: ${{ variables.VmrBranch }}
838+
pool: ${{ parameters.pool_Windows }}
839+
targetOS: windows
840+
targetArchitecture: x86
841+
runTests: false
842+
buildPass: 2
843+
reuseBuildArtifactsFrom:
844+
- AzureLinux_x64_Cross_x64
845+
- AzureLinux_x64_Cross_Alpine_x64
846+
- AzureLinux_x64_Cross_arm64
847+
- AzureLinux_x64_Cross_Alpine_arm64
848+
- AzureLinux_x64_Cross_arm
849+
- AzureLinux_x64_Cross_Alpine_arm
850+
833851
### FINAL JOIN ###
834852
- ${{ if and(parameters.isBuiltFromVmr, not(parameters.isSourceOnlyBuild), ne(variables['Build.Reason'], 'PullRequest')) }}:
835853
- stage: VMR_Final_Join
@@ -868,7 +886,7 @@ stages:
868886
dotNetBuildPass: final
869887
primaryDependentJob: Windows_x64
870888
outputFolder: $(Build.ArtifactStagingDirectory)/artifacts
871-
889+
872890
### VALIDATION ###
873891
- ${{ if and(parameters.isBuiltFromVmr, not(parameters.isSourceOnlyBuild), eq(variables['System.TeamProject'], 'internal')) }}:
874892
- stage: VMR_Validation

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,14 @@
1515
<RepositoryReference Include="scenario-tests" />
1616
</ItemGroup>
1717

18-
<ItemGroup Condition="'$(DotNetBuildPass)' == '2'">
18+
<ItemGroup Condition="'$(DotNetBuildPass)' == '2' and '$(TargetOS)' == 'windows' and '$(TargetArchitecture)' == 'x64'">
1919
<RepositoryReference Remove="@(RepositoryReference)" />
2020
<RepositoryReference Include="sdk" DotNetBuildPass="2" />
2121
</ItemGroup>
2222

23+
<ItemGroup Condition="'$(DotNetBuildPass)' == '2' and '$(TargetOS)' == 'windows' and '$(TargetArchitecture)' == 'x86'">
24+
<RepositoryReference Remove="@(RepositoryReference)" />
25+
<RepositoryReference Include="runtime" DotNetBuildPass="2" />
26+
</ItemGroup>
27+
2328
</Project>

0 commit comments

Comments
 (0)