Skip to content

Commit a2840df

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Update dependencies from https://github.com/dotnet/arcade build 20241226.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk From Version 10.0.0-beta.24622.1 -> To Version 10.0.0-beta.24626.1
1 parent 18e00de commit a2840df

File tree

5 files changed

+28
-32
lines changed

5 files changed

+28
-32
lines changed

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -388,39 +388,39 @@
388388
<Uri>https://github.com/dotnet/runtime</Uri>
389389
<Sha>208b974f93c0ee35a171eba374ca36aa9a78e930</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24622.1">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24626.1">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
393+
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24622.1">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24626.1">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
398+
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24622.1">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24626.1">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
403+
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24622.1">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24626.1">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
407+
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24622.1">
409+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24626.1">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
411+
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24622.1">
413+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24626.1">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
415+
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24622.1">
417+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24626.1">
418418
<Uri>https://github.com/dotnet/arcade</Uri>
419-
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
419+
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24622.1">
421+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24626.1">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
423+
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
424424
</Dependency>
425425
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.24620.1">
426426
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@
166166
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
167167
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
168168
<!-- Packages from dotnet/arcade -->
169-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24622.1</MicrosoftDotNetBuildTasksArchivesVersion>
170-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24622.1</MicrosoftDotNetBuildTasksInstallersVersion>
171-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24622.1</MicrosoftDotNetBuildTasksTemplatingVersion>
172-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24622.1</MicrosoftDotNetRemoteExecutorVersion>
173-
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24622.1</MicrosoftSourceBuildIntermediatearcadeVersion>
169+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24626.1</MicrosoftDotNetBuildTasksArchivesVersion>
170+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24626.1</MicrosoftDotNetBuildTasksInstallersVersion>
171+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24626.1</MicrosoftDotNetBuildTasksTemplatingVersion>
172+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24626.1</MicrosoftDotNetRemoteExecutorVersion>
173+
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24626.1</MicrosoftSourceBuildIntermediatearcadeVersion>
174174
<!-- Packages from dotnet/source-build-externals -->
175175
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.561902</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
176176
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/tools.ps1‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
262262
if (!(Test-Path $installScript)) {
263263
Create-Directory $dotnetRoot
264264
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
265-
# $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
266-
# Pre-flighting new install script
267-
$uri = "https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.ps1"
265+
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
268266

269267
Retry({
270268
Write-Host "GET $uri"
@@ -322,7 +320,7 @@ function InstallDotNet([string] $dotnetRoot,
322320
$variations += @($installParameters)
323321

324322
$dotnetBuilds = $installParameters.Clone()
325-
$dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public"
323+
$dotnetbuilds.AzureFeed = "https://ci.dot.net/public"
326324
$variations += @($dotnetBuilds)
327325

328326
if ($runtimeSourceFeed) {

‎eng/common/tools.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ function InstallDotNet {
232232
local public_location=("${installParameters[@]}")
233233
variations+=(public_location)
234234

235-
local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public")
235+
local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public")
236236
variations+=(dotnetbuilds)
237237

238238
if [[ -n "${6:-}" ]]; then
@@ -295,9 +295,7 @@ function with_retries {
295295
function GetDotNetInstallScript {
296296
local root=$1
297297
local install_script="$root/dotnet-install.sh"
298-
# local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
299-
# Pre-flight install script
300-
local install_script_url="https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.sh"
298+
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
301299

302300
if [[ ! -a "$install_script" ]]; then
303301
mkdir -p "$root"

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "11.0.24"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24622.1",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24622.1",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24622.1",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24626.1",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24626.1",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24626.1",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

0 commit comments

Comments
 (0)