Skip to content

Commit 366f8d9

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240423.1 (#5506)
[main] Update dependencies from dotnet/arcade
1 parent 1f0e04d commit 366f8d9

File tree

6 files changed

+64
-35
lines changed

6 files changed

+64
-35
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24219.5">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24223.1">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
9+
<Sha>2b8c11bfab5f996b7bb5966a11c0d48a9dc7cdea</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24219.5">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24223.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
13+
<Sha>2b8c11bfab5f996b7bb5966a11c0d48a9dc7cdea</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24219.5">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24223.1">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc</Sha>
17+
<Sha>2b8c11bfab5f996b7bb5966a11c0d48a9dc7cdea</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919
<!-- Arcade dependencies -->
2020
<PropertyGroup>
21-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24219.5</MicrosoftDotNetGenFacadesPackageVersion>
22-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24219.5</MicrosoftDotNetXUnitExtensionsPackageVersion>
21+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24223.1</MicrosoftDotNetGenFacadesPackageVersion>
22+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24223.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
2323
</PropertyGroup>
2424
<!-- CoreFx dependencies -->
2525
<PropertyGroup>

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

Lines changed: 52 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
#
33
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
44
#
5-
# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
5+
# NOTE: some scripts source this file and rely on stdout being empty, make sure
6+
# to not output *anything* here, unless it is an error message that fails the
7+
# build.
68

79
if [ -z "$build_arch" ] || [ -z "$compiler" ]; then
810
echo "Usage..."
@@ -58,6 +60,25 @@ check_version_exists() {
5860
echo "$desired_version"
5961
}
6062

63+
set_compiler_version_from_CC() {
64+
if [ "$(uname)" == "Darwin" ]; then
65+
# On Darwin, the versions from -version/-dumpversion refer to Xcode
66+
# versions, not llvm versions, so we can't rely on them.
67+
return
68+
fi
69+
70+
version="$("$CC" -dumpversion)"
71+
if [ "$version" = "" ]; then
72+
echo "Error: $CC -dumpversion didn't provide a version"
73+
exit 1
74+
fi
75+
76+
# gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments.
77+
IFS=. read -r majorVersion minorVersion _ <<EOF
78+
$version
79+
EOF
80+
}
81+
6182
if [ -z "$CLR_CC" ]; then
6283

6384
# Set default versions
@@ -74,28 +95,30 @@ if [ -z "$CLR_CC" ]; then
7495
done
7596

7697
if [ -z "$majorVersion" ]; then
77-
if command -v "$compiler" > /dev/null; then
78-
if [ "$(uname)" != "Darwin" ]; then
79-
echo "Warning: Specific version of $compiler not found, falling back to use the one in PATH."
80-
fi
81-
CC="$(command -v "$compiler")"
82-
CXX="$(command -v "$cxxCompiler")"
83-
else
84-
echo "No usable version of $compiler found."
98+
if [ "$(uname)" == "Darwin" ]; then
99+
echo "Error: Specific version of $compiler not found"
85100
exit 1
86101
fi
102+
103+
if ! command -v "$compiler" > /dev/null; then
104+
echo "Error: No usable version of $compiler found."
105+
exit 1
106+
fi
107+
108+
CC="$(command -v "$compiler")"
109+
CXX="$(command -v "$cxxCompiler")"
110+
set_compiler_version_from_CC
87111
else
88-
if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then
89-
if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then
90-
if command -v "$compiler" > /dev/null; then
91-
echo "Warning: Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
92-
CC="$(command -v "$compiler")"
93-
CXX="$(command -v "$cxxCompiler")"
94-
else
95-
echo "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
96-
exit 1
97-
fi
112+
if ( [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ] ) && ( [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ] ); then
113+
# If a major version was provided explicitly, and it was too old, find a newer compiler instead
114+
if ! command -v "$compiler" > /dev/null; then
115+
echo "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
116+
exit 1
98117
fi
118+
119+
CC="$(command -v "$compiler")"
120+
CXX="$(command -v "$cxxCompiler")"
121+
set_compiler_version_from_CC
99122
fi
100123
fi
101124
else
@@ -110,6 +133,7 @@ if [ -z "$CLR_CC" ]; then
110133
CC="$(command -v "$compiler$desired_version")"
111134
CXX="$(command -v "$cxxCompiler$desired_version")"
112135
if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler")"; fi
136+
set_compiler_version_from_CC
113137
fi
114138
else
115139
if [ ! -f "$CLR_CC" ]; then
@@ -118,17 +142,22 @@ else
118142
fi
119143
CC="$CLR_CC"
120144
CXX="$CLR_CXX"
145+
set_compiler_version_from_CC
121146
fi
122147

123148
if [ -z "$CC" ]; then
124149
echo "Unable to find $compiler."
125150
exit 1
126151
fi
127152

128-
# Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
129-
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && ([ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]); then
130-
if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
131-
LDFLAGS="-fuse-ld=lld"
153+
if [ "$(uname)" != "Darwin" ]; then
154+
# On Darwin, we always want to use the Apple linker.
155+
156+
# Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
157+
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && ( [ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ] ); then
158+
if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
159+
LDFLAGS="-fuse-ld=lld"
160+
fi
132161
fi
133162
fi
134163

‎eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.5" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
384384

385385
# If the version of msbuild is going to be xcopied,
386386
# use this version. Version matches a package here:
387-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.8.5
388-
$defaultXCopyMSBuildVersion = '17.8.5'
387+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0
388+
$defaultXCopyMSBuildVersion = '17.10.0-pre.4.0'
389389

390390
if (!$vsRequirements) {
391391
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": "9.0.100-preview.3.24204.13"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.5",
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24223.1",
1818
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5"
1919
}
2020
}

0 commit comments

Comments
 (0)