Skip to content

Commit 576c75c

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20230503.4 (#48059)
[main] Update dependencies from dotnet/arcade
1 parent 0c8a569 commit 576c75c

File tree

6 files changed

+44
-22
lines changed

6 files changed

+44
-22
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -330,31 +330,31 @@
330330
<Uri>https://github.com/dotnet/runtime</Uri>
331331
<Sha>25f09dea3cebc63ef4d780daa90943fcaaacdd35</Sha>
332332
</Dependency>
333-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23226.4">
333+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23253.4">
334334
<Uri>https://github.com/dotnet/arcade</Uri>
335-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
335+
<Sha>b7d271e0e6feec75fb740e494b807c2754eebdc3</Sha>
336336
<SourceBuild RepoName="arcade" ManagedOnly="true" />
337337
</Dependency>
338338
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23218.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
339339
<Uri>https://github.com/dotnet/sourcelink</Uri>
340340
<Sha>47c52dd2ebf9edfd40abdcff999c13eb461f6ce2</Sha>
341341
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
342342
</Dependency>
343-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23226.4">
343+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23253.4">
344344
<Uri>https://github.com/dotnet/arcade</Uri>
345-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
345+
<Sha>b7d271e0e6feec75fb740e494b807c2754eebdc3</Sha>
346346
</Dependency>
347-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23226.4">
347+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23253.4">
348348
<Uri>https://github.com/dotnet/arcade</Uri>
349-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
349+
<Sha>b7d271e0e6feec75fb740e494b807c2754eebdc3</Sha>
350350
</Dependency>
351-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23226.4">
351+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23253.4">
352352
<Uri>https://github.com/dotnet/arcade</Uri>
353-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
353+
<Sha>b7d271e0e6feec75fb740e494b807c2754eebdc3</Sha>
354354
</Dependency>
355-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23226.4">
355+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23253.4">
356356
<Uri>https://github.com/dotnet/arcade</Uri>
357-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
357+
<Sha>b7d271e0e6feec75fb740e494b807c2754eebdc3</Sha>
358358
</Dependency>
359359
<Dependency Name="NuGet.Frameworks" Version="6.2.2">
360360
<Uri>https://github.com/nuget/nuget.client</Uri>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@
146146
<NuGetVersioningVersion>6.2.2</NuGetVersioningVersion>
147147
<NuGetFrameworksVersion>6.2.2</NuGetFrameworksVersion>
148148
<!-- Packages from dotnet/arcade -->
149-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23226.4</MicrosoftDotNetBuildTasksInstallersVersion>
150-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23226.4</MicrosoftDotNetBuildTasksTemplatingVersion>
151-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23226.4</MicrosoftDotNetRemoteExecutorVersion>
149+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23253.4</MicrosoftDotNetBuildTasksInstallersVersion>
150+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23253.4</MicrosoftDotNetBuildTasksTemplatingVersion>
151+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23253.4</MicrosoftDotNetRemoteExecutorVersion>
152152
<!-- Packages from dotnet/source-link -->
153153
<MicrosoftSourceLinkGitHubVersion>8.0.0-beta.23218.3</MicrosoftSourceLinkGitHubVersion>
154154
<!-- Packages from dotnet/source-build-externals -->

‎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(startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release'), eq(variables['Build.SourceBranch'], 'refs/heads/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
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23226.4",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23226.4"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23253.4",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23253.4"
3232
}
3333
}

0 commit comments

Comments
 (0)