[main] Source code updates from dotnet/dotnet

eng/Version.Details.props

@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
 <Project>
   <PropertyGroup>
     <!-- dotnet-dotnet dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>12.0.0-beta.26553.110</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>12.0.0-beta.26556.115</MicrosoftDotNetArcadeSdkPackageVersion>
   </PropertyGroup>
   <!--Property group for alternate package version names-->
   <PropertyGroup>

eng/Version.Details.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="4c72591066848c3106d4f63b7bbead73ce2e0b7a" BarId="339642" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="6e6f978fd9ca19b62796a13ff5230b21af0c42fa" BarId="340367" />
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26553.110">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26556.115">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>4c72591066848c3106d4f63b7bbead73ce2e0b7a</Sha>
+      <Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

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

@@ -187,10 +187,10 @@ jobs:
           PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
           is1ESPipeline: ${{ parameters.is1ESPipeline }}
 
-      # Darc is targeting 8.0, so make sure it's installed
+      # Darc is targeting 10.0, so make sure it's installed
       - task: UseDotNet@2
         inputs:
-          version: 8.0.x
+          version: 10.0.x
 
       - task: AzureCLI@2
         displayName: Publish Using Darc

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

@@ -301,7 +301,7 @@ stages:
 
       - task: UseDotNet@2
         inputs:
-          version: 8.0.x
+          version: 10.0.x
 
       - task: AzureCLI@2
         displayName: Publish Using Darc

eng/common/cross/build-rootfs.sh

@@ -5,7 +5,7 @@ set -e
 usage()
 {
     echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir <directory>]"
-    echo "BuildArch can be: arm(default), arm64, loongarch64, ppc64le, riscv64, s390x, x64, x86"
+    echo "BuildArch can be: arm(default), arm64, loongarch64, ppc64le, riscv64, s390x, x64"
     echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
     echo "                               for alpine can be specified with version: alpineX.YY or alpineedge"
     echo "                               for FreeBSD can be: freebsd14, freebsd15"
@@ -230,12 +230,6 @@ while :; do
             __HaikuArch=x86_64
             __UbuntuRepo="https://archive.ubuntu.com/ubuntu/"
             ;;
-        x86)
-            __BuildArch=x86
-            __UbuntuArch=i386
-            __AlpineArch=x86
-            __UbuntuRepo="https://archive.ubuntu.com/ubuntu/"
-            ;;
         lldb*)
             version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
             majorVersion="${version%%.*}"
@@ -460,9 +454,6 @@ case "$__AlpineVersion" in
         if [[ "$__AlpineArch" =~ s390x|ppc64le ]]; then
             __AlpineVersion=3.15 # minimum version that supports lldb-dev
             __AlpinePackages+=" llvm12-libs"
-        elif [[ "$__AlpineArch" == "x86" ]]; then
-            __AlpineVersion=3.17 # minimum version that supports lldb-dev
-            __AlpinePackages+=" llvm15-libs"
         elif [[ "$__AlpineArch" == "loongarch64" ]]; then
             __AlpineVersion=3.21 # minimum version that supports lldb-dev
             __AlpinePackages+=" llvm19-libs"

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

@@ -15,9 +15,6 @@ case "$ARCH" in
     arm64)
         TIZEN_ARCH="aarch64"
         ;;
-    x86)
-        TIZEN_ARCH="i686"
-        ;;
     x64)
         TIZEN_ARCH="x86_64"
         LINK_ARCH="x86"

eng/common/cross/toolchain.cmake

@@ -130,18 +130,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
   elseif(HAIKU)
     set(TOOLCHAIN "x86_64-unknown-haiku")
   endif()
-elseif(TARGET_ARCH_NAME STREQUAL "x86")
-  set(CMAKE_SYSTEM_PROCESSOR i686)
-  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
-    set(TOOLCHAIN "i586-alpine-linux-musl")
-  else()
-    set(TOOLCHAIN "i686-linux-gnu")
-  endif()
-  if(TIZEN)
-    set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu")
-  endif()
 else()
