Skip to content

Commit ed4124f

Browse files
authored
[main] Update dependencies from dotnet/arcade (#16727)
2 parents 02277c3 + c5fa9b4 commit ed4124f

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -202,18 +202,18 @@
202202
</Dependency>
203203
</ProductDependencies>
204204
<ToolsetDependencies>
205-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23314.1">
205+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23316.6">
206206
<Uri>https://github.com/dotnet/arcade</Uri>
207-
<Sha>c27937680063bcf06804c9fd0466d26a0f9ea4e6</Sha>
207+
<Sha>e2334b2be36919347923d0ec872a46acddb1e385</Sha>
208208
<SourceBuild RepoName="arcade" ManagedOnly="true" />
209209
</Dependency>
210-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23314.1">
210+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23316.6">
211211
<Uri>https://github.com/dotnet/arcade</Uri>
212-
<Sha>c27937680063bcf06804c9fd0466d26a0f9ea4e6</Sha>
212+
<Sha>e2334b2be36919347923d0ec872a46acddb1e385</Sha>
213213
</Dependency>
214-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23314.1">
214+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23316.6">
215215
<Uri>https://github.com/dotnet/arcade</Uri>
216-
<Sha>c27937680063bcf06804c9fd0466d26a0f9ea4e6</Sha>
216+
<Sha>e2334b2be36919347923d0ec872a46acddb1e385</Sha>
217217
</Dependency>
218218
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23307.2">
219219
<Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -232,9 +232,9 @@
232232
<Sha>e5e8761172f338331f5df83eaea9abdf9a2dc1aa</Sha>
233233
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
234234
</Dependency>
235-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23309.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
235+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23314.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
236236
<Uri>https://github.com/dotnet/sourcelink</Uri>
237-
<Sha>23bda65700e70b6697390dcc4e0f87e2dfbce63a</Sha>
237+
<Sha>4d2c8bf58e8cb7900ec2d9077c155572e2d3cd88</Sha>
238238
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
239239
</Dependency>
240240
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23312.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</PropertyGroup>
3737
<PropertyGroup>
3838
<!-- Dependency from https://github.com/dotnet/arcade -->
39-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23314.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
39+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23316.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
4040
</PropertyGroup>
4141
<PropertyGroup>
4242
<!-- Dependency from https://github.com/dotnet/arcade-services -->

eng/common/dotnet-install.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ cpuname=$(uname -m)
5454
case $cpuname in
5555
arm64|aarch64)
5656
buildarch=arm64
57+
if [ "$(getconf LONG_BIT)" -lt 64 ]; then
58+
# This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
59+
buildarch=arm
60+
fi
5761
;;
5862
loongarch64)
5963
buildarch=loongarch64

global.json

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

0 commit comments

Comments
 (0)