Skip to content

Commit 8aafb81

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20230413.1 (#5099)
[main] Update dependencies from dotnet/arcade
1 parent 2ec3707 commit 8aafb81

File tree

6 files changed

+23
-21
lines changed

6 files changed

+23
-21
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23211.8">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23213.1">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>17d9eee32f20a6af0ebb620254a22f601d159578</Sha>
9+
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23211.8">
11+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23213.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>17d9eee32f20a6af0ebb620254a22f601d159578</Sha>
13+
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23211.8">
15+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23213.1">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>17d9eee32f20a6af0ebb620254a22f601d159578</Sha>
17+
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23211.8">
19+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23213.1">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>17d9eee32f20a6af0ebb620254a22f601d159578</Sha>
21+
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23211.8">
23+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23213.1">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>17d9eee32f20a6af0ebb620254a22f601d159578</Sha>
25+
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
2626
</Dependency>
2727
</ToolsetDependencies>
2828
</Dependencies>

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
</PropertyGroup>
2424
<!-- Arcade dependencies -->
2525
<PropertyGroup>
26-
<MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.23211.8</MicrosoftDotNetArcadeSdkPackageVersion>
27-
<MicrosoftDotNetHelixSdkPackageVersion>8.0.0-beta.23211.8</MicrosoftDotNetHelixSdkPackageVersion>
28-
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23211.8</MicrosoftDotNetGenFacadesPackageVersion>
29-
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23211.8</MicrosoftDotNetXUnitExtensionsPackageVersion>
30-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23211.8</MicrosoftDotNetSignToolVersion>
26+
<MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.23213.1</MicrosoftDotNetArcadeSdkPackageVersion>
27+
<MicrosoftDotNetHelixSdkPackageVersion>8.0.0-beta.23213.1</MicrosoftDotNetHelixSdkPackageVersion>
28+
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23213.1</MicrosoftDotNetGenFacadesPackageVersion>
29+
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23213.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
30+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23213.1</MicrosoftDotNetSignToolVersion>
3131
</PropertyGroup>
3232
<!-- CoreFx dependencies -->
3333
<PropertyGroup>

‎eng/common/cross/arm/sources.list.xenial

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
88
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
99

1010
deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
11-
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse

‎eng/common/cross/arm64/sources.list.xenial

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
88
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
99

1010
deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
11-
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse

‎eng/common/cross/toolchain.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x")
7676
set(TOOLCHAIN "s390x-linux-gnu")
7777
elseif(TARGET_ARCH_NAME STREQUAL "x64")
7878
set(CMAKE_SYSTEM_PROCESSOR x86_64)
79-
if(LINUX)
79+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/x86_64-alpine-linux-musl)
80+
set(TOOLCHAIN "x86_64-alpine-linux-musl")
81+
elseif(LINUX)
8082
set(TOOLCHAIN "x86_64-linux-gnu")
8183
if(TIZEN)
8284
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
@@ -279,7 +281,7 @@ endif()
279281

280282
# Specify compile options
281283

282-
if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
284+
if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
283285
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
284286
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
285287
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"version": "8.0.100-preview.3.23178.7"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23211.8",
17-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23211.8"
16+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23213.1",
17+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23213.1"
1818
}
1919
}

0 commit comments

Comments
 (0)