Skip to content

Commit

Permalink
Add internal runtime args to source build template (#7659)
Browse files Browse the repository at this point in the history
These need to be passed through to correct restore an internal runtime.

This is a follow-on to a previous attempt (#7587). The two changes from that are:
- Use the eng/common/build.sh variation of runtimesourcefeed/runtimesourcefeedkey (without -'s)
- Determine whether the MSRC variable is actually set before adding the args.
  • Loading branch information
mmitche authored Jul 22, 2021
1 parent 5a60f9c commit d5177c5
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions eng/common/templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ steps:
officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
fi
internalRuntimeDownloadArgs=
if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
internalRuntimeDownloadArgs='--runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
fi
targetRidArgs=
if [ '${{ parameters.platform.targetRID }}' != '' ]; then
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
Expand All @@ -43,6 +48,7 @@ steps:
--configuration $buildConfig \
--restore --build --pack $publishArgs -bl \
$officialBuildArgs \
$internalRuntimeDownloadArgs \
$targetRidArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true
Expand Down

0 comments on commit d5177c5

Please sign in to comment.