diff options
| author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2021-08-02 15:36:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 15:36:06 +0300 |
| commit | ae18468b8712503aee67911228dd921601bd423a (patch) | |
| tree | 4c1d372d5a3daa2ccef5dcdf887d76d0d2c70a00 /eng/common | |
| parent | d7fb1ac41fe8423c9db1c7272d2e9fa2c4b8f666 (diff) | |
[main] Update dependencies from dotnet/arcade (#2166)
[main] Update dependencies from dotnet/arcade
- Merge branch 'main' into darc-main-69858aa8-d9b1-4736-8db6-b43a981b11c8
Diffstat (limited to 'eng/common')
| -rw-r--r-- | eng/common/internal/Tools.csproj | 2 | ||||
| -rw-r--r-- | eng/common/templates/steps/source-build.yml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index f46d5efe2..2067b8df8 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -1,5 +1,5 @@ +<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. --> <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. --> <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net472</TargetFramework> diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index e20637ed6..705b7a1c8 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -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 }}' @@ -43,6 +48,7 @@ steps: --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ $officialBuildArgs \ + $internalRuntimeDownloadArgs \ $targetRidArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true |