зеркало из https://github.com/dotnet/aspnetcore.git
Port internal runtime download changes (#50186)
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
This commit is contained in:
Родитель
44cc826d0d
Коммит
9554c89da5
|
@ -126,17 +126,17 @@ variables:
|
|||
- name: _InternalRuntimeDownloadCodeSignArgs
|
||||
value: ''
|
||||
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
- group: DotNet-MSRC-Storage
|
||||
- group: DotNetBuilds storage account read tokens
|
||||
- name: _InternalRuntimeDownloadArgs
|
||||
value: -RuntimeSourceFeed https://dotnetclimsrc.blob.core.windows.net/dotnet
|
||||
-RuntimeSourceFeedKey $(dotnetclimsrc-read-sas-token-base64)
|
||||
/p:DotNetAssetRootAccessTokenSuffix='$(dotnetclimsrc-read-sas-token-base64)'
|
||||
value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
|
||||
-RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
|
||||
/p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)'
|
||||
# The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This
|
||||
# is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically.
|
||||
- name: _InternalRuntimeDownloadCodeSignArgs
|
||||
value: $(_InternalRuntimeDownloadArgs)
|
||||
/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
|
||||
/p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
|
||||
/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
|
||||
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
|
||||
- group: DotNet-HelixApi-Access
|
||||
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
|
||||
- name: _SignType
|
||||
|
@ -731,7 +731,7 @@ stages:
|
|||
platform:
|
||||
name: 'Managed'
|
||||
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
|
||||
buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks'
|
||||
buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)'
|
||||
skipPublishValidation: true
|
||||
jobProperties:
|
||||
timeoutInMinutes: 120
|
||||
|
|
|
@ -63,6 +63,11 @@
|
|||
<SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
|
||||
</AdditionalDotNetPackageFeed>
|
||||
|
||||
<AdditionalDotNetPackageFeed Include="https://dotnetbuilds.blob.core.windows.net/internal"
|
||||
Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
|
||||
<SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
|
||||
</AdditionalDotNetPackageFeed>
|
||||
|
||||
<!-- Grab the tool packages for what HelixTestRunner installs. -->
|
||||
<HelixCorrelationPayload Include="$(NUGET_PACKAGES)\dotnet-dump\$(DotnetDumpVersion)\dotnet-dump.$(DotnetDumpVersion).nupkg" />
|
||||
<HelixCorrelationPayload Include="$(NUGET_PACKAGES)\dotnet-ef\$(DotnetEfVersion)\dotnet-ef.$(DotnetEfVersion).nupkg" />
|
||||
|
|
Загрузка…
Ссылка в новой задаче