Skip to content

Commit 201617b

Browse files
author
v-wuzhai
authored
[main] Update dependencies from dotnet/arcade (#47623)
2 parents 5835685 + 7c04001 commit 201617b

File tree

7 files changed

+34
-106
lines changed

7 files changed

+34
-106
lines changed

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -640,34 +640,34 @@
640640
</Dependency>
641641
</ProductDependencies>
642642
<ToolsetDependencies>
643-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25163.2">
643+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25164.6">
644644
<Uri>https://github.com/dotnet/arcade</Uri>
645-
<Sha>8e4ea93f74bfbefa0df803dc8c842fa4cf65502c</Sha>
645+
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
646646
</Dependency>
647-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25163.2">
647+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25164.6">
648648
<Uri>https://github.com/dotnet/arcade</Uri>
649-
<Sha>8e4ea93f74bfbefa0df803dc8c842fa4cf65502c</Sha>
649+
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
650650
</Dependency>
651-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25163.2">
651+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25164.6">
652652
<Uri>https://github.com/dotnet/arcade</Uri>
653-
<Sha>8e4ea93f74bfbefa0df803dc8c842fa4cf65502c</Sha>
653+
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
654654
</Dependency>
655-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25163.2">
655+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25164.6">
656656
<Uri>https://github.com/dotnet/arcade</Uri>
657-
<Sha>8e4ea93f74bfbefa0df803dc8c842fa4cf65502c</Sha>
657+
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
658658
</Dependency>
659-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25163.2">
659+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25164.6">
660660
<Uri>https://github.com/dotnet/arcade</Uri>
661-
<Sha>8e4ea93f74bfbefa0df803dc8c842fa4cf65502c</Sha>
661+
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
662662
</Dependency>
663-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25163.2">
663+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25164.6">
664664
<Uri>https://github.com/dotnet/arcade</Uri>
665-
<Sha>8e4ea93f74bfbefa0df803dc8c842fa4cf65502c</Sha>
665+
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
666666
</Dependency>
667667
<!-- Intermediate is necessary for source build. -->
668-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25163.2">
668+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25164.6">
669669
<Uri>https://github.com/dotnet/arcade</Uri>
670-
<Sha>8e4ea93f74bfbefa0df803dc8c842fa4cf65502c</Sha>
670+
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
671671
<SourceBuild RepoName="arcade" ManagedOnly="true" />
672672
</Dependency>
673673
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.3.25162.19">

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,10 @@
276276
</PropertyGroup>
277277
<PropertyGroup>
278278
<!-- Dependencies from https://github.com/dotnet/arcade -->
279-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25163.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
280-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25163.2</MicrosoftDotNetSignToolVersion>
281-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25163.2</MicrosoftDotNetXliffTasksVersion>
282-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25163.2</MicrosoftDotNetXUnitExtensionsVersion>
279+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25164.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
280+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25164.6</MicrosoftDotNetSignToolVersion>
281+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25164.6</MicrosoftDotNetXliffTasksVersion>
282+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25164.6</MicrosoftDotNetXUnitExtensionsVersion>
283283
</PropertyGroup>
284284
<PropertyGroup>
285285
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/cross/armel/armel.jessie.patch

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎eng/common/cross/build-rootfs.sh

Lines changed: 12 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,13 @@ while :; do
164164
armel)
165165
__BuildArch=armel
166166
__UbuntuArch=armel
167-
__UbuntuRepo="http://ftp.debian.org/debian/"
168-
__CodeName=jessie
167+
__UbuntuRepo="http://archive.debian.org/debian/"
168+
__CodeName=buster
169169
__KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
170+
__LLDB_Package="liblldb-6.0-dev"
171+
__UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
172+
__UbuntuPackages="${__UbuntuPackages// libomp5/}"
173+
__UbuntuSuites=
170174
;;
171175
armv6)
172176
__BuildArch=armv6
@@ -278,46 +282,23 @@ while :; do
278282

