Skip to content

Commit 99ceac5

Browse files
committed
Ensure $(AssetManifestFileName) values are unique
- set global properties to override what's hard-coded in Publish.proj
1 parent c066332 commit 99ceac5

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

.azure/pipelines/ci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ stages:
156156
-buildInstallers
157157
/bl:artifacts/log/installers.msbuild.binlog
158158
/p:DotNetSignType=$(_SignType)
159+
-p:AssetManifestFileName=aspnetcore-win-x64-x86.xml
159160
$(_BuildArgs)
160161
$(_PublishArgs)
161162
displayName: Build Installers
@@ -187,6 +188,7 @@ stages:
187188
/bl:artifacts/log/build.win-arm.binlog
188189
/p:DotNetSignType=$(_SignType)
189190
/p:OnlyPackPlatformSpecificPackages=true
191+
-p:AssetManifestFileName=aspnetcore-win-arm.xml
190192
$(_BuildArgs)
191193
$(_PublishArgs)
192194
installNodeJs: false
@@ -213,6 +215,7 @@ stages:
213215
--no-build-java
214216
-p:OnlyPackPlatformSpecificPackages=true
215217
-bl:artifacts/log/build.macos.binlog
218+
-p:AssetManifestFileName=aspnetcore-MacOS_x64.xml
216219
$(_BuildArgs)
217220
$(_PublishArgs)
218221
installNodeJs: false
@@ -273,6 +276,7 @@ stages:
273276
-p:BuildRuntimeArchive=false \
274277
-p:LinuxInstallerType=rpm \
275278
-bl:artifacts/log/build.rpm.binlog \
279+
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml
276280
$(_BuildArgs) \
277281
$(_PublishArgs)
278282
displayName: Build RPM installers
@@ -304,6 +308,7 @@ stages:
304308
--no-build-java
305309
-p:OnlyPackPlatformSpecificPackages=true
306310
-bl:artifacts/log/build.linux-arm.binlog
311+
-p:AssetManifestFileName=aspnetcore-Linux_arm.xml
307312
$(_BuildArgs)
308313
$(_PublishArgs)
309314
installNodeJs: false
@@ -334,6 +339,7 @@ stages:
334339
--no-build-java
335340
-p:OnlyPackPlatformSpecificPackages=true
336341
-bl:artifacts/log/build.arm64.binlog
342+
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
337343
$(_BuildArgs)
338344
$(_PublishArgs)
339345
installNodeJs: false
@@ -367,6 +373,7 @@ stages:
367373
--no-build-java
368374
-p:OnlyPackPlatformSpecificPackages=true
369375
-bl:artifacts/log/build.musl.binlog
376+
-p:AssetManifestFileName=aspnetcore-Linux_musl_x64.xml
370377
$(_BuildArgs)
371378
$(_PublishArgs)
372379
installNodeJs: false
@@ -400,6 +407,7 @@ stages:
400407
--no-build-java
401408
-p:OnlyPackPlatformSpecificPackages=true
402409
-bl:artifacts/log/build.musl.binlog
410+
-p:AssetManifestFileName=aspnetcore-Linux_musl_arm64.xml
403411
$(_BuildArgs)
404412
$(_PublishArgs)
405413
installNodeJs: false

.azure/pipelines/jobs/codesign-xplat.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
inputs:
2727
solution: eng\tools\XplatPackageSigner\XplatPackageSigner.proj
2828
msbuildArguments: /p:SignType=$(_SignType)
29+
-p:AssetManifestFileName=aspnetcore-${{ parameters.inputName }}-signed.xml
2930
$(_PublishArgs)
3031
/p:DirectoryToSign=$(Build.StagingDirectory)\deps\${{ parameters.inputName }}_Packages\
3132
artifacts:

0 commit comments

Comments
 (0)