Update dependencies from https://github.com/dotnet/arcade build 20211227.1 (#12908)

[main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.21621.1 to 1.0.0-beta.21624.1 (parent: Microsoft.DotNet.Arcade.Sdk)
2021-12-28 14:23:49 +00:00 · 2021-12-28 14:23:49 +00:00 · 416a6e8833
commit 416a6e8833
parent 7f8edf63a4
5 changed files with 61 additions and 31 deletions
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -172,19 +172,19 @@
    </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21623.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21627.1">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1a66526b0c1eb068cab89909b7d52fe6f57d64df</Sha>
+      <Sha>28ea474e02753fe23295f60e8792bc845b8b6e20</Sha>
      <SourceBuild RepoName="arcade" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21623.2">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21627.1">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1a66526b0c1eb068cab89909b7d52fe6f57d64df</Sha>
+      <Sha>28ea474e02753fe23295f60e8792bc845b8b6e20</Sha>
      <SourceBuild RepoName="arcade" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21623.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21627.1">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1a66526b0c1eb068cab89909b7d52fe6f57d64df</Sha>
+      <Sha>28ea474e02753fe23295f60e8792bc845b8b6e20</Sha>
    </Dependency>
    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.21616.2">
      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
@ -196,9 +196,9 @@
      <Sha>392126dabae557bf0664f599b5469ccc6d1dfcd8</Sha>
      <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.21621.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.21624.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
      <Uri>https://github.com/dotnet/xliff-tasks</Uri>
-      <Sha>24deafb2c24a96bf2ab5b2eb6c9306532bfcf31a</Sha>
+      <Sha>83b25ddf3bb32541ae885e9f3b2e8503e4488902</Sha>
      <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
    </Dependency>
  </ToolsetDependencies>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -26,7 +26,7 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21623.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21627.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/winforms -->
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@ -3,18 +3,26 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
 set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
 if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
  set(CMAKE_SYSTEM_NAME FreeBSD)
+  set(FREEBSD 1)
 elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc)
  set(CMAKE_SYSTEM_NAME SunOS)
  set(ILLUMOS 1)
 else()
  set(CMAKE_SYSTEM_NAME Linux)
+  set(LINUX 1)
 endif()
 set(CMAKE_SYSTEM_VERSION 1)

+if(EXISTS ${CROSS_ROOTFS}/etc/tizen-release)
+  set(TIZEN 1)
+elseif(EXISTS ${CROSS_ROOTFS}/android_platform)
+  set(ANDROID 1)
+endif()
+
 if(TARGET_ARCH_NAME STREQUAL "armel")
  set(CMAKE_SYSTEM_PROCESSOR armv7l)
  set(TOOLCHAIN "arm-linux-gnueabi")
-  if("$ENV{__DistroRid}" MATCHES "tizen.*")
+  if(TIZEN)
    set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
  endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm")
@ -26,7 +34,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm")
  else()
    set(TOOLCHAIN "arm-linux-gnueabihf")
  endif()
-  if("$ENV{__DistroRid}" MATCHES "tizen.*")
+  if(TIZEN)
    set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
  endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm64")
@ -36,7 +44,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
  else()
    set(TOOLCHAIN "aarch64-linux-gnu")
  endif()
-  if("$ENV{__DistroRid}" MATCHES "tizen.*")
+  if(TIZEN)
    set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
  endif()
 elseif(TARGET_ARCH_NAME STREQUAL "s390x")
@ -45,7 +53,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x")
 elseif(TARGET_ARCH_NAME STREQUAL "x86")
  set(CMAKE_SYSTEM_PROCESSOR i686)
  set(TOOLCHAIN "i686-linux-gnu")
-elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+elseif (FREEBSD)
  set(CMAKE_SYSTEM_PROCESSOR "x86_64")
  set(triple "x86_64-unknown-freebsd12")
 elseif (ILLUMOS)
@ -60,7 +68,7 @@ if(DEFINED ENV{TOOLCHAIN})
 endif()

 # Specify include paths
-if(DEFINED TIZEN_TOOLCHAIN)
+if(TIZEN)
  if(TARGET_ARCH_NAME STREQUAL "arm")
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf)
@ -75,7 +83,7 @@ if(DEFINED TIZEN_TOOLCHAIN)
  endif()
 endif()

