Skip to content

Commit e8274de

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
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)
1 parent 5c6d74b commit e8274de

File tree

5 files changed

+42
-34
lines changed

5 files changed

+42
-34
lines changed

‎eng/Version.Details.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,39 +17,39 @@
1717
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
1818
<Sha>f10a0994b775e50974e028194f1c27790a7cea00</Sha>
1919
</Dependency>
20-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21425.4" CoherentParentDependency="Microsoft.NET.Sdk">
20+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21426.1" CoherentParentDependency="Microsoft.NET.Sdk">
2121
<Uri>https://github.com/dotnet/runtime</Uri>
22-
<Sha>e9108608eacb3a40a5a0ee6278e60de71a00a59d</Sha>
22+
<Sha>48090398ac359a8862a87682b3265cb3e2f80a9d</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-alpha.1.21425.4" CoherentParentDependency="Microsoft.NET.Sdk">
24+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-alpha.1.21426.1" CoherentParentDependency="Microsoft.NET.Sdk">
2525
<Uri>https://github.com/dotnet/runtime</Uri>
26-
<Sha>e9108608eacb3a40a5a0ee6278e60de71a00a59d</Sha>
26+
<Sha>48090398ac359a8862a87682b3265cb3e2f80a9d</Sha>
2727
</Dependency>
28-
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-alpha.1.21425.4" CoherentParentDependency="Microsoft.NET.Sdk">
28+
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-alpha.1.21426.1" CoherentParentDependency="Microsoft.NET.Sdk">
2929
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>e9108608eacb3a40a5a0ee6278e60de71a00a59d</Sha>
30+
<Sha>48090398ac359a8862a87682b3265cb3e2f80a9d</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21425.4" CoherentParentDependency="Microsoft.NET.Sdk">
32+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21426.1" CoherentParentDependency="Microsoft.NET.Sdk">
3333
<Uri>https://github.com/dotnet/runtime</Uri>
34-
<Sha>e9108608eacb3a40a5a0ee6278e60de71a00a59d</Sha>
34+
<Sha>48090398ac359a8862a87682b3265cb3e2f80a9d</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-alpha.1.21425.4" CoherentParentDependency="Microsoft.NET.Sdk">
36+
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-alpha.1.21426.1" CoherentParentDependency="Microsoft.NET.Sdk">
3737
<Uri>https://github.com/dotnet/runtime</Uri>
38-
<Sha>e9108608eacb3a40a5a0ee6278e60de71a00a59d</Sha>
38+
<Sha>48090398ac359a8862a87682b3265cb3e2f80a9d</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-alpha.1.21425.4" CoherentParentDependency="Microsoft.NET.Sdk">
40+
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-alpha.1.21426.1" CoherentParentDependency="Microsoft.NET.Sdk">
4141
<Uri>https://github.com/dotnet/runtime</Uri>
42-
<Sha>e9108608eacb3a40a5a0ee6278e60de71a00a59d</Sha>
42+
<Sha>48090398ac359a8862a87682b3265cb3e2f80a9d</Sha>
4343
</Dependency>
4444
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
4545
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
4646
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
4747
<Uri>https://github.com/dotnet/core-setup</Uri>
4848
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-alpha.1.21425.4" CoherentParentDependency="Microsoft.NET.Sdk">
50+
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-alpha.1.21426.1" CoherentParentDependency="Microsoft.NET.Sdk">
5151
<Uri>https://github.com/dotnet/runtime</Uri>
52-
<Sha>e9108608eacb3a40a5a0ee6278e60de71a00a59d</Sha>
52+
<Sha>48090398ac359a8862a87682b3265cb3e2f80a9d</Sha>
5353
</Dependency>
5454
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-alpha.1.21426.33" CoherentParentDependency="Microsoft.NET.Sdk">
5555
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -162,34 +162,34 @@
162162
<Uri>https://github.com/dotnet/emsdk</Uri>
163163
<Sha>9f2345b3c5f43dbf34790e21657ae1f2445cd06a</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21318.1" CoherentParentDependency="Microsoft.NET.Sdk">
165+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21426.1" CoherentParentDependency="Microsoft.NET.Sdk">
166166
<Uri>https://github.com/dotnet/source-build</Uri>
167-
<Sha>3fb25b8db3bec654e37e71a5b2b7fde14444bc2f</Sha>
167+
<Sha>c96e044a8031b92e840142eab84b85a45fa9c4c0</Sha>
168168
<SourceBuild RepoName="source-build" ManagedOnly="true" />
169169
</Dependency>
170170
</ProductDependencies>
171171
<ToolsetDependencies>
172-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21463.4">
172+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21466.4">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>4b7c80f398fd3dcea03fdc4e454789b61181d300</Sha>
174+
<Sha>734d875ba2abfb5c8f5f52368e7d4711ee366e31</Sha>
175175
<SourceBuild RepoName="arcade" ManagedOnly="true" />
176176
</Dependency>
177-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21463.4">
177+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21466.4">
178178
<Uri>https://github.com/dotnet/arcade</Uri>
179-
<Sha>4b7c80f398fd3dcea03fdc4e454789b61181d300</Sha>
179+
<Sha>734d875ba2abfb5c8f5f52368e7d4711ee366e31</Sha>
180180
<SourceBuild RepoName="arcade" ManagedOnly="true" />
181181
</Dependency>
182-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21463.4">
182+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21466.4">
183183
<Uri>https://github.com/dotnet/arcade</Uri>
184-
<Sha>4b7c80f398fd3dcea03fdc4e454789b61181d300</Sha>
184+
<Sha>734d875ba2abfb5c8f5f52368e7d4711ee366e31</Sha>
185185
</Dependency>
186186
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
187187
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
188188
<Sha>639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1</Sha>
189189
</Dependency>
190-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21456-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
190+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21463-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
191191
<Uri>https://github.com/dotnet/sourcelink</Uri>
192-
<Sha>389b28318be327cc8c48259f8134b784e52799f8</Sha>
192+
<Sha>0dbfbe2a408cce8438298ded794166353c860bcb</Sha>
193193
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
194194
</Dependency>
195195
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.21452.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

