Skip to content

Commit 96aa638

Browse files
authored
Add workloads build (#47225)
This builds the emsdk and runtime workload manifests here instead of the original repos. It also adds the VS insertion .zip creation which is only built in the official build by default. Closes dotnet/source-build#3904
1 parent e20d672 commit 96aa638

File tree

130 files changed

+4870
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+4870
-96
lines changed

.vsts-ci.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@ extends:
113113
- powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force
114114
displayName: Create artifacts/bin directory
115115
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
116-
timeoutInMinutes: 90
116+
timeoutInMinutes: 180
117117
windowsJobParameterSets:
118118
### OFFICIAL ###
119119
- categoryName: Official
120120
publishArgument: $(_publishArgument)
121121
signArgument: $(_signArgument)
122-
officialBuildProperties: $(_officialBuildProperties)
122+
officialBuildProperties: $(_officialBuildProperties) /p:BuildWorkloads=true
123123
enableDefaultArtifacts: true
124124
runTests: false
125125
publishRetryConfig: true
@@ -133,6 +133,8 @@ extends:
133133
runTests: false
134134
variables:
135135
_SignType: real
136+
dependsOn: Official_windows_x64
137+
downloadManifestMsiPackages: true
136138
- categoryName: Official
137139
targetArchitecture: arm64
138140
publishArgument: $(_publishArgument)
@@ -141,6 +143,8 @@ extends:
141143
runTests: false
142144
variables:
143145
_SignType: real
146+
dependsOn: Official_windows_x64
147+
downloadManifestMsiPackages: true
144148
### PGO ###
145149
- categoryName: PGO
146150
pgoInstrument: true

Directory.Packages.props

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<ItemGroup>
99
<PackageVersion Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
1010
<PackageVersion Include="AwesomeAssertions.Json" Version="$(AwesomeAssertionsJsonVersion)" />
11+
<PackageVersion Include="MicroBuild.Plugins.SwixBuild.Dotnet" Version="1.1.87-gba258badda" />
1112
<PackageVersion Include="Microsoft.ApplicationInsights" Version="$(MicrosoftApplicationInsightsPackageVersion)" />
1213
<PackageVersion Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)" />
1314
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="$(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion)" />
@@ -33,6 +34,8 @@
3334
<PackageVersion Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
3435
<PackageVersion Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" />
3536
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersPackageVersion)" />
37+
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)" />
38+
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Workloads" Version="$(MicrosoftDotNetBuildTasksWorkloadsPackageVersion)" />
3639
<PackageVersion Include="Microsoft.DotNet.DarcLib" Version="$(MicrosoftDotNetDarcLibVersion)" />
3740
<PackageVersion Include="Microsoft.DotNet.Installer.Windows.Security.TestData" Version="$(MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion)" />
3841
<PackageVersion Include="Microsoft.DotNet.SignCheck" Version="$(ArcadeSdkVersion)" />

eng/Build.props

+13-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,26 @@
44
they depend on assets from other verticals that are built in the first build pass. -->
55
<ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
66
'$(OS)' == 'Windows_NT' and
7-
'$(TargetArchitecture)' == 'x64'">
7+
'$(TargetArchitecture)' == 'x64' and
8+
'$(BuildWorkloads)' != 'true'">
89
<ProjectToBuild Include="$(RepoRoot)src\Layout\VS.Redist.Common.Net.Core.SDK.MSBuildExtensions\VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.proj" DotNetBuildPass="2" />
910
<ProjectToBuild Include="$(RepoRoot)src\Layout\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.proj" DotNetBuildPass="2" />
1011
</ItemGroup>
1112

