Skip to content

Commit 36240fa

Browse files
Update dependencies from build 340367
Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 12.0.0-beta.26551.101 -> 12.0.0-beta.26556.115) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 12.0.0-alpha.1.26551.101 -> 12.0.0-alpha.1.26556.115) [[ commit created by automation ]]
1 parent 37a3e8c commit 36240fa

10 files changed

Lines changed: 68 additions & 132 deletions

File tree

‎NuGet.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-a586537-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-a586537b-1/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-dotnet -->
98
<!-- Begin: Package sources from dotnet-runtime -->
109
<!-- End: Package sources from dotnet-runtime -->

‎eng/Version.Details.props‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet-dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>12.0.0-beta.26551.101</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>12.0.0-beta.26551.101</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetHelixSdkPackageVersion>12.0.0-beta.26551.101</MicrosoftDotNetHelixSdkPackageVersion>
12-
<MicrosoftExtensionsCachingMemoryPackageVersion>12.0.0-alpha.1.26551.101</MicrosoftExtensionsCachingMemoryPackageVersion>
13-
<MicrosoftExtensionsConfigurationPackageVersion>12.0.0-alpha.1.26551.101</MicrosoftExtensionsConfigurationPackageVersion>
14-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>12.0.0-alpha.1.26551.101</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
15-
<MicrosoftExtensionsConfigurationJsonPackageVersion>12.0.0-alpha.1.26551.101</MicrosoftExtensionsConfigurationJsonPackageVersion>
16-
<MicrosoftExtensionsDependencyInjectionPackageVersion>12.0.0-alpha.1.26551.101</MicrosoftExtensionsDependencyInjectionPackageVersion>
17-
<MicrosoftExtensionsDependencyModelPackageVersion>12.0.0-alpha.1.26551.101</MicrosoftExtensionsDependencyModelPackageVersion>
18-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>12.0.0-alpha.1.26551.101</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
19-
<MicrosoftExtensionsLoggingPackageVersion>12.0.0-alpha.1.26551.101</MicrosoftExtensionsLoggingPackageVersion>
20-
<MicrosoftNETCoreAppRefPackageVersion>12.0.0-alpha.1.26551.101</MicrosoftNETCoreAppRefPackageVersion>
21-
<MicrosoftNETCorePlatformsPackageVersion>12.0.0-alpha.1.26551.101</MicrosoftNETCorePlatformsPackageVersion>
22-
<SystemFormatsAsn1PackageVersion>12.0.0-alpha.1.26551.101</SystemFormatsAsn1PackageVersion>
23-
<SystemRuntimeCachingPackageVersion>12.0.0-alpha.1.26551.101</SystemRuntimeCachingPackageVersion>
24-
<SystemTextEncodingsWebPackageVersion>12.0.0-alpha.1.26551.101</SystemTextEncodingsWebPackageVersion>
25-
<SystemTextJsonPackageVersion>12.0.0-alpha.1.26551.101</SystemTextJsonPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>12.0.0-beta.26556.115</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>12.0.0-beta.26556.115</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetHelixSdkPackageVersion>12.0.0-beta.26556.115</MicrosoftDotNetHelixSdkPackageVersion>
12+
<MicrosoftExtensionsCachingMemoryPackageVersion>12.0.0-alpha.1.26556.115</MicrosoftExtensionsCachingMemoryPackageVersion>
13+
<MicrosoftExtensionsConfigurationPackageVersion>12.0.0-alpha.1.26556.115</MicrosoftExtensionsConfigurationPackageVersion>
14+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>12.0.0-alpha.1.26556.115</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
15+
<MicrosoftExtensionsConfigurationJsonPackageVersion>12.0.0-alpha.1.26556.115</MicrosoftExtensionsConfigurationJsonPackageVersion>
16+
<MicrosoftExtensionsDependencyInjectionPackageVersion>12.0.0-alpha.1.26556.115</MicrosoftExtensionsDependencyInjectionPackageVersion>
17+
<MicrosoftExtensionsDependencyModelPackageVersion>12.0.0-alpha.1.26556.115</MicrosoftExtensionsDependencyModelPackageVersion>
18+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>12.0.0-alpha.1.26556.115</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
19+
<MicrosoftExtensionsLoggingPackageVersion>12.0.0-alpha.1.26556.115</MicrosoftExtensionsLoggingPackageVersion>
20+
<MicrosoftNETCoreAppRefPackageVersion>12.0.0-alpha.1.26556.115</MicrosoftNETCoreAppRefPackageVersion>
21+
<MicrosoftNETCorePlatformsPackageVersion>12.0.0-alpha.1.26556.115</MicrosoftNETCorePlatformsPackageVersion>
22+
<SystemFormatsAsn1PackageVersion>12.0.0-alpha.1.26556.115</SystemFormatsAsn1PackageVersion>
23+
<SystemRuntimeCachingPackageVersion>12.0.0-alpha.1.26556.115</SystemRuntimeCachingPackageVersion>
24+
<SystemTextEncodingsWebPackageVersion>12.0.0-alpha.1.26556.115</SystemTextEncodingsWebPackageVersion>
25+
<SystemTextJsonPackageVersion>12.0.0-alpha.1.26556.115</SystemTextJsonPackageVersion>
2626
</PropertyGroup>
2727
<!--Property group for alternate package version names-->
2828
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="e2a826638ffc3d7c2b3e72ccf827ddfe96269d57" BarId="339295" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="6e6f978fd9ca19b62796a13ff5230b21af0c42fa" BarId="340367" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="12.0.0-alpha.1.26551.101">
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="12.0.0-alpha.1.26556.115">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
7+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="12.0.0-alpha.1.26551.101">
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="12.0.0-alpha.1.26556.115">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
11+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="12.0.0-alpha.1.26551.101">
13+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="12.0.0-alpha.1.26556.115">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
15+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Extensions.Configuration" Version="12.0.0-alpha.1.26551.101">
17+
<Dependency Name="Microsoft.Extensions.Configuration" Version="12.0.0-alpha.1.26556.115">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
19+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="12.0.0-alpha.1.26551.101">
21+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="12.0.0-alpha.1.26556.115">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
23+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="12.0.0-alpha.1.26551.101">
25+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="12.0.0-alpha.1.26556.115">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
27+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="12.0.0-alpha.1.26551.101">
29+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="12.0.0-alpha.1.26556.115">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
31+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.Logging" Version="12.0.0-alpha.1.26551.101">
33+
<Dependency Name="Microsoft.Extensions.Logging" Version="12.0.0-alpha.1.26556.115">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
35+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="12.0.0-alpha.1.26551.101">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="12.0.0-alpha.1.26556.115">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
39+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.Platforms" Version="12.0.0-alpha.1.26551.101">
41+
<Dependency Name="Microsoft.NETCore.Platforms" Version="12.0.0-alpha.1.26556.115">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
43+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Text.Json" Version="12.0.0-alpha.1.26551.101">
45+
<Dependency Name="System.Text.Json" Version="12.0.0-alpha.1.26556.115">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
47+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Text.Encodings.Web" Version="12.0.0-alpha.1.26551.101">
49+
<Dependency Name="System.Text.Encodings.Web" Version="12.0.0-alpha.1.26556.115">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
51+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Formats.Asn1" Version="12.0.0-alpha.1.26551.101">
53+
<Dependency Name="System.Formats.Asn1" Version="12.0.0-alpha.1.26556.115">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
55+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Runtime.Caching" Version="12.0.0-alpha.1.26551.101">
57+
<Dependency Name="System.Runtime.Caching" Version="12.0.0-alpha.1.26556.115">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
59+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
6060
</Dependency>
6161
</ProductDependencies>
6262
<ToolsetDependencies>
63-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26551.101">
63+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26556.115">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
65+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
6666
</Dependency>
67-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="12.0.0-beta.26551.101">
67+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="12.0.0-beta.26556.115">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
69+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="12.0.0-beta.26551.101">
71+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="12.0.0-beta.26556.115">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
73+
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
7474
</Dependency>
7575
</ToolsetDependencies>
7676
</Dependencies>

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,10 @@ jobs:
187187
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
188188
is1ESPipeline: ${{ parameters.is1ESPipeline }}
189189

