Skip to content

Commit 2ae3e51

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#5133)
[main] Update dependencies from dotnet/arcade
1 parent dbf5022 commit 2ae3e51

File tree

7 files changed

+47
-25
lines changed

7 files changed

+47
-25
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.23224.5">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23253.3">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>092ad720c43c79eb081a52e129399b1980f6de41</Sha>
9+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23224.5">
11+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23253.3">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>092ad720c43c79eb081a52e129399b1980f6de41</Sha>
13+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23224.5">
15+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23253.3">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>092ad720c43c79eb081a52e129399b1980f6de41</Sha>
17+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23224.5">
19+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23253.3">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>092ad720c43c79eb081a52e129399b1980f6de41</Sha>
21+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23224.5">
23+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23253.3">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>092ad720c43c79eb081a52e129399b1980f6de41</Sha>
25+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</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.23224.5</MicrosoftDotNetArcadeSdkPackageVersion>
27-
<MicrosoftDotNetHelixSdkPackageVersion>8.0.0-beta.23224.5</MicrosoftDotNetHelixSdkPackageVersion>
28-
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23224.5</MicrosoftDotNetGenFacadesPackageVersion>
29-
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23224.5</MicrosoftDotNetXUnitExtensionsPackageVersion>
30-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23224.5</MicrosoftDotNetSignToolVersion>
26+
<MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.23253.3</MicrosoftDotNetArcadeSdkPackageVersion>
27+
<MicrosoftDotNetHelixSdkPackageVersion>8.0.0-beta.23253.3</MicrosoftDotNetHelixSdkPackageVersion>
28+
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23253.3</MicrosoftDotNetGenFacadesPackageVersion>
29+
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23253.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
30+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23253.3</MicrosoftDotNetSignToolVersion>
3131
</PropertyGroup>
3232
<!-- CoreFx dependencies -->
3333
<PropertyGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ while :; do
330330
;;
331331
freebsd13)
332332
__CodeName=freebsd
333-
__FreeBSDBase="13.0-RELEASE"
333+
__FreeBSDBase="13.2-RELEASE"
334334
__FreeBSDABI="13"
335335
__SkipUnmount=1
336336
;;

‎eng/common/cross/toolchain.cmake

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,25 @@ elseif(TARGET_ARCH_NAME STREQUAL "armv6")
6767
endif()
6868
elseif(TARGET_ARCH_NAME STREQUAL "ppc64le")
6969
set(CMAKE_SYSTEM_PROCESSOR ppc64le)
70-
set(TOOLCHAIN "powerpc64le-linux-gnu")
70+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/powerpc64le-alpine-linux-musl)
71+
set(TOOLCHAIN "powerpc64le-alpine-linux-musl")
72+
else()
73+
set(TOOLCHAIN "powerpc64le-linux-gnu")
74+
endif()
7175
elseif(TARGET_ARCH_NAME STREQUAL "riscv64")
7276
set(CMAKE_SYSTEM_PROCESSOR riscv64)
73-
set(TOOLCHAIN "riscv64-linux-gnu")
77+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/riscv64-alpine-linux-musl)
78+
set(TOOLCHAIN "riscv64-alpine-linux-musl")
79+
else()
80+
set(TOOLCHAIN "riscv64-linux-gnu")
81+
endif()
7482
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
7583
set(CMAKE_SYSTEM_PROCESSOR s390x)
76-
set(TOOLCHAIN "s390x-linux-gnu")
84+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/s390x-alpine-linux-musl)
85+
set(TOOLCHAIN "s390x-alpine-linux-musl")
86+
else()
87+
set(TOOLCHAIN "s390x-linux-gnu")
88+
endif()
7789
elseif(TARGET_ARCH_NAME STREQUAL "x64")
7890
set(CMAKE_SYSTEM_PROCESSOR x86_64)
7991
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/x86_64-alpine-linux-musl)
@@ -92,7 +104,11 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
92104
endif()
93105
elseif(TARGET_ARCH_NAME STREQUAL "x86")
94106
set(CMAKE_SYSTEM_PROCESSOR i686)
95-
set(TOOLCHAIN "i686-linux-gnu")
107+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
108+
set(TOOLCHAIN "i586-alpine-linux-musl")
109+
else()
110+
set(TOOLCHAIN "i686-linux-gnu")
111+
endif()
96112
if(TIZEN)
97113
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
98114
endif()
@@ -266,8 +282,11 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
266282
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
267283
endif()
268284
elseif(TARGET_ARCH_NAME STREQUAL "x86")
285+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
286+
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
287+
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}")
288+
endif()
269289
add_toolchain_linker_flag(-m32)
270-
271290
if(TIZEN)
272291
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
273292
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
@@ -307,6 +326,9 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
307326
add_compile_options(-mfloat-abi=softfp)
308327
endif()
309328
elseif(TARGET_ARCH_NAME STREQUAL "x86")
329+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
330+
add_compile_options(--target=${TOOLCHAIN})
331+
endif()
310332
add_compile_options(-m32)
311333
add_compile_options(-Wno-error=unused-command-line-argument)
312334
endif()

‎eng/common/native/init-compiler.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ if [ -z "$CLR_CC" ]; then
6464
if [ -z "$majorVersion" ]; then
6565
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
6666
if [ "$compiler" = "clang" ]; then versions="16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
67-
elif [ "$compiler" = "gcc" ]; then versions="12 11 10 9 8 7 6 5 4.9"; fi
67+
elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi
6868

6969
for version in $versions; do
7070
_major="${version%%.*}"

‎eng/common/templates/job/job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ jobs:
158158
- template: /eng/common/templates/steps/component-governance.yml
159159
parameters:
160160
${{ if eq(parameters.disableComponentGovernance, '') }}:
161-
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
161+
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
162162
disableComponentGovernance: false
163163
${{ else }}:
164164
disableComponentGovernance: true

‎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.23224.5",
17-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23224.5"
16+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23253.3",
17+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23253.3"
1818
}
1919
}

0 commit comments

Comments
 (0)