Skip to content

Commit 164fde0

Browse files
[main] Update dependencies from dotnet/arcade (#6995)
* Update dependencies from https://github.com/dotnet/arcade build 20240206.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24102.4 -> To Version 9.0.0-beta.24106.2 * Update dependencies from https://github.com/dotnet/arcade build 20240214.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24102.4 -> To Version 9.0.0-beta.24114.1 * Update dependencies from https://github.com/dotnet/arcade build 20240214.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24102.4 -> To Version 9.0.0-beta.24114.1 * Fix merge conflict in global.json * Update dependencies from https://github.com/dotnet/arcade build 20240301.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24102.4 -> To Version 9.0.0-beta.24151.5 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Eric StJohn <[email protected]>
1 parent 99c620a commit 164fde0

33 files changed

+1753
-93
lines changed

eng/Version.Details.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,33 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24102.4">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24151.5">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
12+
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24102.4">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24151.5">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
16+
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24102.4">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24151.5">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
20+
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24102.4">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24151.5">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
24+
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24102.4">
26+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24151.5">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
28+
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
2929
</Dependency>
30-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24102.4">
30+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24151.5">
3131
<Uri>https://github.com/dotnet/arcade</Uri>
32-
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
32+
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24102.4">
34+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24151.5">
3535
<Uri>https://github.com/dotnet/arcade</Uri>
36-
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
36+
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
3737
</Dependency>
3838
</ToolsetDependencies>
3939
</Dependencies>

eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
8080
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
8181
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
82-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24102.4</MicrosoftDotNetXUnitExtensionsVersion>
82+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24151.5</MicrosoftDotNetXUnitExtensionsVersion>
8383
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
8484
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
8585
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>

eng/common/native/init-distro-rid.sh

+38-42
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bash
1+
#!/bin/sh
22

33
# getNonPortableDistroRid
44
#
@@ -11,67 +11,66 @@
1111
# non-portable rid
1212
getNonPortableDistroRid()
1313
{
14-
local targetOs="$1"
15-
local targetArch="$2"
16-
local rootfsDir="$3"
17-
local nonPortableRid=""
14+
targetOs="$1"
15+
targetArch="$2"
16+
rootfsDir="$3"
17+
nonPortableRid=""
1818

1919
if [ "$targetOs" = "linux" ]; then
20+
# shellcheck disable=SC1091
2021
if [ -e "${rootfsDir}/etc/os-release" ]; then
21-
source "${rootfsDir}/etc/os-release"
22-
23-
if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then
24-
# remove the last version digit
25-
VERSION_ID="${VERSION_ID%.*}"
22+
. "${rootfsDir}/etc/os-release"
23+
if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then
24+
VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros
2625
fi
2726

28-
if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then
27+
if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then
2928
nonPortableRid="${ID}.${VERSION_ID}-${targetArch}"
3029
else
3130
# Rolling release distros either do not set VERSION_ID, set it as blank or
3231
# set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux);
3332
# so omit it here to be consistent with everything else.
3433
nonPortableRid="${ID}-${targetArch}"
3534
fi
36-
3735
elif [ -e "${rootfsDir}/android_platform" ]; then
38-
source "$rootfsDir"/android_platform
36+
# shellcheck disable=SC1091
37+
. "${rootfsDir}/android_platform"
3938
nonPortableRid="$RID"
4039
fi
4140
fi
4241

4342
if [ "$targetOs" = "freebsd" ]; then
44-
# $rootfsDir can be empty. freebsd-version is shell script and it should always work.
45-
__freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; })
43+
# $rootfsDir can be empty. freebsd-version is a shell script and should always work.
44+
__freebsd_major_version=$("$rootfsDir"/bin/freebsd-version | cut -d'.' -f1)
4645
nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}"
47-
elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then
46+
elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then
4847
__android_sdk_version=$(getprop ro.build.version.sdk)
4948
nonPortableRid="android.$__android_sdk_version-${targetArch}"
5049
elif [ "$targetOs" = "illumos" ]; then
5150
__uname_version=$(uname -v)
5251
case "$__uname_version" in
5352
omnios-*)
54-
__omnios_major_version=$(echo "${__uname_version:8:2}")
55-
nonPortableRid=omnios."$__omnios_major_version"-"$targetArch"
56-
;;
53+
__omnios_major_version=$(echo "$__uname_version" | cut -c9-10)
54+
nonPortableRid="omnios.$__omnios_major_version-${targetArch}"
55+
;;
5756
joyent_*)
58-
__smartos_major_version=$(echo "${__uname_version:7:4}")
59-
nonPortableRid=smartos."$__smartos_major_version"-"$targetArch"
60-
;;
61-
illumos_*)
62-
nonPortableRid=openindiana-"$targetArch"
63-
;;
57+
__smartos_major_version=$(echo "$__uname_version" | cut -c9-10)
58+
nonPortableRid="smartos.$__smartos_major_version-${targetArch}"
59+
;;
60+
*)
61+
nonPortableRid="illumos-${targetArch}"
62+
;;
6463
esac
6564
elif [ "$targetOs" = "solaris" ]; then
6665
__uname_version=$(uname -v)
67-
__solaris_major_version=$(echo "${__uname_version%.*}")
68-
nonPortableRid=solaris."$__solaris_major_version"-"$targetArch"
66+
__solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1)
67+
nonPortableRid="solaris.$__solaris_major_version-${targetArch}"
6968
elif [ "$targetOs" = "haiku" ]; then
70-
__uname_release=$(uname -r)
69+
__uname_release="$(uname -r)"
7170
nonPortableRid=haiku.r"$__uname_release"-"$targetArch"
7271
fi
7372