190-
# Darc is targeting 8.0, so make sure it's installed
190+
# Darc is targeting 10.0, so make sure it's installed
191191
- task: UseDotNet@2
192192
inputs:
193-
version: 8.0.x
193+
version: 10.0.x
194194

195195
- task: AzureCLI@2
196196
displayName: Publish Using Darc

‎eng/common/core-templates/post-build/post-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ stages:
301301

302302
- task: UseDotNet@2
303303
inputs:
304-
version: 8.0.x
304+
version: 10.0.x
305305

306306
- task: AzureCLI@2
307307
displayName: Publish Using Darc

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
usage()
66
{
77
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir <directory>]"
8-
echo "BuildArch can be: arm(default), arm64, loongarch64, ppc64le, riscv64, s390x, x64, x86"
8+
echo "BuildArch can be: arm(default), arm64, loongarch64, ppc64le, riscv64, s390x, x64"
99
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
1010
echo " for alpine can be specified with version: alpineX.YY or alpineedge"
1111
echo " for FreeBSD can be: freebsd14, freebsd15"
@@ -230,12 +230,6 @@ while :; do
230230
__HaikuArch=x86_64
231231
__UbuntuRepo="https://archive.ubuntu.com/ubuntu/"
232232
;;
233-
x86)
234-
__BuildArch=x86
235-
__UbuntuArch=i386
236-
__AlpineArch=x86
237-
__UbuntuRepo="https://archive.ubuntu.com/ubuntu/"
238-
;;
239233
lldb*)
240234
version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
241235
majorVersion="${version%%.*}"
@@ -460,9 +454,6 @@ case "$__AlpineVersion" in
460454
if [[ "$__AlpineArch" =~ s390x|ppc64le ]]; then
461455
__AlpineVersion=3.15 # minimum version that supports lldb-dev
462456
__AlpinePackages+=" llvm12-libs"
463-
elif [[ "$__AlpineArch" == "x86" ]]; then
464-
__AlpineVersion=3.17 # minimum version that supports lldb-dev
465-
__AlpinePackages+=" llvm15-libs"
466457
elif [[ "$__AlpineArch" == "loongarch64" ]]; then
467458
__AlpineVersion=3.21 # minimum version that supports lldb-dev
468459
__AlpinePackages+=" llvm19-libs"

