Skip to content

Commit b1c4bad

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20231110.1 (#8421)
[main] Update dependencies from dotnet/arcade
1 parent 437421e commit b1c4bad

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -157,25 +157,25 @@
157157
</Dependency>
158158
</ProductDependencies>
159159
<ToolsetDependencies>
160-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23559.3">
160+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23560.1">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
162+
<Sha>576b0a6fca70266087aa247d68896376ecec8c6e</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23559.3">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23560.1">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
166+
<Sha>576b0a6fca70266087aa247d68896376ecec8c6e</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23559.3">
168+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23560.1">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
170+
<Sha>576b0a6fca70266087aa247d68896376ecec8c6e</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.23559.3">
172+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.23560.1">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
174+
<Sha>576b0a6fca70266087aa247d68896376ecec8c6e</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.23559.3">
176+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.23560.1">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
178+
<Sha>576b0a6fca70266087aa247d68896376ecec8c6e</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
181181
<Uri>https://github.com/dotnet/sourcelink</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
</PropertyGroup>
4949
<!-- Packages that come from https://github.com/dotnet/arcade -->
5050
<PropertyGroup>
51-
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.23559.3</MicrosoftDotNetApiCompatVersion>
52-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.23559.3</MicrosoftDotNetCodeAnalysisPackageVersion>
51+
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.23560.1</MicrosoftDotNetApiCompatVersion>
52+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.23560.1</MicrosoftDotNetCodeAnalysisPackageVersion>
5353
</PropertyGroup>
5454
<!-- Sourcelink -->
5555
<PropertyGroup>

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
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23559.3",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23559.3"
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23560.1",
16+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23560.1"
1717
},
1818
"sdk": {
1919
"version": "9.0.100-alpha.1.23511.2"

0 commit comments

Comments
 (0)