12-
<!-- For product build, build the sdk bundle in the second build pass on windows as
13+
<!-- For product build, build the Workloads in the second build pass on windows as
1314
it depends on assets from other verticals that are built in the first build pass. -->
1415
<ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
16+
'$(OS)' == 'Windows_NT' and
17+
'$(TargetArchitecture)' == 'x64' and
18+
'$(BuildWorkloads)' == 'true'">
19+
<ProjectToBuild Include="$(RepoRoot)src\Workloads\VSInsertion\workloads.csproj" DotNetBuildPass="2" />
20+
</ItemGroup>
21+
22+
<!-- For product build, build the sdk bundle in the third build pass on windows as
23+
it depends on assets from other verticals that are built in the second build pass. -->
24+
<ItemGroup Condition="'$(DotNetBuildPass)' == '3' and
1525
'$(OS)' == 'Windows_NT'">
16-
<ProjectToBuild Include="$(RepoRoot)src\Layout\redist\redist.csproj" DotNetBuildPass="2" />
26+
<ProjectToBuild Include="$(RepoRoot)src\Layout\redist\redist.csproj" DotNetBuildPass="3" />
1727
</ItemGroup>
1828

1929
</Project>

eng/Signing.props

+19-3
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,25 @@
3434
<FileSignInfo Include="comhost.dll" CertificateName="None" />
3535
<FileSignInfo Include="singlefilehost.exe" CertificateName="None" />
3636

37-
<!-- .ttf and .js files come in from some older aspnetcore packages (e.g. 2.1).
37+
<!-- .ttf and .otf files come in from some older aspnetcore packages (e.g. 2.1).
3838
These files in the 5.0 packages are NOT signed. When doing postbuild signing,
3939
SignTool will recognize that the files in the installer zips came from the 5.0 packages
4040
pulled in from aspnetcore, and aspnetcore said not to sign them. This info is not
4141
available for the 2.1 packages, so we need to avoid signing these in this repo. -->
4242
<FileExtensionSignInfo Include=".ttf" CertificateName="None" />
4343
<FileExtensionSignInfo Include=".otf" CertificateName="None" />
44-
<FileExtensionSignInfo Remove=".js" />
45-
<FileExtensionSignInfo Include=".js" CertificateName="None" />
44+
45+
<!-- We don't need to code sign .js files because they are not used in Windows Script Host. -->
46+
<FileExtensionSignInfo Update=".js" CertificateName="None" />
47+
48+
<!-- Skip signing .py files because they are already signed -->
49+
<FileExtensionSignInfo Update=".py" CertificateName="None" />
50+
<FileExtensionSignInfo Include=".pyd" CertificateName="None" />
51+
<FileExtensionSignInfo Include=".cat" CertificateName="None" />
52+
53+
<!-- Zero length files should not be signed because it breaks signing/ESRP. -->
54+
<FileSignInfo Include="__init__.py" CertificateName="None" />
55+
<FileSignInfo Include="eggs.py" CertificateName="None" />
4656
</ItemGroup>
4757

4858
<!--
@@ -77,6 +87,12 @@
7787
Kind="Package" />
7888
</ItemGroup>
7989

90+
<ItemGroup Condition="'$(DotNetBuild)' != 'true' or '$(BuildWorkloads)' == 'true'">
91+
<Artifact Include="$(VisualStudioSetupInsertionPath)\**\*.zip"
92+
IsShipping="true"
93+
Kind="Blob" />
94+
</ItemGroup>
95+
8096
<!-- Only publish this file from win-x64 so that we don't end up with duplicates. -->
8197
<ItemGroup Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(TargetArchitecture)' == 'x64' and '$(PgoInstrument)' != 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">
8298
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)productVersion.txt" />

eng/Version.Details.xml

