Skip to content

Commit 46622fd

Browse files
vseanreesermsftvseanreesermsft
committed
Merge commit '1dcf7acfacf0fe154adcc23270cb0da11ff44ace' into internal-merge-6.0-2022-02-08-1020
2 parents 15c2e59 + 1dcf7ac commit 46622fd

File tree

13 files changed

+221
-88
lines changed

13 files changed

+221
-88
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>

‎eng/Version.Details.xml

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,45 @@
99
-->
1010
<Dependencies>
1111
<ProductDependencies>
12-
<Dependency Name="dotnet-ef" Version="6.0.1">
12+
<Dependency Name="dotnet-ef" Version="6.0.2">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
14+
<Sha>d93f389536054e13de2f820fe89197aa374c01eb</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.1">
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.2">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
18+
<Sha>d93f389536054e13de2f820fe89197aa374c01eb</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1">
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.2">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
22+
<Sha>d93f389536054e13de2f820fe89197aa374c01eb</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1">
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.2">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
26+
<Sha>d93f389536054e13de2f820fe89197aa374c01eb</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1">
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.2">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
30+
<Sha>d93f389536054e13de2f820fe89197aa374c01eb</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1">
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.2">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
34+
<Sha>d93f389536054e13de2f820fe89197aa374c01eb</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.1">
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.2">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
38+
<Sha>d93f389536054e13de2f820fe89197aa374c01eb</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.2">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
42+
<Sha>d93f389536054e13de2f820fe89197aa374c01eb</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
4646
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.0">
49-
<Uri>https://github.com/dotnet/runtime</Uri>
50-
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
48+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.1">
49+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
50+
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
5151
</Dependency>
5252
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0">
5353
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -61,9 +61,9 @@
6161
<Uri>https://github.com/dotnet/runtime</Uri>
6262
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0">
65-
<Uri>https://github.com/dotnet/runtime</Uri>
66-
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
64+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1">
65+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66+
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
6767
</Dependency>
6868
<Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0">
6969
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -77,9 +77,9 @@
7777
<Uri>https://github.com/dotnet/runtime</Uri>
7878
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0">
81-
<Uri>https://github.com/dotnet/runtime</Uri>
82-
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
80+
<Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1">
81+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82+
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
8383
</Dependency>
8484
<Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="6.0.0">
8585
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -121,9 +121,9 @@
121121
<Uri>https://github.com/dotnet/runtime</Uri>
122122
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
123123
</Dependency>
124-
<Dependency Name="Microsoft.Extensions.Hosting" Version="6.0.0">
125-
<Uri>https://github.com/dotnet/runtime</Uri>
126-
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
124+
<Dependency Name="Microsoft.Extensions.Hosting" Version="6.0.1">
125+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
126+
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
127127
</Dependency>
128128
<Dependency Name="Microsoft.Extensions.Http" Version="6.0.0">
129129
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -177,9 +177,9 @@
177177
<Uri>https://github.com/dotnet/runtime</Uri>
178178
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.1-servicing.21567.5">
180+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.2-servicing.22064.6">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
182+
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
183183
</Dependency>
184184
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0">
185185
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -189,13 +189,13 @@
189189
<Uri>https://github.com/dotnet/runtime</Uri>
190190
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
191191
</Dependency>
192-
<Dependency Name="System.DirectoryServices.Protocols" Version="6.0.0">
193-
<Uri>https://github.com/dotnet/runtime</Uri>
194-
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
192+
<Dependency Name="System.DirectoryServices.Protocols" Version="6.0.1">
193+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
194+
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
195195
</Dependency>
196-
<Dependency Name="System.IO.Pipelines" Version="6.0.1">
196+
<Dependency Name="System.IO.Pipelines" Version="6.0.2">
197197
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
198-
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
198+
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
199199
</Dependency>
200200
<Dependency Name="System.Net.Http.Json" Version="6.0.0">
201201
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -233,9 +233,9 @@
233233
<Uri>https://github.com/dotnet/runtime</Uri>
234234
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
235235
</Dependency>
236-
<Dependency Name="System.Text.Json" Version="6.0.1">
236+
<Dependency Name="System.Text.Json" Version="6.0.2">
237237
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
238-
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
238+
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
239239
</Dependency>
240240
<Dependency Name="System.Threading.Channels" Version="6.0.0">
241241
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -245,33 +245,33 @@
245245
<Uri>https://github.com/dotnet/runtime</Uri>
246246
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
247247
</Dependency>
248-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.1">
248+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.2">
249249
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
250-
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
250+
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
251251
</Dependency>
252-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.1">
252+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.2">
253253
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
254-
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
254+
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
255255
</Dependency>
256-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.1">
256+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.2">
257257
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
258-
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
258+
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
259259
</Dependency>
260260
<!--
261261
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
262262
All Runtime.$rid packages should have the same version.
263263
-->
264-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.1">
264+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.2">
265265
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
266-
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
266+
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
267267
</Dependency>
268-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.1">
268+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.2">
269269
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
270-
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
270+
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
271271
</Dependency>
272-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.1-servicing.21567.5">
272+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.2-servicing.22064.6">
273273
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
274-
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
274+
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
275275
</Dependency>
276276
</ProductDependencies>
277277
<ToolsetDependencies>

0 commit comments

Comments
 (0)