‎eng/Versions.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</PropertyGroup>
2121
<PropertyGroup>
2222
<!-- Dependency from https://github.com/dotnet/arcade -->
23-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21463.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
23+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21466.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
2424
</PropertyGroup>
2525
<PropertyGroup>
2626
<!-- Dependency from https://github.com/dotnet/winforms -->
@@ -65,16 +65,16 @@
6565
</PropertyGroup>
6666
<PropertyGroup>
6767
<!-- Dependencies from https://github.com/dotnet/corefx -->
68-
<MicrosoftNETCorePlatformsPackageVersion>7.0.0-alpha.1.21425.4</MicrosoftNETCorePlatformsPackageVersion>
68+
<MicrosoftNETCorePlatformsPackageVersion>7.0.0-alpha.1.21426.1</MicrosoftNETCorePlatformsPackageVersion>
6969
</PropertyGroup>
7070
<PropertyGroup>
7171
<!-- Dependencies from https://github.com/dotnet/core-setup -->
72-
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21425.4</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
73-
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.0-alpha.1.21425.4</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
74-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21425.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
75-
<MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.0-alpha.1.21425.4</MicrosoftNETCoreAppHostwinx64PackageVersion>
76-
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-alpha.1.21425.4</MicrosoftNETCoreAppRefPackageVersion>
77-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-alpha.1.21425.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
72+
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21426.1</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
73+
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.0-alpha.1.21426.1</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
74+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21426.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
75+
<MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.0-alpha.1.21426.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
76+
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-alpha.1.21426.1</MicrosoftNETCoreAppRefPackageVersion>
77+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-alpha.1.21426.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
7878
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
7979
</PropertyGroup>
8080
<PropertyGroup>

‎eng/common/tools.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
157157
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
158158
$env:DOTNET_MULTILEVEL_LOOKUP=0
159159

160+
# Disable first run since we do not need all ASP.NET packages restored.
161+
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
162+
160163
# Disable telemetry on CI.
161164
if ($ci) {
162165
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
@@ -228,6 +231,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
228231
Write-PipelinePrependPath -Path $dotnetRoot
229232

230233
Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0'
234+
Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1'
231235

232236
return $global:_DotNetInstallDir = $dotnetRoot
233237
}

‎eng/common/tools.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ function InitializeDotNetCli {
111111
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
112112
export DOTNET_MULTILEVEL_LOOKUP=0
113113

114+
# Disable first run since we want to control all package sources
115+
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
116+
114117
# Disable telemetry on CI
115118
if [[ $ci == true ]]; then
116119
export DOTNET_CLI_TELEMETRY_OPTOUT=1
@@ -162,6 +165,7 @@ function InitializeDotNetCli {
162165
Write-PipelinePrependPath -path "$dotnet_root"
163166

164167
Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0"
168+
Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1"
165169

166170
# return value
167171
_InitializeDotNetCli="$dotnet_root"

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"cmake": "3.16.4"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21463.4",
15-
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21463.4"
14+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21466.4",
15+
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21466.4"
1616
}
1717
}

0 commit comments

Comments
 (0)