Skip to content

Commit 4b5d52d

Browse files
dotnet-botmmitche
dotnet-bot
authored and
mmitche
committed
Merged PR 26779: [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-runtime dnceng/internal/dotnet-efcore
This pull request updates the following dependencies [marker]: <> (Begin:2802be6f-a6f7-477e-8165-08da7ef6284d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 2802be6f-a6f7-477e-8165-08da7ef6284d - **Build**: 20221013.8 - **Date Produced**: October 14, 2022 10:52:24 PM UTC - **Commit**: bebb59597c8f98828b4cf2ae7724b277b15c47ee - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Caching.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Caching.Memory**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.Binder**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.CommandLine**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.FileExtensions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.Ini**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.Json**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.UserSecrets**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Configuration.Xml**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.DependencyInjection**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.DependencyInjection.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.DependencyModel**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.FileProviders.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.FileProviders.Composite**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.FileProviders.Physical**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.FileSystemGlobbing**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 7.0.0-rtm.22513.12 to 7.0.0-rtm.22513.8][1] - **Microsoft.Extensions.Hosting**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Hosting.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Http**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.Abstractions**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.Configuration**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.Console**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.Debug**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.EventLog**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.EventSource**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Logging.TraceSource**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Options**: [from 7.0.0 to 7.0.0][1] - **Microsoft.Extensions.Options.ConfigurationExtensions**: [from 7...
1 parent e3dd110 commit 4b5d52d

File tree

6 files changed

+170
-154
lines changed

6 files changed

+170
-154
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,17 @@ variables:
112112
- name: _InternalRuntimeDownloadCodeSignArgs
113113
value: ''
114114
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
115-
- group: DotNet-MSRC-Storage
115+
- group: DotNetBuilds storage account read tokens
116116
- name: _InternalRuntimeDownloadArgs
117-
value: -RuntimeSourceFeed https://dotnetclimsrc.blob.core.windows.net/dotnet
118-
-RuntimeSourceFeedKey $(dotnetclimsrc-read-sas-token-base64)
119-
/p:DotNetAssetRootAccessTokenSuffix='$(dotnetclimsrc-read-sas-token-base64)'
117+
value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
118+
-RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
119+
/p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)'
120120
# The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This
121121
# is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically.
122122
- name: _InternalRuntimeDownloadCodeSignArgs
123123
value: $(_InternalRuntimeDownloadArgs)
124-
/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
125-
/p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
124+
/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
125+
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
126126
- group: DotNet-HelixApi-Access
127127
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
128128
- name: _SignType
@@ -717,7 +717,7 @@ stages:
717717
platform:
718718
name: 'Managed'
719719
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab'
720-
buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks'
720+
buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)'
721721
skipPublishValidation: true
722722
timeoutInMinutes: 120
723723

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ jobs:
224224
# Include the variables we always want.
225225
COMPlus_DbgEnableMiniDump: 1
226226
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
227+
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
227228
# Expand provided `env:` properties, if any.
228229
${{ if step.env }}:
229230
${{ step.env }}
@@ -235,12 +236,14 @@ jobs:
235236
env:
236237
COMPlus_DbgEnableMiniDump: 1
237238
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
239+
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
238240
- ${{ if ne(parameters.agentOs, 'Windows') }}:
239241
- script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
240242
displayName: Run build.sh
241243
env:
242244
COMPlus_DbgEnableMiniDump: 1
243245
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
246+
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
244247

245248
- ${{ parameters.afterBuild }}
246249

‎NuGet.config

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +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-efcore -->
7-
<add key="darc-pub-dotnet-efcore-1f5aa6c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-1f5aa6c6/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-efcore-bb2cde3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-bb2cde3d/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-efcore -->
99
<!-- Begin: Package sources from dotnet-runtime -->
10-
<add key="darc-pub-dotnet-runtime-cd2d837" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-cd2d8379/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-runtime-bebb595" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bebb5959/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-runtime -->
1212
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1313
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -27,5 +27,13 @@
2727
</packageSources>
2828
<disabledPackageSources>
2929
<clear />
30+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
31+
<!-- Begin: Package sources from dotnet-efcore -->
32+
<add key="darc-int-dotnet-efcore-bb2cde3" value="true" />
33+
<!-- End: Package sources from dotnet-efcore -->
34+
<!-- Begin: Package sources from dotnet-runtime -->
35+
<add key="darc-int-dotnet-runtime-bebb595" value="true" />
36+
<!-- End: Package sources from dotnet-runtime -->
37+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3038
</disabledPackageSources>
3139
</configuration>

0 commit comments

Comments
 (0)