-  message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x, x64 and x86 are supported!")
+  message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x and x64 are supported!")
 endif()
 
 if(DEFINED ENV{TOOLCHAIN})
@@ -159,7 +149,7 @@ if(TIZEN)
     set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE)
   endfunction()
 
-  if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
+  if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
     find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
   else()
     find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
@@ -300,18 +290,6 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "s390x")
   add_toolchain_linker_flag("--target=${TOOLCHAIN}")
-elseif(TARGET_ARCH_NAME STREQUAL "x86")
-  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
-    add_toolchain_linker_flag("--target=${TOOLCHAIN}")
-    add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}")
-  endif()
-  add_toolchain_linker_flag(-m32)
-  if(TIZEN)
-    add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
-    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
-    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
-    add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
-  endif()
 elseif(ILLUMOS)
   add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")
   add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/amd64/lib")
@@ -322,7 +300,7 @@ endif()
 
 # Specify compile options
 
-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)
+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)
   set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
@@ -349,46 +327,26 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "s390x")
   add_compile_options("--target=${TOOLCHAIN}")
-elseif(TARGET_ARCH_NAME STREQUAL "x86")
-  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
-    add_compile_options(--target=${TOOLCHAIN})
-  endif()
-  add_compile_options(-m32)
-  add_compile_options(-Wno-error=unused-command-line-argument)
 endif()
 
 if(TIZEN)
-  if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|x86)$")
+  if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$")
     add_compile_options(-Wno-deprecated-declarations) # compile-time option
     add_compile_options(-D__extern_always_inline=inline) # compile-time option
   endif()
 endif()
 
 # Set LLDB include and library paths for builds that need lldb.
-if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
-  if(TARGET_ARCH_NAME STREQUAL "x86")
-    set(LLVM_CROSS_DIR "$ENV{LLVM_CROSS_HOME}")
-  else() # arm/armel case
-    set(LLVM_CROSS_DIR "$ENV{LLVM_ARM_HOME}")
-  endif()
+if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
+  set(LLVM_CROSS_DIR "$ENV{LLVM_ARM_HOME}")
   if(LLVM_CROSS_DIR)
     set(WITH_LLDB_LIBS "${LLVM_CROSS_DIR}/lib/" CACHE STRING "")
     set(WITH_LLDB_INCLUDES "${LLVM_CROSS_DIR}/include" CACHE STRING "")
     set(LLDB_H "${WITH_LLDB_INCLUDES}" CACHE STRING "")
     set(LLDB "${LLVM_CROSS_DIR}/lib/liblldb.so" CACHE STRING "")
   else()
-    if(TARGET_ARCH_NAME STREQUAL "x86")
-      set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/i386-linux-gnu" CACHE STRING "")
-      set(CHECK_LLVM_DIR "${CROSS_ROOTFS}/usr/lib/llvm-3.8/include")
-      if(EXISTS "${CHECK_LLVM_DIR}" AND IS_DIRECTORY "${CHECK_LLVM_DIR}")
-        set(WITH_LLDB_INCLUDES "${CHECK_LLVM_DIR}")
-      else()
-        set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include")
-      endif()
-    else() # arm/armel case
-      set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}" CACHE STRING "")
-      set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include" CACHE STRING "")
-    endif()
+    set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}" CACHE STRING "")
+    set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include" CACHE STRING "")
   endif()
 endif()
 

global.json

@@ -1,18 +1,18 @@
 {
   "sdk": {
-    "version": "12.0.100-alpha.1.26480.102",
+    "version": "12.0.100-alpha.1.26555.106",
     "allowPrerelease": true,
     "rollForward": "major"
   },
   "tools": {
-    "dotnet": "12.0.100-alpha.1.26480.102",
+    "dotnet": "12.0.100-alpha.1.26555.106",
     "runtimes": {
       "dotnet": [
         "10.0.2"
       ]
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26553.110"
+    "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26556.115"
   }
 }