Skip to content

Commit f212768

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20231110.1 (#52011)
[main] Update dependencies from dotnet/arcade
1 parent e3014a4 commit f212768

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -371,26 +371,26 @@
371371
<Uri>https://github.com/dotnet/winforms</Uri>
372372
<Sha>63643f83990d9049fc02d69b470ae4c06a6874ef</Sha>
373373
</Dependency>
374-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23558.3">
374+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23560.1">
375375
<Uri>https://github.com/dotnet/arcade</Uri>
376-
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
376+
<Sha>576b0a6fca70266087aa247d68896376ecec8c6e</Sha>
377377
<SourceBuild RepoName="arcade" ManagedOnly="true" />
378378
</Dependency>
379-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23558.3">
379+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23560.1">
380380
<Uri>https://github.com/dotnet/arcade</Uri>
381-
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
381+
<Sha>576b0a6fca70266087aa247d68896376ecec8c6e</Sha>
382382
</Dependency>
383-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.23558.3">
383+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.23560.1">
384384
<Uri>https://github.com/dotnet/arcade</Uri>
385-
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
385+
<Sha>576b0a6fca70266087aa247d68896376ecec8c6e</Sha>
386386
</Dependency>
387-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23558.3">
387+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23560.1">
388388
<Uri>https://github.com/dotnet/arcade</Uri>
389-
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
389+
<Sha>576b0a6fca70266087aa247d68896376ecec8c6e</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.23558.3">
391+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.23560.1">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
393+
<Sha>576b0a6fca70266087aa247d68896376ecec8c6e</Sha>
394394
</Dependency>
395395
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-alpha.1.23553.1">
396396
<Uri>https://github.com/dotnet/extensions</Uri>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@
160160
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
161161
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
162162
<!-- Packages from dotnet/arcade -->
163-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.23558.3</MicrosoftDotNetBuildTasksInstallersVersion>
164-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23558.3</MicrosoftDotNetBuildTasksTemplatingVersion>
165-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.23558.3</MicrosoftDotNetRemoteExecutorVersion>
163+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.23560.1</MicrosoftDotNetBuildTasksInstallersVersion>
164+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23560.1</MicrosoftDotNetBuildTasksTemplatingVersion>
165+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.23560.1</MicrosoftDotNetRemoteExecutorVersion>
166166
<!-- Packages from dotnet/source-build-externals -->
167167
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.23530.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
168168
<!-- Packages from dotnet/source-build-reference-packages -->

eng/common/cross/toolchain.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
288288
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
289289
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
290290
endif()
291+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
292+
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
291293
elseif(TARGET_ARCH_NAME STREQUAL "x86")
292294
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
293295
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
@@ -335,6 +337,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
335337
if(TARGET_ARCH_NAME STREQUAL "armel")
336338
add_compile_options(-mfloat-abi=softfp)
337339
endif()
340+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
341+
add_compile_options("--target=${TOOLCHAIN}")
338342
elseif(TARGET_ARCH_NAME STREQUAL "x86")
339343
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
340344
add_compile_options(--target=${TOOLCHAIN})

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": "9.0.0-beta.23558.3",
31-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23558.3"
30+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23560.1",
31+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23560.1"
3232
}
3333
}

0 commit comments

Comments
 (0)