Skip to content

Commit 1cad465

Browse files
authored
Always build full platform manifest (dotnet/core-setup#7341)
Unless intentionally disabled or building from source, always create the full platform manifest that lists assets from all platforms. With the platform manifest included in runtime packs, it needs to be generated the same across all official build jobs. Producing it locally during a default build also reduces the diff from dev to official builds. Commit migrated from dotnet/core-setup@1bac3a5
1 parent f2b7dbe commit 1cad465

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

eng/jobs/windows-build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
parameters:
22
additionalMSBuildArguments: ''
3-
buildFullPlatformManifest: false
43
displayName: ''
54
publishRidAgnosticPackages: false
65
skipTests: $(SkipTests)
@@ -34,7 +33,6 @@ jobs:
3433
/p:TargetArchitecture=${{ parameters.targetArchitecture }}
3534
/p:PortableBuild=true
3635
/p:SkipTests=${{ parameters.skipTests }}
37-
/p:BuildFullPlatformManifest=${{ parameters.buildFullPlatformManifest }}
3836
MsbuildSigningArguments: >-
3937
/p:CertificateId=400
4038
/p:DotNetSignType=$(SignType)

eng/pipelines/installer/azure-pipelines.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,13 @@ stages:
139139
# Windows x64
140140
- template: /eng/jobs/windows-build.yml
141141
parameters:
142-
buildFullPlatformManifest: true
143142
name: Windows_x64
144143
publishRidAgnosticPackages: true
145144
targetArchitecture: x64
146145

147146
# Windows x86
148147
- template: /eng/jobs/windows-build.yml
149148
parameters:
150-
buildFullPlatformManifest: true
151149
name: Windows_x86
152150
targetArchitecture: x86
153151

src/installer/pkg/packaging-tools/framework.dependency.targets

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,18 @@
110110
<Target Name="GenerateFileVersionProps"
111111
Condition="'$(FrameworkPackageName)' != ''"
112112
DependsOnTargets="SetupGenerateFileVersionProps">
113+
<!--
114+
Building the full platform manifest gathers information from the packages of all known RIDs,
115+
which we can't do while building from source because the entire product needs to build on a
116+
single machine (single RID) without access to prebuilts.
117+
-->
118+
<PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
119+
<BuildFullPlatformManifest Condition="'$(BuildFullPlatformManifest)' == ''">false</BuildFullPlatformManifest>
120+
</PropertyGroup>
121+
113122
<PropertyGroup>
123+
<BuildFullPlatformManifest Condition="'$(BuildFullPlatformManifest)' == ''">true</BuildFullPlatformManifest>
124+
114125
<!-- During an official build when we can guarantee that all RID-specific dependencies have been built,
115126
restore all of those dependencies and gather the prospective content of the RID-specific Core.App
116127
packages. This is needed so that we have a complete platform manifest in the shipping version of

0 commit comments

Comments
 (0)