+10-2
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@
9191
<Uri>https://github.com/dotnet/core-setup</Uri>
9292
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-preview.4.25176.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
94+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.Sdk.Internal" Version="10.0.0-preview.4.25176.1">
9595
<Uri>https://github.com/dotnet/emsdk</Uri>
9696
<Sha>e7ebd8aa0424ba4dc6ac03419954c3287d891faa</Sha>
9797
</Dependency>
9898
<!-- Intermediate is necessary for source build. -->
99-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="10.0.0-preview.4.25176.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
99+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="10.0.0-preview.4.25176.1">
100100
<Uri>https://github.com/dotnet/emsdk</Uri>
101101
<Sha>e7ebd8aa0424ba4dc6ac03419954c3287d891faa</Sha>
102102
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
@@ -648,6 +648,14 @@
648648
<Uri>https://github.com/dotnet/arcade</Uri>
649649
<Sha>6bcab7722ffc02d9a9f64e736d06bb4e4a04a94b</Sha>
650650
</Dependency>
651+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25207.4">
652+
<Uri>https://github.com/dotnet/arcade</Uri>
653+
<Sha>6bcab7722ffc02d9a9f64e736d06bb4e4a04a94b</Sha>
654+
</Dependency>
655+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25207.4">
656+
<Uri>https://github.com/dotnet/arcade</Uri>
657+
<Sha>6bcab7722ffc02d9a9f64e736d06bb4e4a04a94b</Sha>
658+
</Dependency>
651659
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25207.4">
652660
<Uri>https://github.com/dotnet/arcade</Uri>
653661
<Sha>6bcab7722ffc02d9a9f64e736d06bb4e4a04a94b</Sha>

eng/Versions.props

+13-9
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
It should always be the hundreds-value of the current SDK version, never any
1212
preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
1313
<SdkFeatureBand>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)00</SdkFeatureBand>
14+
<BuiltinWorkloadFeatureBand>$(VersionMajor).$(VersionMinor).100</BuiltinWorkloadFeatureBand>
1415
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
1516
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
1617
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
@@ -255,6 +256,16 @@
255256
<MicrosoftCodeAnalysisRazorToolingInternalVersion>10.0.0-preview.25207.2</MicrosoftCodeAnalysisRazorToolingInternalVersion>
256257
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>10.0.0-preview.25207.2</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
257258
</PropertyGroup>
259+
<PropertyGroup>
260+
<!-- Dependencies from https://github.com/dotnet/emsdk -->
261+
<MicrosoftNETRuntimeEmscriptenSdkInternalVersion>10.0.0-preview.4.25176.1</MicrosoftNETRuntimeEmscriptenSdkInternalVersion>
262+
<!-- emscripten versions, these are are included in package IDs and need to be kept in sync with emsdk -->
263+
<EmscriptenVersionCurrent>3.1.56</EmscriptenVersionCurrent>
264+
<EmscriptenVersionNet9>3.1.56</EmscriptenVersionNet9>
265+
<EmscriptenVersionNet8>3.1.34</EmscriptenVersionNet8>
266+
<EmscriptenVersionNet7>3.1.12</EmscriptenVersionNet7>
267+
<EmscriptenVersionNet6>2.0.23</EmscriptenVersionNet6>
268+
</PropertyGroup>
258269
<PropertyGroup>
259270
<!-- Dependencies from https://github.com/dotnet/wpf -->
260271
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.4.25207.5</MicrosoftNETSdkWindowsDesktopPackageVersion>
@@ -272,6 +283,8 @@
272283
<PropertyGroup>
273284
<!-- Dependencies from https://github.com/dotnet/arcade -->
274285
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25207.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
286+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25207.4</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
287+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25207.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
275288
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25207.4</MicrosoftDotNetSignToolVersion>
276289
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25207.4</MicrosoftDotNetXliffTasksVersion>
277290
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25207.4</MicrosoftDotNetXUnitExtensionsVersion>
@@ -308,15 +321,6 @@
308321
<XamarinMacCatalystWorkloadManifestVersion>18.2.10322-net10-p1</XamarinMacCatalystWorkloadManifestVersion>
309322
<XamarinMacOSWorkloadManifestVersion>15.2.10322-net10-p1</XamarinMacOSWorkloadManifestVersion>
310323
<XamarinTvOSWorkloadManifestVersion>18.2.10322-net10-p1</XamarinTvOSWorkloadManifestVersion>
311-
<!-- Workloads from dotnet/emsdk -->
312-
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>10.0.0-preview.4.25176.1</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>
313-
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
314-
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
315-
<EmscriptenWorkloadFeatureBand>10.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
316-
<!-- Workloads from dotnet/runtime use MicrosoftNETCoreAppRefPackageVersion because it has a stable name that does not include the full feature band -->
317-
<MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
318-
<!-- mono workload prerelease version band must match the runtime feature band -->
319-
<MonoWorkloadFeatureBand>10.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
320324
</PropertyGroup>
321325
<PropertyGroup Label="Pinned dependency">
322326
<!-- This package is not being produced outside of the 2.0 branch of corefx and should not change. -->

