From f79f7203f7b4efd42b992e9f2804900e0177ae9d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 24 Dec 2021 13:35:55 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
 build 20211223.2 (#1250)

[main] Update dependencies from dotnet/arcade
---
 eng/Version.Details.xml          | 20 ++++++++++----------
 eng/common/cross/build-rootfs.sh |  4 ++--
 eng/common/cross/toolchain.cmake | 11 +++++++++--
 global.json                      |  2 +-
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 45522b23..883efbed 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21623.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21623.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4abaab2bf44d06638abeb23fc96c4f6eef58a2f0</Sha>
+      <Sha>1a66526b0c1eb068cab89909b7d52fe6f57d64df</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.21623.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.21623.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4abaab2bf44d06638abeb23fc96c4f6eef58a2f0</Sha>
+      <Sha>1a66526b0c1eb068cab89909b7d52fe6f57d64df</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.21623.1">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.21623.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4abaab2bf44d06638abeb23fc96c4f6eef58a2f0</Sha>
+      <Sha>1a66526b0c1eb068cab89909b7d52fe6f57d64df</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21623.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21623.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4abaab2bf44d06638abeb23fc96c4f6eef58a2f0</Sha>
+      <Sha>1a66526b0c1eb068cab89909b7d52fe6f57d64df</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.21623.1">
+    <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.21623.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4abaab2bf44d06638abeb23fc96c4f6eef58a2f0</Sha>
+      <Sha>1a66526b0c1eb068cab89909b7d52fe6f57d64df</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 5102245b..e94d13d6 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -185,8 +185,8 @@ while :; do
             __LLDB_Package="liblldb-6.0-dev"
             ;;
         tizen)
-            if [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
-                echo "Tizen is available only for armel and arm64."
+            if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
+                echo "Tizen is available only for arm, armel and arm64."
                 usage;
                 exit 1;
             fi
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 6501c3a9..8369ae0b 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -26,6 +26,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm")
   else()
     set(TOOLCHAIN "arm-linux-gnueabihf")
   endif()
+  if("$ENV{__DistroRid}" MATCHES "tizen.*")
+    set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
+  endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm64")
   set(CMAKE_SYSTEM_PROCESSOR aarch64)
   if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl)
@@ -58,6 +61,10 @@ endif()
 
 # Specify include paths
 if(DEFINED TIZEN_TOOLCHAIN)
+  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)
+  endif()
   if(TARGET_ARCH_NAME STREQUAL "armel")
     include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
     include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi)
@@ -150,7 +157,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}")
 endif()
 
-if(TARGET_ARCH_NAME STREQUAL "armel")
+if(TARGET_ARCH_NAME STREQUAL "arm" OR TARGET_ARCH_NAME STREQUAL "armel")
   if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
     add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
@@ -205,7 +212,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
 endif()
 
 if(DEFINED TIZEN_TOOLCHAIN)
-  if(TARGET_ARCH_NAME MATCHES "^(armel|arm64)$")
+  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()
diff --git a/global.json b/global.json
index d0a02cee..f13edc9b 100644
--- a/global.json
+++ b/global.json
@@ -14,6 +14,6 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21623.1"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21623.2"
   }
 }