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:
authorDotNet Bot <dn-bot@microsoft.com>2022-01-14 03:22:48 +0300
committerDotNet Bot <dn-bot@microsoft.com>2022-01-14 03:22:48 +0300
commit608229f48bd30ebdc8e4719bf774275ee6acb4b9 (patch)
tree98802138930980d1ad451338ba5a17d3d873e82e
parenteb1c0a4944801ea8ea2e4766bba9a956c797a43a (diff)
[internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime dnceng/internal/dotnet-efcore
- Fixup - Fixup - Remove dotnetcliruntime, fix extension - Make sure dotnetcliruntime is set - !fixup! Remove extra `?` from URI - Download Runtime correlation payload - Move from alpine 3.9 to 3.14
-rw-r--r--.azure/pipelines/ci.yml2
-rw-r--r--.azure/pipelines/jobs/default-build.yml3
-rw-r--r--NuGet.config8
-rw-r--r--eng/Version.Details.xml98
-rw-r--r--eng/Versions.props44
-rw-r--r--eng/helix/helix.proj10
-rw-r--r--eng/targets/Helix.Common.props7
-rw-r--r--eng/targets/Helix.props4
8 files changed, 93 insertions, 83 deletions
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 17ffe8ce1e..87b1b96261 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -528,7 +528,7 @@ stages:
jobName: Linux_musl_x64_build
jobDisplayName: "Build: Linux Musl x64"
agentOs: Linux
- container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-WithNode-0fc54a3-20190918214015
+ container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-WithNode-20210910135833-c401c85
buildArgs:
--arch x64
--os-name linux-musl
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index c990fadd72..abb2009527 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -220,6 +220,7 @@ jobs:
# Include the variables we always want.
COMPlus_DbgEnableMiniDump: 1
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
+ DotNetCliMsrcReadSasToken: "$(dotnetclimsrc-read-sas-token)"
# Expand provided `env:` properties, if any.
${{ if step.env }}:
${{ step.env }}
@@ -230,12 +231,14 @@ jobs:
env:
COMPlus_DbgEnableMiniDump: 1
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
+ DotNetCliMsrcReadSasToken: "$(dotnetclimsrc-read-sas-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"
+ DotNetCliMsrcReadSasToken: "$(dotnetclimsrc-read-sas-token)"
- ${{ parameters.afterBuild }}
diff --git a/NuGet.config b/NuGet.config
index aa6163b399..37e15a49ad 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-runtime -->
- <add key="darc-int-dotnet-runtime-3a25a7f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3a25a7f1/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-runtime-5e9fd16" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5e9fd16f/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-efcore -->
- <add key="darc-int-dotnet-efcore-41e6aaa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-41e6aaaf/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-efcore-35c542c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-35c542c8/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore -->
<!--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,10 +27,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-int-dotnet-efcore-41e6aaa" value="true" />
+ <add key="darc-int-dotnet-efcore-35c542c" value="true" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
- <add key="darc-int-dotnet-runtime-3a25a7f" value="true" />
+ <add key="darc-int-dotnet-runtime-5e9fd16" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 56dc6ff3b5..c498e40f97 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,45 +9,45 @@
-->
<Dependencies>
<ProductDependencies>
- <Dependency Name="dotnet-ef" Version="6.0.1">
+ <Dependency Name="dotnet-ef" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
- <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
+ <Sha>35c542c8bbefb222a6e592eed0790e6c264690a0</Sha>
</Dependency>
- <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.1">
+ <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
- <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
+ <Sha>35c542c8bbefb222a6e592eed0790e6c264690a0</Sha>
</Dependency>
- <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1">
+ <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
- <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
+ <Sha>35c542c8bbefb222a6e592eed0790e6c264690a0</Sha>
</Dependency>
- <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1">
+ <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
- <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
+ <Sha>35c542c8bbefb222a6e592eed0790e6c264690a0</Sha>
</Dependency>
- <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1">
+ <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
- <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
+ <Sha>35c542c8bbefb222a6e592eed0790e6c264690a0</Sha>
</Dependency>
- <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1">
+ <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
- <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
+ <Sha>35c542c8bbefb222a6e592eed0790e6c264690a0</Sha>
</Dependency>
- <Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.1">
+ <Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
- <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
+ <Sha>35c542c8bbefb222a6e592eed0790e6c264690a0</Sha>
</Dependency>
- <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
+ <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
- <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha>
+ <Sha>35c542c8bbefb222a6e592eed0790e6c264690a0</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
- <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.0">
- <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
+ <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.1">
+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+ <Sha>5e9fd16f0c7c5589d36b3655b0be32ac4485f32f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -61,9 +61,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
- <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0">
- <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
+ <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1">
+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+ <Sha>5e9fd16f0c7c5589d36b3655b0be32ac4485f32f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -77,9 +77,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
- <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0">
- <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
+ <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1">
+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+ <Sha>5e9fd16f0c7c5589d36b3655b0be32ac4485f32f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -121,9 +121,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
- <Dependency Name="Microsoft.Extensions.Hosting" Version="6.0.0">
- <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
+ <Dependency Name="Microsoft.Extensions.Hosting" Version="6.0.1">
+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+ <Sha>5e9fd16f0c7c5589d36b3655b0be32ac4485f32f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Http" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -177,9 +177,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
- <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.1-servicing.21567.5">
+ <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.2-servicing.22062.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
+ <Sha>5e9fd16f0c7c5589d36b3655b0be32ac4485f32f</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -189,13 +189,13 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
- <Dependency Name="System.DirectoryServices.Protocols" Version="6.0.0">
- <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
+ <Dependency Name="System.DirectoryServices.Protocols" Version="6.0.1">
+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+ <Sha>5e9fd16f0c7c5589d36b3655b0be32ac4485f32f</Sha>
</Dependency>
- <Dependency Name="System.IO.Pipelines" Version="6.0.1">
+ <Dependency Name="System.IO.Pipelines" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
+ <Sha>5e9fd16f0c7c5589d36b3655b0be32ac4485f32f</Sha>
</Dependency>
<Dependency Name="System.Net.Http.Json" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -233,9 +233,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
- <Dependency Name="System.Text.Json" Version="6.0.1">
+ <Dependency Name="System.Text.Json" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
+ <Sha>5e9fd16f0c7c5589d36b3655b0be32ac4485f32f</Sha>
</Dependency>
<Dependency Name="System.Threading.Channels" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -245,33 +245,33 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
- <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.1">
+ <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
+ <Sha>5e9fd16f0c7c5589d36b3655b0be32ac4485f32f</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.1">
+ <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
+ <Sha>5e9fd16f0c7c5589d36b3655b0be32ac4485f32f</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.1">
+ <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
+ <Sha>5e9fd16f0c7c5589d36b3655b0be32ac4485f32f</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="6.0.1">
+ <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
+ <Sha>5e9fd16f0c7c5589d36b3655b0be32ac4485f32f</Sha>
</Dependency>
- <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.1">
+ <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
+ <Sha>5e9fd16f0c7c5589d36b3655b0be32ac4485f32f</Sha>
</Dependency>
- <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.1-servicing.21567.5">
+ <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.2-servicing.22062.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
+ <Sha>5e9fd16f0c7c5589d36b3655b0be32ac4485f32f</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 4159fec015..e805b94a66 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -65,23 +65,23 @@
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
- <MicrosoftNETCoreAppRefVersion>6.0.1</MicrosoftNETCoreAppRefVersion>
- <MicrosoftNETCoreAppRuntimewinx64Version>6.0.1</MicrosoftNETCoreAppRuntimewinx64Version>
- <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
- <MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
- <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
- <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.1-servicing.21567.5</MicrosoftNETCoreBrowserDebugHostTransportVersion>
+ <MicrosoftNETCoreAppRefVersion>6.0.2</MicrosoftNETCoreAppRefVersion>
+ <MicrosoftNETCoreAppRuntimewinx64Version>6.0.2</MicrosoftNETCoreAppRuntimewinx64Version>
+ <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.2</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
+ <MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.2</MicrosoftNETRuntimeWebAssemblySdkVersion>
+ <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.2</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
+ <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.2-servicing.22062.6</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
- <MicrosoftExtensionsCachingMemoryVersion>6.0.0</MicrosoftExtensionsCachingMemoryVersion>
+ <MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>6.0.0</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>6.0.0</MicrosoftExtensionsConfigurationCommandLineVersion>
- <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
+ <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>6.0.0</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>6.0.0</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>6.0.0</MicrosoftExtensionsConfigurationVersion>
- <MicrosoftExtensionsConfigurationUserSecretsVersion>6.0.0</MicrosoftExtensionsConfigurationUserSecretsVersion>
+ <MicrosoftExtensionsConfigurationUserSecretsVersion>6.0.1</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>6.0.0</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>6.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0</MicrosoftExtensionsDependencyInjectionVersion>
@@ -91,7 +91,7 @@
<MicrosoftExtensionsFileSystemGlobbingVersion>6.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.1-servicing.21567.5</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>6.0.0</MicrosoftExtensionsHostingAbstractionsVersion>
- <MicrosoftExtensionsHostingVersion>6.0.0</MicrosoftExtensionsHostingVersion>
+ <MicrosoftExtensionsHostingVersion>6.0.1</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>6.0.0</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>6.0.0</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>6.0.0</MicrosoftExtensionsLoggingConfigurationVersion>
@@ -105,11 +105,11 @@
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion>
- <MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.1-servicing.21567.5</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
+ <MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.2-servicing.22062.6</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
- <SystemDirectoryServicesProtocolsVersion>6.0.0</SystemDirectoryServicesProtocolsVersion>
- <SystemIOPipelinesVersion>6.0.1</SystemIOPipelinesVersion>
+ <SystemDirectoryServicesProtocolsVersion>6.0.1</SystemDirectoryServicesProtocolsVersion>
+ <SystemIOPipelinesVersion>6.0.2</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>6.0.0</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>6.0.0</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
@@ -119,19 +119,19 @@
<SystemSecurityCryptographyXmlVersion>6.0.0</SystemSecurityCryptographyXmlVersion>
<SystemServiceProcessServiceControllerVersion>6.0.0</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
- <SystemTextJsonVersion>6.0.1</SystemTextJsonVersion>
+ <SystemTextJsonVersion>6.0.2</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>6.0.0</SystemThreadingChannelsVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>6.0.1</MicrosoftNETCorePlatformsVersion>
<!-- Packages from dotnet/efcore -->
- <dotnetefVersion>6.0.1</dotnetefVersion>
- <MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.1</MicrosoftEntityFrameworkCoreInMemoryVersion>
- <MicrosoftEntityFrameworkCoreRelationalVersion>6.0.1</MicrosoftEntityFrameworkCoreRelationalVersion>
- <MicrosoftEntityFrameworkCoreSqliteVersion>6.0.1</MicrosoftEntityFrameworkCoreSqliteVersion>
- <MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.1</MicrosoftEntityFrameworkCoreSqlServerVersion>
- <MicrosoftEntityFrameworkCoreToolsVersion>6.0.1</MicrosoftEntityFrameworkCoreToolsVersion>
- <MicrosoftEntityFrameworkCoreVersion>6.0.1</MicrosoftEntityFrameworkCoreVersion>
- <MicrosoftEntityFrameworkCoreDesignVersion>6.0.1</MicrosoftEntityFrameworkCoreDesignVersion>
+ <dotnetefVersion>6.0.2</dotnetefVersion>
+ <MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.2</MicrosoftEntityFrameworkCoreInMemoryVersion>
+ <MicrosoftEntityFrameworkCoreRelationalVersion>6.0.2</MicrosoftEntityFrameworkCoreRelationalVersion>
+ <MicrosoftEntityFrameworkCoreSqliteVersion>6.0.2</MicrosoftEntityFrameworkCoreSqliteVersion>
+ <MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.2</MicrosoftEntityFrameworkCoreSqlServerVersion>
+ <MicrosoftEntityFrameworkCoreToolsVersion>6.0.2</MicrosoftEntityFrameworkCoreToolsVersion>
+ <MicrosoftEntityFrameworkCoreVersion>6.0.2</MicrosoftEntityFrameworkCoreVersion>
+ <MicrosoftEntityFrameworkCoreDesignVersion>6.0.2</MicrosoftEntityFrameworkCoreDesignVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21609.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21609.4</MicrosoftDotNetBuildTasksTemplatingVersion>
diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 392c90bd1e..e64dd7d86e 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -29,6 +29,9 @@
<DotNetCliVersion>$(NETCoreSdkVersion)</DotNetCliVersion>
<DotNetCliChannel>Current</DotNetCliChannel>
+ <ArchiveExtension>.tar.gz</ArchiveExtension>
+ <ArchiveExtension Condition="'$(IsWindowsHelixQueue)' == 'true'">.zip</ArchiveExtension>
+
<!-- Similar to ProjectLayout.props in the Arcade SDK. The Helix SDK contains nothing similar. -->
<OutputPath Condition=" '$(OutputPath)' == '' ">$(RepoRoot)artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
@@ -37,10 +40,11 @@
<ItemGroup>
<!--
Use the BrowserDebugHost transport package as a sentinel for the non-shipping version of the NETCoreApp shared framework.
+ !temporary! e.g. https://dotnetclimsrc.blob.core.windows.net/dotnet/Runtime/6.0.2-servicing.22060.12/dotnet-runtime-6.0.2-win-x86.zip?{token}
-->
- <AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
- <PackageType>runtime</PackageType>
- </AdditionalDotNetPackage>
+ <HelixCorrelationPayload Include="dotnet-cli"
+ Destination="dotnet-cli"
+ Uri="https://dotnetclimsrc.blob.core.windows.net/dotnet/Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(DotNetCliRuntime)$(ArchiveExtension)$([System.Environment]::GetEnvironmentVariable('DotNetCliMsrcReadSasToken'))" />
</ItemGroup>
<PropertyGroup Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">
diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
index c82fe494c8..f17314b89e 100644
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@@ -62,4 +62,11 @@
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
<HelixAvailableTargetQueue Include="Windows.10.Arm64v8.Open" Platform="Windows" />
</ItemGroup>
+
+ <PropertyGroup>
+ <IsWindowsHelixQueue>false</IsWindowsHelixQueue>
+ <IsWindowsHelixQueue Condition="$(HelixTargetQueue.Contains('Windows')) or $(HelixTargetQueue.Contains('windows'))">true</IsWindowsHelixQueue>
+ <IsMacHelixQueue>false</IsMacHelixQueue>
+ <IsMacHelixQueue Condition="$(HelixTargetQueue.Contains('OSX')) or $(HelixTargetQueue.Contains('macOs'))">true</IsMacHelixQueue>
+ </PropertyGroup>
</Project>
diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props
index bc0dfe046e..dc2bad9552 100644
--- a/eng/targets/Helix.props
+++ b/eng/targets/Helix.props
@@ -14,10 +14,6 @@
<HelixTimeout>00:30:00</HelixTimeout>
<HelixTimeout Condition="$(HelixTargetQueue.StartsWith('Windows.10.Amd64'))">00:40:00</HelixTimeout>
<RunQuarantinedTests>false</RunQuarantinedTests>
- <IsWindowsHelixQueue>false</IsWindowsHelixQueue>
- <IsWindowsHelixQueue Condition="$(HelixTargetQueue.Contains('Windows')) or $(HelixTargetQueue.Contains('windows'))">true</IsWindowsHelixQueue>
- <IsMacHelixQueue>false</IsMacHelixQueue>
- <IsMacHelixQueue Condition="$(HelixTargetQueue.Contains('OSX')) or $(HelixTargetQueue.Contains('macOs'))">true</IsMacHelixQueue>
<HelixTestName>$(MSBuildProjectName)--$(TargetFramework)</HelixTestName>
<LoggingTestingDisableFileLogging Condition="'$(IsHelixJob)' == 'true'">false</LoggingTestingDisableFileLogging>
<NodeVersion>14.17.6</NodeVersion>