eng/pipelines/templates/jobs/sdk-build.yml

+12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
parameters:
22
### GENERAL ###
33
variables: {}
4+
dependsOn: ''
45
oneESCompat:
56
templateFolderName: templates
67
publishTaskPrefix: ''
@@ -27,6 +28,7 @@ parameters:
2728
osProperties: ''
2829
runtimeSourceProperties: ''
2930
officialBuildProperties: ''
31+
downloadManifestMsiPackages: false
3032
### ARCADE ###
3133
preSteps: []
3234

@@ -51,6 +53,7 @@ jobs:
5153
enableSbom: ${{ parameters.enableSbom }}
5254
variables:
5355
- ${{ insert }}: ${{ parameters.variables }}
56+
dependsOn: ${{ parameters.dependsOn }}
5457
preSteps: ${{ parameters.preSteps }}
5558
templateContext:
5659
sdl:
@@ -74,6 +77,15 @@ jobs:
7477
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
7578
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
7679

80+
- ${{ if eq(parameters.downloadManifestMsiPackages, true) }}:
81+
- task: DownloadBuildArtifacts@1
82+
inputs:
83+
artifactName: PackageArtifacts
84+
downloadPath: $(Build.SourcesDirectory)/artifacts/downloaded-manifest-msi-packages
85+
itemPattern: '**/*Manifest-*.Msi.*.nupkg'
86+
checkDownloadedFiles: true
87+
displayName: Download Manifest msi packages
88+
7789
############### BUILDING ###############
7890
- ${{ if eq(parameters.pool.os, 'windows') }}:
7991
- powershell: eng/common/build.ps1

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

+80-10
Original file line numberDiff line numberDiff line change
@@ -872,44 +872,113 @@ stages:
872872
targetArchitecture: arm64
873873
extraProperties: /p:PgoInstrument=true
874874

875-
# Build Pass 2 verticals
875+
## Build Pass 2 verticals
876876

