Skip to content

Commit 85a61e0

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20230616.6 (#48895)
[main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 8.0.0-beta.23309.3 to 8.0.0-beta.23314.2 (parent: Microsoft.DotNet.Arcade.Sdk)
1 parent 9178b9b commit 85a61e0

File tree

4 files changed

+22
-18
lines changed

4 files changed

+22
-18
lines changed

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -359,31 +359,31 @@
359359
<Uri>https://github.com/dotnet/runtime</Uri>
360360
<Sha>2c62994efb2495dcaef2312de3ab25ea4792b23a</Sha>
361361
</Dependency>
362-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23312.4">
362+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23316.6">
363363
<Uri>https://github.com/dotnet/arcade</Uri>
364-
<Sha>f3952775e6d00a5b6f43b0615a8a766e095185eb</Sha>
364+
<Sha>e2334b2be36919347923d0ec872a46acddb1e385</Sha>
365365
<SourceBuild RepoName="arcade" ManagedOnly="true" />
366366
</Dependency>
367-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23309.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
367+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23314.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
368368
<Uri>https://github.com/dotnet/sourcelink</Uri>
369-
<Sha>23bda65700e70b6697390dcc4e0f87e2dfbce63a</Sha>
369+
<Sha>4d2c8bf58e8cb7900ec2d9077c155572e2d3cd88</Sha>
370370
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
371371
</Dependency>
372-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23312.4">
372+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23316.6">
373373
<Uri>https://github.com/dotnet/arcade</Uri>
374-
<Sha>f3952775e6d00a5b6f43b0615a8a766e095185eb</Sha>
374+
<Sha>e2334b2be36919347923d0ec872a46acddb1e385</Sha>
375375
</Dependency>
376-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23312.4">
376+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23316.6">
377377
<Uri>https://github.com/dotnet/arcade</Uri>
378-
<Sha>f3952775e6d00a5b6f43b0615a8a766e095185eb</Sha>
378+
<Sha>e2334b2be36919347923d0ec872a46acddb1e385</Sha>
379379
</Dependency>
380-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23312.4">
380+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23316.6">
381381
<Uri>https://github.com/dotnet/arcade</Uri>
382-
<Sha>f3952775e6d00a5b6f43b0615a8a766e095185eb</Sha>
382+
<Sha>e2334b2be36919347923d0ec872a46acddb1e385</Sha>
383383
</Dependency>
384-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23312.4">
384+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23316.6">
385385
<Uri>https://github.com/dotnet/arcade</Uri>
386-
<Sha>f3952775e6d00a5b6f43b0615a8a766e095185eb</Sha>
386+
<Sha>e2334b2be36919347923d0ec872a46acddb1e385</Sha>
387387
</Dependency>
388388
<Dependency Name="NuGet.Frameworks" Version="6.2.4">
389389
<Uri>https://github.com/nuget/nuget.client</Uri>

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,11 @@
154154
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
155155
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
156156
<!-- Packages from dotnet/arcade -->
157-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23312.4</MicrosoftDotNetBuildTasksInstallersVersion>
158-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23312.4</MicrosoftDotNetBuildTasksTemplatingVersion>
159-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23312.4</MicrosoftDotNetRemoteExecutorVersion>
157+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23316.6</MicrosoftDotNetBuildTasksInstallersVersion>
158+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23316.6</MicrosoftDotNetBuildTasksTemplatingVersion>
159+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23316.6</MicrosoftDotNetRemoteExecutorVersion>
160160
<!-- Packages from dotnet/source-link -->
161-
<MicrosoftSourceLinkGitHubVersion>8.0.0-beta.23309.3</MicrosoftSourceLinkGitHubVersion>
161+
<MicrosoftSourceLinkGitHubVersion>8.0.0-beta.23314.2</MicrosoftSourceLinkGitHubVersion>
162162
<!-- Packages from dotnet/source-build-externals -->
163163
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23305.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
164164
<!-- Packages from dotnet/source-build-reference-packages -->

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
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23312.4",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23312.4"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23316.6",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23316.6"
3232
}
3333
}

0 commit comments

Comments
 (0)