-if("$ENV{__DistroRid}" MATCHES "android.*")
+if(ANDROID)
    if(TARGET_ARCH_NAME STREQUAL "arm")
        set(ANDROID_ABI armeabi-v7a)
    elseif(TARGET_ARCH_NAME STREQUAL "arm64")
@ -83,7 +91,9 @@ if("$ENV{__DistroRid}" MATCHES "android.*")
    endif()

    # extract platform number required by the NDK's toolchain
-    string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "$ENV{__DistroRid}")
+    file(READ "${CROSS_ROOTFS}/android_platform" RID_FILE_CONTENTS)
+    string(REPLACE "RID=" "" ANDROID_RID "${RID_FILE_CONTENTS}")
+    string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "${ANDROID_RID}")

    set(ANDROID_TOOLCHAIN clang)
    set(FEATURE_EVENT_TRACE 0) # disable event trace as there is no lttng-ust package in termux repository
@ -92,7 +102,7 @@ if("$ENV{__DistroRid}" MATCHES "android.*")

    # include official NDK toolchain script
    include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+elseif(FREEBSD)
    # we cross-compile by instructing clang
    set(CMAKE_C_COMPILER_TARGET ${triple})
    set(CMAKE_CXX_COMPILER_TARGET ${triple})
@ -152,20 +162,20 @@ function(add_toolchain_linker_flag Flag)
  set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
 endfunction()

-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(LINUX)
  add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib/${TOOLCHAIN}")
  add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}")
 endif()

-if(TARGET_ARCH_NAME STREQUAL "arm" OR TARGET_ARCH_NAME STREQUAL "armel")
-  if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
+if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
+  if(TIZEN)
    add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
  endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm64")
-  if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
+  if(TIZEN)
    add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64")
@ -184,7 +194,7 @@ endif()

 # Specify compile options

-if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*") OR ILLUMOS)
+if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT ANDROID) OR ILLUMOS)
  set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
  set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
  set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
@ -211,7 +221,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
  add_compile_options(-Wno-error=unused-command-line-argument)
 endif()

-if(DEFINED TIZEN_TOOLCHAIN)
+if(TIZEN)
  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
--- a/eng/common/native/init-compiler.sh
+++ b/eng/common/native/init-compiler.sh
@ -2,25 +2,45 @@
 #
 # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
 #
-# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! 
+# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!

 if [[ "$#" -lt 3 ]]; then
  echo "Usage..."
-  echo "init-compiler.sh <script directory> <Architecture> <compiler> <compiler major version> <compiler minor version>"
+  echo "init-compiler.sh <script directory> <Architecture> <compiler>"
  echo "Specify the script directory."
  echo "Specify the target architecture."
  echo "Specify the name of compiler (clang or gcc)."
-  echo "Specify the major version of compiler."
-  echo "Specify the minor version of compiler."
  exit 1
 fi

 nativescriptroot="$1"
 build_arch="$2"
 compiler="$3"
+
+case "$compiler" in
+    clang*|-clang*|--clang*)
+        # clangx.y or clang-x.y
+        version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
+        parts=(${version//./ })
+        majorVersion="${parts[0]}"
+        minorVersion="${parts[1]}"
+        if [[ -z "$minorVersion" && "$majorVersion" -le 6 ]]; then
+            minorVersion=0;
+        fi
+        compiler=clang
+        ;;
+
+    gcc*|-gcc*|--gcc*)
+        # gccx.y or gcc-x.y
+        version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
+        parts=(${version//./ })
+        majorVersion="${parts[0]}"
+        minorVersion="${parts[1]}"
+        compiler=gcc
+        ;;
+esac
+
 cxxCompiler="$compiler++"
-majorVersion="$4"
-minorVersion="$5"

 . "$nativescriptroot"/../pipeline-logging-functions.sh

--- a/global.json
+++ b/global.json
@ -11,7 +11,7 @@
    "cmake": "3.16.4"
  },
  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21623.2",
-    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21623.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21627.1",
+    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21627.1"
  }
 }