Skip to content

Commit cf1c79d

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#13149)
[main] Update dependencies from dotnet/arcade
1 parent a2a72d8 commit cf1c79d

File tree

7 files changed

+32
-104
lines changed

7 files changed

+32
-104
lines changed

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
191191
</ProductDependencies>
192192
<ToolsetDependencies>
193193
<!-- Arcade -->
194-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25163.2">
194+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25164.4">
195195
<Uri>https://github.com/dotnet/arcade</Uri>
196-
<Sha>8e4ea93f74bfbefa0df803dc8c842fa4cf65502c</Sha>
196+
<Sha>6c1093b3501b0b08f4db5817f1d633a0f59267b2</Sha>
197197
</Dependency>
198-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25163.2">
198+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25164.4">
199199
<Uri>https://github.com/dotnet/arcade</Uri>
200-
<Sha>8e4ea93f74bfbefa0df803dc8c842fa4cf65502c</Sha>
200+
<Sha>6c1093b3501b0b08f4db5817f1d633a0f59267b2</Sha>
201201
</Dependency>
202-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25163.2">
202+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25164.4">
203203
<Uri>https://github.com/dotnet/arcade</Uri>
204-
<Sha>8e4ea93f74bfbefa0df803dc8c842fa4cf65502c</Sha>
204+
<Sha>6c1093b3501b0b08f4db5817f1d633a0f59267b2</Sha>
205205
</Dependency>
206-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25163.2">
206+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25164.4">
207207
<Uri>https://github.com/dotnet/arcade</Uri>
208-
<Sha>8e4ea93f74bfbefa0df803dc8c842fa4cf65502c</Sha>
208+
<Sha>6c1093b3501b0b08f4db5817f1d633a0f59267b2</Sha>
209209
</Dependency>
210-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25163.2">
210+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25164.4">
211211
<Uri>https://github.com/dotnet/arcade</Uri>
212-
<Sha>8e4ea93f74bfbefa0df803dc8c842fa4cf65502c</Sha>
212+
<Sha>6c1093b3501b0b08f4db5817f1d633a0f59267b2</Sha>
213213
</Dependency>
214-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25163.2">
214+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25164.4">
215215
<Uri>https://github.com/dotnet/arcade</Uri>
216-
<Sha>8e4ea93f74bfbefa0df803dc8c842fa4cf65502c</Sha>
216+
<Sha>6c1093b3501b0b08f4db5817f1d633a0f59267b2</Sha>
217217
</Dependency>
218218
</ToolsetDependencies>
219219
</Dependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
</PropertyGroup>
5757
<!-- Arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25163.2</MicrosoftDotNetGenFacadesPackageVersion>
60-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25163.2</MicrosoftDotNetRemoteExecutorVersion>
61-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25163.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
59+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25164.4</MicrosoftDotNetGenFacadesPackageVersion>
60+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25164.4</MicrosoftDotNetRemoteExecutorVersion>
61+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25164.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
6262
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
6363
</PropertyGroup>
6464
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"version": "10.0.100-preview.3.25125.5"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25163.2",
18-
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25163.2",
19-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25163.2",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25164.4",
18+
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25164.4",
19+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25164.4",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2121
"Microsoft.NET.Sdk.IL": "10.0.0-preview.3.25164.11"
2222
},

0 commit comments

Comments
 (0)