Skip to content

Commit 3f2af46

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20230503.3 (#85703)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent b412b6b commit 3f2af46

File tree

6 files changed

+83
-61
lines changed

6 files changed

+83
-61
lines changed

eng/Version.Details.xml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -92,73 +92,73 @@
9292
</Dependency>
9393
</ProductDependencies>
9494
<ToolsetDependencies>
95-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23226.4">
95+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23253.3">
9696
<Uri>https://github.com/dotnet/arcade</Uri>
97-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
97+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23226.4">
99+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23253.3">
100100
<Uri>https://github.com/dotnet/arcade</Uri>
101-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
101+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
102102
</Dependency>
103-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23226.4">
103+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23253.3">
104104
<Uri>https://github.com/dotnet/arcade</Uri>
105-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
105+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
106106
</Dependency>
107-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23226.4">
107+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23253.3">
108108
<Uri>https://github.com/dotnet/arcade</Uri>
109-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
109+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
110110
</Dependency>
111-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23226.4">
111+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23253.3">
112112
<Uri>https://github.com/dotnet/arcade</Uri>
113-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
113+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
114114
</Dependency>
115-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23226.4">
115+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23253.3">
116116
<Uri>https://github.com/dotnet/arcade</Uri>
117-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
117+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
118118
</Dependency>
119-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23226.4">
119+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23253.3">
120120
<Uri>https://github.com/dotnet/arcade</Uri>
121-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
121+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
122122
</Dependency>
123-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23226.4">
123+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23253.3">
124124
<Uri>https://github.com/dotnet/arcade</Uri>
125-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
125+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
126126
</Dependency>
127-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23226.4">
127+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23253.3">
128128
<Uri>https://github.com/dotnet/arcade</Uri>
129-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
129+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
130130
</Dependency>
131-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23226.4">
131+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23253.3">
132132
<Uri>https://github.com/dotnet/arcade</Uri>
133-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
133+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
134134
</Dependency>
135-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23226.4">
135+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23253.3">
136136
<Uri>https://github.com/dotnet/arcade</Uri>
137-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
137+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
138138
</Dependency>
139-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23226.4">
139+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23253.3">
140140
<Uri>https://github.com/dotnet/arcade</Uri>
141-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
141+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
142142
</Dependency>
143-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23226.4">
143+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23253.3">
144144
<Uri>https://github.com/dotnet/arcade</Uri>
145-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
145+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
146146
</Dependency>
147-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23226.4">
147+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23253.3">
148148
<Uri>https://github.com/dotnet/arcade</Uri>
149-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
149+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
150150
</Dependency>
151-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23226.4">
151+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23253.3">
152152
<Uri>https://github.com/dotnet/arcade</Uri>
153-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
153+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
154154
</Dependency>
155-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23226.4">
155+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23253.3">
156156
<Uri>https://github.com/dotnet/arcade</Uri>
157-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
157+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23226.4">
159+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23253.3">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
161+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
162162
</Dependency>
163163
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23225.1">
164164
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -288,9 +288,9 @@
288288
<Uri>https://github.com/dotnet/xharness</Uri>
289289
<Sha>6b2300411681e372df36ee1097afe2193df58219</Sha>
290290
</Dependency>
291-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23226.4">
291+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23253.3">
292292
<Uri>https://github.com/dotnet/arcade</Uri>
293-
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
293+
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
294294
</Dependency>
295295
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23229.3">
296296
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

eng/Versions.props

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,21 @@
8484
<!-- SDK dependencies -->
8585
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.2.23107.1</MicrosoftDotNetApiCompatTaskVersion>
8686
<!-- Arcade dependencies -->
87-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23226.4</MicrosoftDotNetBuildTasksFeedVersion>
88-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23226.4</MicrosoftDotNetCodeAnalysisVersion>
89-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23226.4</MicrosoftDotNetGenAPIVersion>
90-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23226.4</MicrosoftDotNetGenFacadesVersion>
91-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23226.4</MicrosoftDotNetXUnitExtensionsVersion>
92-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23226.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
93-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23226.4</MicrosoftDotNetBuildTasksArchivesVersion>
94-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23226.4</MicrosoftDotNetBuildTasksInstallersVersion>
95-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23226.4</MicrosoftDotNetBuildTasksPackagingVersion>
96-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23226.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
97-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23226.4</MicrosoftDotNetBuildTasksTemplatingVersion>
98-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23226.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
99-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23226.4</MicrosoftDotNetRemoteExecutorVersion>
100-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23226.4</MicrosoftDotNetVersionToolsTasksVersion>
101-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23226.4</MicrosoftDotNetPackageTestingVersion>
87+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23253.3</MicrosoftDotNetBuildTasksFeedVersion>
88+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23253.3</MicrosoftDotNetCodeAnalysisVersion>
89+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23253.3</MicrosoftDotNetGenAPIVersion>
90+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23253.3</MicrosoftDotNetGenFacadesVersion>
91+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23253.3</MicrosoftDotNetXUnitExtensionsVersion>
92+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23253.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
93+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23253.3</MicrosoftDotNetBuildTasksArchivesVersion>
94+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23253.3</MicrosoftDotNetBuildTasksInstallersVersion>
95+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23253.3</MicrosoftDotNetBuildTasksPackagingVersion>
96+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23253.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
97+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23253.3</MicrosoftDotNetBuildTasksTemplatingVersion>
98+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23253.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
99+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23253.3</MicrosoftDotNetRemoteExecutorVersion>
100+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23253.3</MicrosoftDotNetVersionToolsTasksVersion>
101+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23253.3</MicrosoftDotNetPackageTestingVersion>
102102
<!-- NuGet dependencies -->
103103
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
104104
<!-- Installer dependencies -->

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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "8.0.100-preview.3.23178.7"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23226.4",
12-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23226.4",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23226.4",
11+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23253.3",
12+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23253.3",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23253.3",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "8.0.0-preview.5.23251.1"

0 commit comments

Comments
 (0)