Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 2 additions & 19 deletions .azure/pipelines/ci-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ variables:
value: /bl:artifacts/log/Release/Build.CodeSign.binlog
- name: WindowsInstallersLogArgs
value: /bl:artifacts/log/Release/Build.Installers.binlog
- name: WindowsArm64InstallersLogArgs
value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
- name: _SignType
value: ''
- name: _InternalRuntimeDownloadArgs
Expand Down Expand Up @@ -205,29 +203,14 @@ stages:
-sign
-buildInstallers
-noBuildNative
/p:DotNetSignType=$(_SignType)
$(_BuildArgs)
$(_InternalRuntimeDownloadArgs)
$(WindowsInstallersLogArgs)
displayName: Build Installers

# Windows installers bundle and sharedfx msi for arm64
- script: ./eng/build.cmd
-ci
-prepareMachine
-noBuildRepoTasks
-arch arm64
-sign
-buildInstallers
-noBuildNative
-publish
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should -publish stay? It was only on included in the ARM64 step before

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it has to go in the final build step of the job

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto /p:AssetManifestFileName and $(_PublishArgs)

/p:DotNetSignType=$(_SignType)
/p:AssetManifestFileName=aspnetcore-win.xml
$(_BuildArgs)
$(_PublishArgs)
$(_InternalRuntimeDownloadArgs)
$(WindowsArm64InstallersLogArgs)
displayName: Build ARM64 Installers
$(WindowsInstallersLogArgs)
displayName: Build Installers

artifacts:
- name: Windows_Logs_Attempt_$(System.JobAttempt)
Expand Down
23 changes: 2 additions & 21 deletions .azure/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ variables:
value: /bl:artifacts/log/Release/Build.CodeSign.binlog
- name: WindowsInstallersLogArgs
value: /bl:artifacts/log/Release/Build.Installers.binlog
- name: WindowsArm64InstallersLogArgs
value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
- name: _InternalRuntimeDownloadArgs
value: -RuntimeSourceFeed https://ci.dot.net/internal
-RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
Expand Down Expand Up @@ -255,33 +253,16 @@ extends:
-sign
-buildInstallers
-noBuildNative
/p:DotNetSignType=$(_SignType)
$(_BuildArgs)
$(_InternalRuntimeDownloadArgs)
$(WindowsInstallersLogArgs)
env:
MSBUILDUSESERVER: "1"
displayName: Build Installers

# Windows installers bundle and sharedfx msi for arm64
- script: ./eng/build.cmd
-ci
-prepareMachine
-noBuildRepoTasks
-arch arm64
-sign
-buildInstallers
-noBuildNative
-publish
/p:DotNetSignType=$(_SignType)
/p:AssetManifestFileName=aspnetcore-win.xml
$(_BuildArgs)
$(_PublishArgs)
$(_InternalRuntimeDownloadArgs)
$(WindowsArm64InstallersLogArgs)
$(WindowsInstallersLogArgs)
env:
MSBUILDUSESERVER: "1"
displayName: Build ARM64 Installers
displayName: Build Installers

artifacts:
- name: Windows_Logs_Attempt_$(System.JobAttempt)
Expand Down
Loading