74-
echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')"
73+
echo "$nonPortableRid" | tr '[:upper:]' '[:lower:]'
7574
}
7675

7776
# initDistroRidGlobal
@@ -85,26 +84,23 @@ getNonPortableDistroRid()
8584
# None
8685
#
8786
# Notes:
88-
#
89-
# It is important to note that the function does not return anything, but it
90-
# exports the following variables on success:
91-
#
92-
# __DistroRid : Non-portable rid of the target platform.
93-
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
94-
#
87+
# It is important to note that the function does not return anything, but it
88+
# exports the following variables on success:
89+
# __DistroRid : Non-portable rid of the target platform.
90+
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
9591
initDistroRidGlobal()
9692
{
97-
local targetOs="$1"
98-
local targetArch="$2"
99-
local rootfsDir=""
100-
if [ "$#" -ge 3 ]; then
93+
targetOs="$1"
94+
targetArch="$2"
95+
rootfsDir=""
96+
if [ $# -ge 3 ]; then
10197
rootfsDir="$3"
10298
fi
10399

104100
if [ -n "${rootfsDir}" ]; then
105101
# We may have a cross build. Check for the existence of the rootfsDir
106102
if [ ! -e "${rootfsDir}" ]; then
107-
echo "Error rootfsDir has been passed, but the location is not valid."
103+
echo "Error: rootfsDir has been passed, but the location is not valid."
108104
exit 1
109105
fi
110106
fi
@@ -119,7 +115,7 @@ initDistroRidGlobal()
119115
STRINGS="$(command -v llvm-strings || true)"
120116
fi
121117

122-
# Check for musl-based distros (e.g Alpine Linux, Void Linux).
118+
# Check for musl-based distros (e.g. Alpine Linux, Void Linux).
123119
if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
124120
( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then
125121
__PortableTargetOS="linux-musl"

eng/common/native/init-os-and-arch.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bash
1+
#!/bin/sh
22

33
# Use uname to determine what the OS is.
44
OSName=$(uname -s | tr '[:upper:]' '[:lower:]')
@@ -35,6 +35,10 @@ fi
3535
case "$CPUName" in
3636
arm64|aarch64)
3737
arch=arm64
38+
if [ "$(getconf LONG_BIT)" -lt 64 ]; then
39+
# This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
40+
arch=arm
41+
fi
3842
;;
3943

4044
loongarch64)
@@ -50,6 +54,7 @@ case "$CPUName" in
5054
;;
5155

5256
armv7l|armv8l)
57+
# shellcheck disable=SC1091
5358
if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then
5459
arch=armel
5560
else

eng/common/post-build/publish-using-darc.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ param(
1212
try {
1313
. $PSScriptRoot\post-build-utils.ps1
1414

15-
$darc = Get-Darc
15+
$darc = Get-Darc
1616

1717
$optionalParams = [System.Collections.ArrayList]::new()
1818

@@ -46,7 +46,7 @@ try {
4646
}
4747

4848
Write-Host 'done.'
49-
}
49+
}
5050
catch {
5151
Write-Host $_
5252
Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."

0 commit comments

Comments
 (0)