Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/aspnetcore.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Bunting <6431421+dougbu@users.noreply.github.com>2022-11-09 09:38:52 +0300
committerDoug Bunting <6431421+dougbu@users.noreply.github.com>2022-11-09 09:38:52 +0300
commit16225441a6dfba4f0f0ede569ea8e7ef43524373 (patch)
treef7bbf87901ba067edbbf1538def2a001ebe203ef
parent1f76c0ce943d25257f512e4afb3a79fa5a3ba7c0 (diff)
parentbb01bbf4433e27289b99001b7de6a582879d1835 (diff)
Merge tag 'v7.0.0' into 'release/7.0'
-rw-r--r--.azure/pipelines/ci.yml14
-rw-r--r--.azure/pipelines/jobs/default-build.yml3
-rw-r--r--NuGet.config12
-rw-r--r--eng/Version.Details.xml282
-rw-r--r--eng/Versions.props8
-rw-r--r--eng/helix/helix.proj5
6 files changed, 170 insertions, 154 deletions
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 4db1d90864..9ded1bea4d 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -132,17 +132,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
@@ -789,7 +789,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 5d5f835fd9..ce15ef3798 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -250,6 +250,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 }}
@@ -261,12 +262,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 7cb10daf21..79f3fafadc 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-865c6a8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-865c6a89/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-d099f07" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-d099f075/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" />
@@ -24,5 +24,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-865c6a8" value="true" />
+ <!-- End: Package sources from dotnet-efcore -->
+ <!-- Begin: Package sources from dotnet-runtime -->
+ <add key="darc-int-dotnet-runtime-d099f07" 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 665843ccd4..ae7bf522c3 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>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</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>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</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>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</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>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</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>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</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>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</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>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</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>865c6a897058a6ee4c7e014c0cefdcb04dc5e292</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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.22518.5">
+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+ <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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.22518.5">
+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+ <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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.22518.5">
+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+ <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</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>d099f075e45d2aa6007a22b71b45a08758559f80</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 030499652c..5fe031d39f 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.22518.5</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.22518.5</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.22518.5</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemConfigurationConfigurationManagerVersion>7.0.0</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>7.0.0</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>7.0.0</SystemDiagnosticsEventLogVersion>
@@ -301,6 +301,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 bd87b1cb45..187baceb68 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" />