Skip to content

Commit 69bb230

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20220316.1 (#6267)
[main] Update dependencies from dotnet/arcade
1 parent da08585 commit 69bb230

File tree

6 files changed

+34
-22
lines changed

6 files changed

+34
-22
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,25 +75,25 @@
7575
</Dependency>
7676
</ProductDependencies>
7777
<ToolsetDependencies>
78-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22157.6">
78+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22166.1">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>81001b45bd54f9223905bf55f6ed0125273580fa</Sha>
80+
<Sha>c90e2d9f3d3e2b471a078f949f2a2fea6af2627d</Sha>
8181
</Dependency>
82-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22157.6">
82+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22166.1">
8383
<Uri>https://github.com/dotnet/arcade</Uri>
84-
<Sha>81001b45bd54f9223905bf55f6ed0125273580fa</Sha>
84+
<Sha>c90e2d9f3d3e2b471a078f949f2a2fea6af2627d</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22157.6">
86+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22166.1">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>81001b45bd54f9223905bf55f6ed0125273580fa</Sha>
88+
<Sha>c90e2d9f3d3e2b471a078f949f2a2fea6af2627d</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22157.6">
90+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22166.1">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>81001b45bd54f9223905bf55f6ed0125273580fa</Sha>
92+
<Sha>c90e2d9f3d3e2b471a078f949f2a2fea6af2627d</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22157.6">
94+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22166.1">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>81001b45bd54f9223905bf55f6ed0125273580fa</Sha>
96+
<Sha>c90e2d9f3d3e2b471a078f949f2a2fea6af2627d</Sha>
9797
</Dependency>
9898
</ToolsetDependencies>
9999
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
</PropertyGroup>
4545
<!-- Packages that come from https://github.com/dotnet/arcade -->
4646
<PropertyGroup>
47-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22157.6</MicrosoftDotNetApiCompatVersion>
48-
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.22157.6</MicrosoftDotNetCodeAnalysisPackageVersion>
47+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22166.1</MicrosoftDotNetApiCompatVersion>
48+
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.22166.1</MicrosoftDotNetCodeAnalysisPackageVersion>
4949
</PropertyGroup>
5050
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
5151
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ while :; do
194194
__LLDB_Package="liblldb-6.0-dev"
195195
;;
196196
tizen)
197-
if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
198-
echo "Tizen is available only for arm, armel and arm64."
197+
if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ] && [ "$__BuildArch" != "x86" ] ; then
198+
echo "Tizen is available only for arm, armel, arm64 and x86."
199199
usage;
200200
exit 1;
201201
fi

‎eng/common/cross/toolchain.cmake‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x")
6363
elseif(TARGET_ARCH_NAME STREQUAL "x86")
6464
set(CMAKE_SYSTEM_PROCESSOR i686)
6565
set(TOOLCHAIN "i686-linux-gnu")
66+
if(TIZEN)
67+
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
68+
endif()
6669
elseif (FREEBSD)
6770
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
6871
set(triple "x86_64-unknown-freebsd12")
@@ -91,6 +94,10 @@ if(TIZEN)
9194
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
9295
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu)
9396
endif()
97+
if(TARGET_ARCH_NAME STREQUAL "x86")
98+
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
99+
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu)
100+
endif()
94101
endif()
95102

96103
if(ANDROID)
@@ -197,6 +204,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
197204
endif()
198205
elseif(TARGET_ARCH_NAME STREQUAL "x86")
199206
add_toolchain_linker_flag(-m32)
207+
208+
if(TIZEN)
209+
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
210+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
211+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
212+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
213+
endif()
200214
elseif(ILLUMOS)
201215
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")
202216
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/amd64/lib")
@@ -232,7 +246,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
232246
endif()
233247

234248
if(TIZEN)
235-
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$")
249+
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|x86)$")
236250
add_compile_options(-Wno-deprecated-declarations) # compile-time option
237251
add_compile_options(-D__extern_always_inline=inline) # compile-time option
238252
endif()

‎eng/common/retain-build.ps1‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ Param(
88

99
$ErrorActionPreference = 'Stop'
1010
Set-StrictMode -Version 2.0
11-
. $PSScriptRoot\tools.ps1
12-
1311

1412
function Get-AzDOHeaders(
1513
[string] $token)
@@ -38,10 +36,10 @@ function Update-BuildRetention(
3836
Write-Host "Updated retention settings for build ${buildId}."
3937
}
4038
catch {
41-
Write-PipelineTelemetryError -Category "Build" -Message "Failed to update retention settings for build: $_.Exception.Response.StatusDescription"
42-
ExitWithExitCode 1
39+
Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription"
40+
exit 1
4341
}
4442
}
4543

4644
Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token
47-
ExitWithExitCode 0
45+
exit 0

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22157.6",
16-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22157.6"
15+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22166.1",
16+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22166.1"
1717
},
1818
"sdk": {
1919
"version": "7.0.100-alpha.1.22053.1"

0 commit comments

Comments
 (0)