279283
;;
280284
xenial) # Ubuntu 16.04
281-
if [[ "$__CodeName" != "jessie" ]]; then
282-
__CodeName=xenial
283-
fi
284-
;;
285-
zesty) # Ubuntu 17.04
286-
if [[ "$__CodeName" != "jessie" ]]; then
287-
__CodeName=zesty
288-
fi
285+
__CodeName=xenial
289286
;;
290287
bionic) # Ubuntu 18.04
291-
if [[ "$__CodeName" != "jessie" ]]; then
292-
__CodeName=bionic
293-
fi
288+
__CodeName=bionic
294289
;;
295290
focal) # Ubuntu 20.04
296-
if [[ "$__CodeName" != "jessie" ]]; then
297-
__CodeName=focal
298-
fi
291+
__CodeName=focal
299292
;;
300293
jammy) # Ubuntu 22.04
301-
if [[ "$__CodeName" != "jessie" ]]; then
302-
__CodeName=jammy
303-
fi
294+
__CodeName=jammy
304295
;;
305296
noble) # Ubuntu 24.04
306-
if [[ "$__CodeName" != "jessie" ]]; then
307-
__CodeName=noble
308-
fi
297+
__CodeName=noble
309298
if [[ -n "$__LLDB_Package" ]]; then
310299
__LLDB_Package="liblldb-18-dev"
311300
fi
312301
;;
313-
jessie) # Debian 8
314-
__CodeName=jessie
315-
__KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
316-
317-
if [[ -z "$__UbuntuRepo" ]]; then
318-
__UbuntuRepo="http://ftp.debian.org/debian/"
319-
fi
320-
;;
321302
stretch) # Debian 9
322303
__CodeName=stretch
323304
__LLDB_Package="liblldb-6.0-dev"
@@ -333,7 +314,7 @@ while :; do
333314
__KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
334315

335316
if [[ -z "$__UbuntuRepo" ]]; then
336-
__UbuntuRepo="http://ftp.debian.org/debian/"
317+
__UbuntuRepo="http://archive.debian.org/debian/"
337318
fi
338319
;;
339320
bullseye) # Debian 11
@@ -473,10 +454,6 @@ if [[ "$__AlpineVersion" =~ 3\.1[345] ]]; then
473454
__AlpinePackages="${__AlpinePackages/compiler-rt/compiler-rt-static}"
474455
fi
475456

476-
if [[ "$__BuildArch" == "armel" ]]; then
477-
__LLDB_Package="lldb-3.5-dev"
478-
fi
479-
480457
__UbuntuPackages+=" ${__LLDB_Package:-}"
481458

482459
if [[ -z "$__UbuntuRepo" ]]; then
@@ -850,12 +827,6 @@ EOF
850827
if [[ "$__SkipUnmount" == "0" ]]; then
851828
umount "$__RootfsDir"/* || true
852829
fi
853-
854-
if [[ "$__BuildArch" == "armel" && "$__CodeName" == "jessie" ]]; then
855-
pushd "$__RootfsDir"
856-
patch -p1 < "$__CrossDir/$__BuildArch/armel.jessie.patch"
857-
popd
858-
fi
859830
elif [[ "$__Tizen" == "tizen" ]]; then
860831
ROOTFS_DIR="$__RootfsDir" "$__CrossDir/tizen-build-rootfs.sh" "$__BuildArch"
861832
else

‎eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +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://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1"
265+
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
266266

267267
Retry({
268268
Write-Host "GET $uri"

‎eng/common/tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +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://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh"
298+
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
299299

300300
if [[ ! -a "$install_script" ]]; then
301301
mkdir -p "$root"

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25163.2",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25163.2",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25164.6",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25164.6",
1919
"Microsoft.Build.NoTargets": "3.7.0"
2020
}
2121
}

0 commit comments

Comments
 (0)