Skip to content

Commit 9dd6031

Browse files
authored
Merge pull request #40073 from vseanreesermsft/internal-merge-6.0-2022-02-08-1020
Merging internal commits for release/6.0
2 parents ede9cf4 + fd80be8 commit 9dd6031

File tree

16 files changed

+588
-436
lines changed

16 files changed

+588
-436
lines changed

.azure/pipelines/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,17 @@ variables:
9393
- name: _InternalRuntimeDownloadCodeSignArgs
9494
value: ''
9595
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
96-
- group: DotNet-MSRC-Storage
96+
- group: DotNetBuilds storage account read tokens
9797
- name: _InternalRuntimeDownloadArgs
98-
value: -RuntimeSourceFeed https://dotnetclimsrc.blob.core.windows.net/dotnet
99-
-RuntimeSourceFeedKey $(dotnetclimsrc-read-sas-token-base64)
100-
/p:DotNetAssetRootAccessTokenSuffix='$(dotnetclimsrc-read-sas-token-base64)'
98+
value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
99+
-RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
100+
/p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)'
101101
# The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This
102102
# is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically.
103103
- name: _InternalRuntimeDownloadCodeSignArgs
104104
value: $(_InternalRuntimeDownloadArgs)
105-
/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
106-
/p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
105+
/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
106+
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
107107
- group: DotNet-HelixApi-Access
108108
- name: _UseHelixOpenQueues
109109
value: 'false'
@@ -528,7 +528,7 @@ stages:
528528
jobName: Linux_musl_x64_build
529529
jobDisplayName: "Build: Linux Musl x64"
530530
agentOs: Linux
531-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-WithNode-0fc54a3-20190918214015
531+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-WithNode-20210910135833-c401c85
532532
buildArgs:
533533
--arch x64
534534
--os-name linux-musl
@@ -736,7 +736,7 @@ stages:
736736
platform:
737737
name: 'Managed'
738738
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-20210714125435-9b5bbc2'
739-
buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks'
739+
buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)'
740740
skipPublishValidation: true
741741

742742
# Publish to the BAR

.azure/pipelines/jobs/default-build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ jobs:
220220
# Include the variables we always want.
221221
COMPlus_DbgEnableMiniDump: 1
222222
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
223+
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
223224
# Expand provided `env:` properties, if any.
224225
${{ if step.env }}:
225226
${{ step.env }}
@@ -230,12 +231,14 @@ jobs:
230231
env:
231232
COMPlus_DbgEnableMiniDump: 1
232233
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
234+
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
233235
- ${{ if ne(parameters.agentOs, 'Windows') }}:
234236
- script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
235237
displayName: Run build.sh
236238
env:
237239
COMPlus_DbgEnableMiniDump: 1
238240
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
241+
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
239242

240243
- ${{ parameters.afterBuild }}
241244

NuGet.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7+
<add key="darc-int-dotnet-runtime-839cdfb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-839cdfb0/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-runtime -->
89
<!-- Begin: Package sources from dotnet-efcore -->
10+
<add key="darc-int-dotnet-efcore-d93f389" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d93f3895/nuget/v3/index.json" />
911
<!-- End: Package sources from dotnet-efcore -->
1012
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1113
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -25,8 +27,10 @@
2527
<clear />
2628
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2729
<!-- Begin: Package sources from dotnet-efcore -->
30+
<add key="darc-int-dotnet-efcore-d93f389" value="true" />
2831
<!-- End: Package sources from dotnet-efcore -->
2932
<!-- Begin: Package sources from dotnet-runtime -->
33+
<add key="darc-int-dotnet-runtime-839cdfb" value="true" />
3034
<!-- End: Package sources from dotnet-runtime -->
3135
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3236
</disabledPackageSources>

0 commit comments

Comments
 (0)