From 82bce80805f1264a60f69c6c1c3ed1cab9a78afe Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 17 Mar 2022 12:36:56 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20220316.1 (#1334)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/common/cross/build-rootfs.sh | 4 ++--
eng/common/cross/toolchain.cmake | 16 +++++++++++++++-
eng/common/retain-build.ps1 | 8 +++-----
global.json | 2 +-
5 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index bc06f1bd..cf281896 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
https://github.com/dotnet/arcade
- 81001b45bd54f9223905bf55f6ed0125273580fa
+ c90e2d9f3d3e2b471a078f949f2a2fea6af2627d
-
+
https://github.com/dotnet/arcade
- 81001b45bd54f9223905bf55f6ed0125273580fa
+ c90e2d9f3d3e2b471a078f949f2a2fea6af2627d
-
+
https://github.com/dotnet/arcade
- 81001b45bd54f9223905bf55f6ed0125273580fa
+ c90e2d9f3d3e2b471a078f949f2a2fea6af2627d
-
+
https://github.com/dotnet/arcade
- 81001b45bd54f9223905bf55f6ed0125273580fa
+ c90e2d9f3d3e2b471a078f949f2a2fea6af2627d
-
+
https://github.com/dotnet/arcade
- 81001b45bd54f9223905bf55f6ed0125273580fa
+ c90e2d9f3d3e2b471a078f949f2a2fea6af2627d
https://github.com/dotnet/arcade-services
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 7e4be9a0..e784c9c0 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -194,8 +194,8 @@ while :; do
__LLDB_Package="liblldb-6.0-dev"
;;
tizen)
- if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
- echo "Tizen is available only for arm, armel and arm64."
+ if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ] && [ "$__BuildArch" != "x86" ] ; then
+ echo "Tizen is available only for arm, armel, arm64 and x86."
usage;
exit 1;
fi
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 9fd345bd..eaeeab38 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -63,6 +63,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x")
elseif(TARGET_ARCH_NAME STREQUAL "x86")
set(CMAKE_SYSTEM_PROCESSOR i686)
set(TOOLCHAIN "i686-linux-gnu")
+ if(TIZEN)
+ set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
+ endif()
elseif (FREEBSD)
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
set(triple "x86_64-unknown-freebsd12")
@@ -91,6 +94,10 @@ if(TIZEN)
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu)
endif()
+ if(TARGET_ARCH_NAME STREQUAL "x86")
+ include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
+ include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu)
+ endif()
endif()
if(ANDROID)
@@ -197,6 +204,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
endif()
elseif(TARGET_ARCH_NAME STREQUAL "x86")
add_toolchain_linker_flag(-m32)
+
+ 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(ILLUMOS)
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/amd64/lib")
@@ -232,7 +246,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
endif()
if(TIZEN)
- if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$")
+ if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|x86)$")
add_compile_options(-Wno-deprecated-declarations) # compile-time option
add_compile_options(-D__extern_always_inline=inline) # compile-time option
endif()
diff --git a/eng/common/retain-build.ps1 b/eng/common/retain-build.ps1
index e08fc227..e7ba975a 100644
--- a/eng/common/retain-build.ps1
+++ b/eng/common/retain-build.ps1
@@ -8,8 +8,6 @@ Param(
$ErrorActionPreference = 'Stop'
Set-StrictMode -Version 2.0
-. $PSScriptRoot\tools.ps1
-
function Get-AzDOHeaders(
[string] $token)
@@ -38,10 +36,10 @@ function Update-BuildRetention(
Write-Host "Updated retention settings for build ${buildId}."
}
catch {
- Write-PipelineTelemetryError -Category "Build" -Message "Failed to update retention settings for build: $_.Exception.Response.StatusDescription"
- ExitWithExitCode 1
+ Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription"
+ exit 1
}
}
Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token
-ExitWithExitCode 0
+exit 0
diff --git a/global.json b/global.json
index 05ea1e88..c3f06d5c 100644
--- a/global.json
+++ b/global.json
@@ -14,6 +14,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22157.6"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22166.1"
}
}