From e8274de2ade2451d75300ee7fac4f4a2c240d40d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 17 Sep 2021 13:01:04 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20210916.4 (#12014)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21425.4 to 7.0.0-alpha.1.21426.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21425.4 to 7.0.0-alpha.1.21426.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21425.4 to 7.0.0-alpha.1.21426.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21425.4 to 7.0.0-alpha.1.21426.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21425.4 to 7.0.0-alpha.1.21426.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21425.4 to 7.0.0-alpha.1.21426.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21425.4 to 7.0.0-alpha.1.21426.1 (parent: Microsoft.NET.Sdk)
- Microsoft.SourceBuild.Intermediate.source-build: from 0.1.0-alpha.1.21318.1 to 0.1.0-alpha.1.21426.1 (parent: Microsoft.NET.Sdk)
- Microsoft.SourceLink.GitHub: from 1.1.0-beta-21456-02 to 1.1.0-beta-21463-02 (parent: Microsoft.DotNet.Arcade.Sdk)
---
eng/Version.Details.xml | 48 ++++++++++++++++++++---------------------
eng/Versions.props | 16 +++++++-------
eng/common/tools.ps1 | 4 ++++
eng/common/tools.sh | 4 ++++
global.json | 4 ++--
5 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 54282eba2..4265f5076 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -17,29 +17,29 @@
https://github.com/dotnet/windowsdesktop
f10a0994b775e50974e028194f1c27790a7cea00
-
+
https://github.com/dotnet/runtime
- e9108608eacb3a40a5a0ee6278e60de71a00a59d
+ 48090398ac359a8862a87682b3265cb3e2f80a9d
-
+
https://github.com/dotnet/runtime
- e9108608eacb3a40a5a0ee6278e60de71a00a59d
+ 48090398ac359a8862a87682b3265cb3e2f80a9d
-
+
https://github.com/dotnet/runtime
- e9108608eacb3a40a5a0ee6278e60de71a00a59d
+ 48090398ac359a8862a87682b3265cb3e2f80a9d
-
+
https://github.com/dotnet/runtime
- e9108608eacb3a40a5a0ee6278e60de71a00a59d
+ 48090398ac359a8862a87682b3265cb3e2f80a9d
-
+
https://github.com/dotnet/runtime
- e9108608eacb3a40a5a0ee6278e60de71a00a59d
+ 48090398ac359a8862a87682b3265cb3e2f80a9d
-
+
https://github.com/dotnet/runtime
- e9108608eacb3a40a5a0ee6278e60de71a00a59d
+ 48090398ac359a8862a87682b3265cb3e2f80a9d
@@ -47,9 +47,9 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://github.com/dotnet/runtime
- e9108608eacb3a40a5a0ee6278e60de71a00a59d
+ 48090398ac359a8862a87682b3265cb3e2f80a9d
https://github.com/dotnet/aspnetcore
@@ -162,34 +162,34 @@
https://github.com/dotnet/emsdk
9f2345b3c5f43dbf34790e21657ae1f2445cd06a
-
+
https://github.com/dotnet/source-build
- 3fb25b8db3bec654e37e71a5b2b7fde14444bc2f
+ c96e044a8031b92e840142eab84b85a45fa9c4c0
-
+
https://github.com/dotnet/arcade
- 4b7c80f398fd3dcea03fdc4e454789b61181d300
+ 734d875ba2abfb5c8f5f52368e7d4711ee366e31
-
+
https://github.com/dotnet/arcade
- 4b7c80f398fd3dcea03fdc4e454789b61181d300
+ 734d875ba2abfb5c8f5f52368e7d4711ee366e31
-
+
https://github.com/dotnet/arcade
- 4b7c80f398fd3dcea03fdc4e454789b61181d300
+ 734d875ba2abfb5c8f5f52368e7d4711ee366e31
https://github.com/dotnet/source-build-reference-packages
639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1
-
+
https://github.com/dotnet/sourcelink
- 389b28318be327cc8c48259f8134b784e52799f8
+ 0dbfbe2a408cce8438298ded794166353c860bcb
diff --git a/eng/Versions.props b/eng/Versions.props
index 9d7383d72..22030a818 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
- 7.0.0-beta.21463.4
+ 7.0.0-beta.21466.4
@@ -65,16 +65,16 @@
- 7.0.0-alpha.1.21425.4
+ 7.0.0-alpha.1.21426.1
- 7.0.0-alpha.1.21425.4
- 7.0.0-alpha.1.21425.4
- 7.0.0-alpha.1.21425.4
- 7.0.0-alpha.1.21425.4
- 7.0.0-alpha.1.21425.4
- 7.0.0-alpha.1.21425.4
+ 7.0.0-alpha.1.21426.1
+ 7.0.0-alpha.1.21426.1
+ 7.0.0-alpha.1.21426.1
+ 7.0.0-alpha.1.21426.1
+ 7.0.0-alpha.1.21426.1
+ 7.0.0-alpha.1.21426.1
2.1.0
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 67eca67b0..02347914f 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -157,6 +157,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
$env:DOTNET_MULTILEVEL_LOOKUP=0
+ # Disable first run since we do not need all ASP.NET packages restored.
+ $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+
# Disable telemetry on CI.
if ($ci) {
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
@@ -228,6 +231,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
Write-PipelinePrependPath -Path $dotnetRoot
Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0'
+ Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1'
return $global:_DotNetInstallDir = $dotnetRoot
}
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 6ddf2fea1..6a4871ef7 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -111,6 +111,9 @@ function InitializeDotNetCli {
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
export DOTNET_MULTILEVEL_LOOKUP=0
+ # Disable first run since we want to control all package sources
+ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+
# Disable telemetry on CI
if [[ $ci == true ]]; then
export DOTNET_CLI_TELEMETRY_OPTOUT=1
@@ -162,6 +165,7 @@ function InitializeDotNetCli {
Write-PipelinePrependPath -path "$dotnet_root"
Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0"
+ Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1"
# return value
_InitializeDotNetCli="$dotnet_root"
diff --git a/global.json b/global.json
index ec8d38fce..a1c3cf424 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21463.4",
- "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21463.4"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21466.4",
+ "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21466.4"
}
}