From 4b5d52d13a8cf83e13c8f3b1358ddb1d7322722d Mon Sep 17 00:00:00 2001 From: DotNet Bot <dn-bot@microsoft.com> Date: Tue, 18 Oct 2022 00:10:57 +0000 Subject: [PATCH] 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... --- .azure/pipelines/ci.yml | 14 +- .azure/pipelines/jobs/default-build.yml | 3 + NuGet.config | 12 +- eng/Version.Details.xml | 282 ++++++++++++------------ eng/Versions.props | 8 +- eng/helix/helix.proj | 5 + 6 files changed, 170 insertions(+), 154 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 3ac92b9a12b..43ab17a2c70 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -112,17 +112,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 @@ -717,7 +717,7 @@ stages: platform: name: 'Managed' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' - buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks' + buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)' skipPublishValidation: true timeoutInMinutes: 120 diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index b7d49127618..945da645f1b 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -224,6 +224,7 @@ jobs: # Include the variables we always want. COMPlus_DbgEnableMiniDump: 1 COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core" + DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) # Expand provided `env:` properties, if any. ${{ if step.env }}: ${{ step.env }} @@ -235,12 +236,14 @@ jobs: env: COMPlus_DbgEnableMiniDump: 1 COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core" + 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" + DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) - ${{ parameters.afterBuild }} diff --git a/NuGet.config b/NuGet.config index 4c9c7a31cd7..015cf4973c6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,10 @@ <clear /> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-efcore --> - <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" /> + <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" /> <!-- End: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-runtime --> - <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" /> + <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" /> <!-- End: Package sources from dotnet-runtime --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" /> @@ -27,5 +27,13 @@ </packageSources> <disabledPackageSources> <clear /> + <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> + <!-- Begin: Package sources from dotnet-efcore --> + <add key="darc-int-dotnet-efcore-bb2cde3" value="true" /> + <!-- End: Package sources from dotnet-efcore --> + <!-- Begin: Package sources from dotnet-runtime --> + <add key="darc-int-dotnet-runtime-bebb595" value="true" /> + <!-- End: Package sources from dotnet-runtime --> + <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> </disabledPackageSources> </configuration> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 665843ccd4d..5d52de42079 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,176 +10,176 @@ <Dependencies> <ProductDependencies> <Dependency Name="dotnet-ef" Version="7.0.0"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>bb2cde3d5471a821a6cb3ad24f33df76eca9001e</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>bb2cde3d5471a821a6cb3ad24f33df76eca9001e</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>bb2cde3d5471a821a6cb3ad24f33df76eca9001e</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>bb2cde3d5471a821a6cb3ad24f33df76eca9001e</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>bb2cde3d5471a821a6cb3ad24f33df76eca9001e</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>bb2cde3d5471a821a6cb3ad24f33df76eca9001e</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.0"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>bb2cde3d5471a821a6cb3ad24f33df76eca9001e</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.0"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>bb2cde3d5471a821a6cb3ad24f33df76eca9001e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> - <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="7.0.0-rtm.22513.12"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="7.0.0-rtm.22513.8"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Hosting" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Http" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.Console" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Options" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Primitives" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> - <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.0-rtm.22513.12"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.0-rtm.22513.8"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.22505.1"> <Uri>https://github.com/dotnet/source-build-externals</Uri> @@ -187,108 +187,108 @@ <SourceBuild RepoName="source-build-externals" ManagedOnly="true" /> </Dependency> <Dependency Name="System.Configuration.ConfigurationManager" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.Diagnostics.DiagnosticSource" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.Diagnostics.EventLog" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.DirectoryServices.Protocols" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.IO.Pipelines" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.Net.Http.Json" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.Net.Http.WinHttpHandler" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.Reflection.Metadata" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.Resources.Extensions" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.Security.Cryptography.Pkcs" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.Security.Cryptography.Xml" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.Security.Permissions" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.ServiceProcess.ServiceController" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.Text.Encodings.Web" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.Text.Json" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.Threading.AccessControl" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.Threading.Channels" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="System.Threading.RateLimiting" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <!-- Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.0-rtm.22513.12"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.0-rtm.22513.8"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2"> <Uri>https://github.com/dotnet/xdt</Uri> @@ -299,8 +299,8 @@ <ToolsetDependencies> <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 --> <Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha> </Dependency> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22513.4"> <Uri>https://github.com/dotnet/arcade</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 2a71bdcb1f5..1d8d46dc016 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.0</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion> <MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.0</MicrosoftNETRuntimeWebAssemblySdkVersion> <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.0</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion> - <MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.0-rtm.22513.12</MicrosoftNETCoreBrowserDebugHostTransportVersion> + <MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.0-rtm.22513.8</MicrosoftNETCoreBrowserDebugHostTransportVersion> <MicrosoftExtensionsCachingAbstractionsVersion>7.0.0</MicrosoftExtensionsCachingAbstractionsVersion> <MicrosoftExtensionsCachingMemoryVersion>7.0.0</MicrosoftExtensionsCachingMemoryVersion> <MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion> @@ -87,7 +87,7 @@ <MicrosoftExtensionsFileProvidersCompositeVersion>7.0.0</MicrosoftExtensionsFileProvidersCompositeVersion> <MicrosoftExtensionsFileProvidersPhysicalVersion>7.0.0</MicrosoftExtensionsFileProvidersPhysicalVersion> <MicrosoftExtensionsFileSystemGlobbingVersion>7.0.0</MicrosoftExtensionsFileSystemGlobbingVersion> - <MicrosoftExtensionsHostFactoryResolverSourcesVersion>7.0.0-rtm.22513.12</MicrosoftExtensionsHostFactoryResolverSourcesVersion> + <MicrosoftExtensionsHostFactoryResolverSourcesVersion>7.0.0-rtm.22513.8</MicrosoftExtensionsHostFactoryResolverSourcesVersion> <MicrosoftExtensionsHostingAbstractionsVersion>7.0.0</MicrosoftExtensionsHostingAbstractionsVersion> <MicrosoftExtensionsHostingVersion>7.0.0</MicrosoftExtensionsHostingVersion> <MicrosoftExtensionsHttpVersion>7.0.0</MicrosoftExtensionsHttpVersion> @@ -103,7 +103,7 @@ <MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion> <MicrosoftExtensionsOptionsVersion>7.0.0</MicrosoftExtensionsOptionsVersion> <MicrosoftExtensionsPrimitivesVersion>7.0.0</MicrosoftExtensionsPrimitivesVersion> - <MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.0-rtm.22513.12</MicrosoftInternalRuntimeAspNetCoreTransportVersion> + <MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.0-rtm.22513.8</MicrosoftInternalRuntimeAspNetCoreTransportVersion> <SystemConfigurationConfigurationManagerVersion>7.0.0</SystemConfigurationConfigurationManagerVersion> <SystemDiagnosticsDiagnosticSourceVersion>7.0.0</SystemDiagnosticsDiagnosticSourceVersion> <SystemDiagnosticsEventLogVersion>7.0.0</SystemDiagnosticsEventLogVersion> @@ -300,6 +300,6 @@ <PropertyGroup Label="Restore feeds"> <!-- In an orchestrated build, this may be overridden to other Azure feeds. --> <DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">https://dotnetbuilds.azureedge.net/public/</DotNetAssetRootUrl> - <DotNetPrivateAssetRootUrl Condition="'$(DotNetPrivateAssetRootUrl)'==''">https://dotnetclimsrc.blob.core.windows.net/dotnet/</DotNetPrivateAssetRootUrl> + <DotNetPrivateAssetRootUrl Condition="'$(DotNetPrivateAssetRootUrl)'==''"> https://dotnetbuilds.azureedge.net/internal/</DotNetPrivateAssetRootUrl> </PropertyGroup> </Project> diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index bd87b1cb457..187baceb68c 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -58,6 +58,11 @@ <PackageType>runtime</PackageType> </AdditionalDotNetPackage> + <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" /> -- GitLab