‎eng/common/cross/tizen-build-rootfs.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ case "$ARCH" in
1515
arm64)
1616
TIZEN_ARCH="aarch64"
1717
;;
18-
x86)
19-
TIZEN_ARCH="i686"
20-
;;
2118
x64)
2219
TIZEN_ARCH="x86_64"
2320
LINK_ARCH="x86"

‎eng/common/cross/toolchain.cmake‎

Lines changed: 8 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -130,18 +130,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
130130
elseif(HAIKU)
131131
set(TOOLCHAIN "x86_64-unknown-haiku")
132132
endif()
133-
elseif(TARGET_ARCH_NAME STREQUAL "x86")
134-
set(CMAKE_SYSTEM_PROCESSOR i686)
135-
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
136-
set(TOOLCHAIN "i586-alpine-linux-musl")
137-
else()
138-
set(TOOLCHAIN "i686-linux-gnu")
139-
endif()
140-
if(TIZEN)
141-
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu")
142-
endif()
143133
else()
144-
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x, x64 and x86 are supported!")
134+
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x and x64 are supported!")
145135
endif()
146136

147137
if(DEFINED ENV{TOOLCHAIN})
@@ -159,7 +149,7 @@ if(TIZEN)
159149
set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE)
160150
endfunction()
161151

162-
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
152+
if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
163153
find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
164154
else()
165155
find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
@@ -300,18 +290,6 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
300290
endif()
301291
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
302292
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
303-
elseif(TARGET_ARCH_NAME STREQUAL "x86")
304-
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
305-
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
306-
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}")
307-
endif()
308-
add_toolchain_linker_flag(-m32)
309-
if(TIZEN)
310-
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
311-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
312-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
313-
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
314-
endif()
315293
elseif(ILLUMOS)
316294
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")
317295
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/amd64/lib")
@@ -322,7 +300,7 @@ endif()
322300

