From 1dcf7acfacf0fe154adcc23270cb0da11ff44ace Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 15 Jan 2022 05:10:25 +0000 Subject: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore dnceng/internal/dotnet-runtime - Pass feed properties to source-build - Point helix.proj dotnetcli payload to dotnetbuilds/internal - Update RuntimeSourceFeed and RuntimeSourceFeedKey for dotnetbuilds - Change `$(DotNetPrivateAssetRootUrl)` --- .azure/pipelines/ci.yml | 14 +++++----- .azure/pipelines/jobs/default-build.yml | 6 ++--- NuGet.config | 8 +++--- eng/Version.Details.xml | 48 ++++++++++++++++----------------- eng/Versions.props | 6 ++--- eng/helix/helix.proj | 4 +-- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 87b1b96261..b2146de54a 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -93,17 +93,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 - name: _UseHelixOpenQueues value: 'false' @@ -736,7 +736,7 @@ stages: platform: name: 'Managed' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-20210714125435-9b5bbc2' - buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks' + buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)' skipPublishValidation: true # Publish to the BAR diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index abb2009527..75b8db0262 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -220,7 +220,7 @@ jobs: # Include the variables we always want. COMPlus_DbgEnableMiniDump: 1 COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core" - DotNetCliMsrcReadSasToken: "$(dotnetclimsrc-read-sas-token)" + DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) # Expand provided `env:` properties, if any. ${{ if step.env }}: ${{ step.env }} @@ -231,14 +231,14 @@ jobs: env: COMPlus_DbgEnableMiniDump: 1 COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core" - DotNetCliMsrcReadSasToken: "$(dotnetclimsrc-read-sas-token)" + DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) - ${{ if ne(parameters.agentOs, 'Windows') }}: - script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs) displayName: Run build.sh env: COMPlus_DbgEnableMiniDump: 1 COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core" - DotNetCliMsrcReadSasToken: "$(dotnetclimsrc-read-sas-token)" + DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) - ${{ parameters.afterBuild }} diff --git a/NuGet.config b/NuGet.config index 37e15a49ad..050fda0b4d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c498e40f97..5650cb1bb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 35c542c8bbefb222a6e592eed0790e6c264690a0 + d93f389536054e13de2f820fe89197aa374c01eb https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 35c542c8bbefb222a6e592eed0790e6c264690a0 + d93f389536054e13de2f820fe89197aa374c01eb https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 35c542c8bbefb222a6e592eed0790e6c264690a0 + d93f389536054e13de2f820fe89197aa374c01eb https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 35c542c8bbefb222a6e592eed0790e6c264690a0 + d93f389536054e13de2f820fe89197aa374c01eb https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 35c542c8bbefb222a6e592eed0790e6c264690a0 + d93f389536054e13de2f820fe89197aa374c01eb https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 35c542c8bbefb222a6e592eed0790e6c264690a0 + d93f389536054e13de2f820fe89197aa374c01eb https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 35c542c8bbefb222a6e592eed0790e6c264690a0 + d93f389536054e13de2f820fe89197aa374c01eb https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 35c542c8bbefb222a6e592eed0790e6c264690a0 + d93f389536054e13de2f820fe89197aa374c01eb https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e9fd16f0c7c5589d36b3655b0be32ac4485f32f + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 https://github.com/dotnet/runtime @@ -63,7 +63,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e9fd16f0c7c5589d36b3655b0be32ac4485f32f + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 https://github.com/dotnet/runtime @@ -79,7 +79,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e9fd16f0c7c5589d36b3655b0be32ac4485f32f + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 https://github.com/dotnet/runtime @@ -123,7 +123,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e9fd16f0c7c5589d36b3655b0be32ac4485f32f + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 https://github.com/dotnet/runtime @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e9fd16f0c7c5589d36b3655b0be32ac4485f32f + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 https://github.com/dotnet/runtime @@ -191,11 +191,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e9fd16f0c7c5589d36b3655b0be32ac4485f32f + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e9fd16f0c7c5589d36b3655b0be32ac4485f32f + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 https://github.com/dotnet/runtime @@ -235,7 +235,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e9fd16f0c7c5589d36b3655b0be32ac4485f32f + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 https://github.com/dotnet/runtime @@ -247,15 +247,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e9fd16f0c7c5589d36b3655b0be32ac4485f32f + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e9fd16f0c7c5589d36b3655b0be32ac4485f32f + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e9fd16f0c7c5589d36b3655b0be32ac4485f32f + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e9fd16f0c7c5589d36b3655b0be32ac4485f32f + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e9fd16f0c7c5589d36b3655b0be32ac4485f32f + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e9fd16f0c7c5589d36b3655b0be32ac4485f32f + 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 diff --git a/eng/Versions.props b/eng/Versions.props index e805b94a66..b5aa79c0c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,7 +70,7 @@ 6.0.2 6.0.2 6.0.2 - 6.0.2-servicing.22062.6 + 6.0.2-servicing.22064.6 6.0.0 6.0.1 6.0.0 @@ -105,7 +105,7 @@ 6.0.0 6.0.0 6.0.0 - 6.0.2-servicing.22062.6 + 6.0.2-servicing.22064.6 6.0.0 6.0.0 6.0.1 @@ -272,6 +272,6 @@ https://dotnetcli.azureedge.net/dotnet/ - https://dotnetclimsrc.blob.core.windows.net/dotnet/ + https://dotnetbuilds.azureedge.net/internal/ diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index e64dd7d86e..56ecf5c1fb 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -40,11 +40,11 @@ + Uri="https://dotnetbuilds.blob.core.windows.net/internal/Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(DotNetCliRuntime)$(ArchiveExtension)$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))" /> -- cgit v1.2.3