877+
# build the cross-OS DACs
877878
- template: ../jobs/vmr-build.yml
878879
parameters:
879880
buildName: Windows
880881
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
881882
vmrBranch: ${{ variables.VmrBranch }}
882883
sign: ${{ variables.signEnabled }}
884+
signDac: ${{ variables.signDacEnabled }}
885+
pool: ${{ parameters.pool_Windows }}
886+
targetOS: windows
887+
targetArchitecture: x86
888+
buildPass: 2
889+
reuseBuildArtifactsFrom:
890+
- Windows_x64
891+
- Windows_x86
892+
- Windows_arm64
893+
- AzureLinux_x64_Cross_x64
894+
- AzureLinux_x64_Cross_Alpine_x64
895+
- AzureLinux_x64_Cross_arm64
896+
- AzureLinux_x64_Cross_Alpine_arm64
897+
- AzureLinux_x64_Cross_arm
898+
- AzureLinux_x64_Cross_Alpine_arm
899+
900+
# build the ASP.NET Core hosting bundle and VS components
901+
- template: ../jobs/vmr-build.yml
902+
parameters:
903+
buildName: Windows
904+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
905+
vmrBranch: ${{ variables.VmrBranch }}
906+
sign: ${{ variables.signEnabled }}
907+
pool: ${{ parameters.pool_Windows }}
908+
targetOS: windows
909+
targetArchitecture: x64
910+
buildPass: 2
911+
reuseBuildArtifactsFrom:
912+
- Windows_x64
913+
- Windows_x86
914+
- Windows_arm64
915+
916+
# build the workloads
917+
- template: ../jobs/vmr-build.yml
918+
parameters:
919+
buildName: Windows_Workloads
920+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
921+
vmrBranch: ${{ variables.VmrBranch }}
922+
sign: ${{ variables.signEnabled }}
883923
pool: ${{ parameters.pool_Windows }}
884924
targetOS: windows
885925
targetArchitecture: x64
886926
buildPass: 2
927+
extraProperties: /p:BuildWorkloads=true
887928
reuseBuildArtifactsFrom:
888929
- Windows_x64
889930
- Windows_x86
890931
- Windows_arm64
932+
- Browser_Shortstack_wasm
933+
- Browser_Multithreaded_Shortstack_wasm
934+
- Wasi_Shortstack_wasm
935+
- Android_Shortstack_arm64
936+
- Android_Shortstack_arm
937+
- Android_Shortstack_x64
938+
- Android_Shortstack_x86
939+
- iOS_Shortstack_arm64
940+
- iOSSimulator_Shortstack_arm64
941+
- iOSSimulator_Shortstack_x64
942+
- tvOS_Shortstack_arm64
943+
- tvOSSimulator_Shortstack_arm64
944+
- tvOSSimulator_Shortstack_x64
945+
- MacCatalyst_Shortstack_arm64
946+
- MacCatalyst_Shortstack_x64
947+
948+
## Build Pass 3 verticals
949+
950+
# build the Windows SDK bundles
951+
- template: ../jobs/vmr-build.yml
952+
parameters:
953+
buildName: Windows
954+
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
955+
vmrBranch: ${{ variables.VmrBranch }}
956+
sign: ${{ variables.signEnabled }}
957+
pool: ${{ parameters.pool_Windows }}
958+
targetOS: windows
959+
targetArchitecture: x64
960+
buildPass: 3
961+
reuseBuildArtifactsFrom:
962+
- Windows_Workloads_x64_BuildPass2
963+
- Windows_x64
964+
- Windows_x86
965+
- Windows_arm64
891966

892967
- template: ../jobs/vmr-build.yml
893968
parameters:
894969
buildName: Windows
895970
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
896971
vmrBranch: ${{ variables.VmrBranch }}
897972
sign: ${{ variables.signEnabled }}
898-
signDac: ${{ variables.signDacEnabled }}
899973
pool: ${{ parameters.pool_Windows }}
900974
targetOS: windows
901975
targetArchitecture: x86
902-
buildPass: 2
976+
buildPass: 3
903977
reuseBuildArtifactsFrom:
978+
- Windows_Workloads_x64_BuildPass2
904979
- Windows_x64
905980
- Windows_x86
906981
- Windows_arm64
907-
- AzureLinux_x64_Cross_x64
908-
- AzureLinux_x64_Cross_Alpine_x64
909-
- AzureLinux_x64_Cross_arm64
910-
- AzureLinux_x64_Cross_Alpine_arm64
911-
- AzureLinux_x64_Cross_arm
912-
- AzureLinux_x64_Cross_Alpine_arm
913982

914983
- template: ../jobs/vmr-build.yml
915984
parameters:
@@ -920,8 +989,9 @@ stages:
920989
pool: ${{ parameters.pool_Windows }}
921990
targetOS: windows
922991
targetArchitecture: arm64
923-
buildPass: 2
992+
buildPass: 3
924993
reuseBuildArtifactsFrom:
994+
- Windows_Workloads_x64_BuildPass2
925995
- Windows_x64
926996
- Windows_x86
927997
- Windows_arm64

0 commit comments

Comments
 (0)