323301
# Specify compile options
324302

325-
if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT OPENHARMONY AND NOT FREEBSD AND NOT OPENBSD) OR ILLUMOS OR HAIKU)
303+
if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64)$" AND NOT ANDROID AND NOT OPENHARMONY AND NOT FREEBSD AND NOT OPENBSD) OR ILLUMOS OR HAIKU)
326304
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
327305
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
328306
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
@@ -349,46 +327,26 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
349327
endif()
350328
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
351329
add_compile_options("--target=${TOOLCHAIN}")
352-
elseif(TARGET_ARCH_NAME STREQUAL "x86")
353-
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
354-
add_compile_options(--target=${TOOLCHAIN})
355-
endif()
356-
add_compile_options(-m32)
357-
add_compile_options(-Wno-error=unused-command-line-argument)
358330
endif()
359331

360332
if(TIZEN)
361-
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|x86)$")
333+
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$")
362334
add_compile_options(-Wno-deprecated-declarations) # compile-time option
363335
add_compile_options(-D__extern_always_inline=inline) # compile-time option
364336
endif()
365337
endif()
366338

367339
# Set LLDB include and library paths for builds that need lldb.
368-
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
369-
if(TARGET_ARCH_NAME STREQUAL "x86")
370-
set(LLVM_CROSS_DIR "$ENV{LLVM_CROSS_HOME}")
371-
else() # arm/armel case
372-
set(LLVM_CROSS_DIR "$ENV{LLVM_ARM_HOME}")
373-
endif()
340+
if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
341+
set(LLVM_CROSS_DIR "$ENV{LLVM_ARM_HOME}")
374342
if(LLVM_CROSS_DIR)
375343
set(WITH_LLDB_LIBS "${LLVM_CROSS_DIR}/lib/" CACHE STRING "")
376344
set(WITH_LLDB_INCLUDES "${LLVM_CROSS_DIR}/include" CACHE STRING "")
377345
set(LLDB_H "${WITH_LLDB_INCLUDES}" CACHE STRING "")
378346
set(LLDB "${LLVM_CROSS_DIR}/lib/liblldb.so" CACHE STRING "")
379347
else()
380-
if(TARGET_ARCH_NAME STREQUAL "x86")
381-
set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/i386-linux-gnu" CACHE STRING "")
382-
set(CHECK_LLVM_DIR "${CROSS_ROOTFS}/usr/lib/llvm-3.8/include")
383-
if(EXISTS "${CHECK_LLVM_DIR}" AND IS_DIRECTORY "${CHECK_LLVM_DIR}")
384-
set(WITH_LLDB_INCLUDES "${CHECK_LLVM_DIR}")
385-
else()
386-
set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include")
387-
endif()
388-
else() # arm/armel case
389-
set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}" CACHE STRING "")
390-
set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include" CACHE STRING "")
391-
endif()
348+
set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}" CACHE STRING "")
349+
set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include" CACHE STRING "")
392350
endif()
393351
endif()
394352

‎eng/common/cross/x86/tizen/tizen.patch‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "12.0.100-alpha.1.26480.102",
3+
"version": "12.0.100-alpha.1.26555.106",
44
"allowPrerelease": true,
55
"rollForward": "latestMajor",
66
"paths": [
@@ -13,7 +13,7 @@
1313
"runner": "Microsoft.Testing.Platform"
1414
},
1515
"tools": {
16-
"dotnet": "12.0.100-alpha.1.26480.102",
16+
"dotnet": "12.0.100-alpha.1.26555.106",
1717
"runtimes": {
1818
"dotnet": [
1919
"$(MicrosoftNETCorePlatformsVersion)"
@@ -24,8 +24,8 @@
2424
}
2525
},
2626
"msbuild-sdks": {
27-
"Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26551.101",
28-
"Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26551.101",
27+
"Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26556.115",
28+
"Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26556.115",
2929
"Microsoft.Build.NoTargets": "3.7.134"
3030
}
3131
}

0 commit comments

Comments
 (0)