Skip to content

Commit 047ca3b

Browse files
[main] Update dependencies from dotnet/arcade (#291)
* Update dependencies from https://github.com/dotnet/arcade build 20230819.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.CodeAnalysis From Version 8.0.0-beta.23371.1 -> To Version 8.0.0-beta.23419.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23368.1 -> To Version 1.0.0-beta.23418.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20230825.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.CodeAnalysis From Version 8.0.0-beta.23371.1 -> To Version 8.0.0-beta.23425.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23368.1 -> To Version 1.0.0-beta.23423.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20230901.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.CodeAnalysis From Version 8.0.0-beta.23371.1 -> To Version 8.0.0-beta.23451.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23368.1 -> To Version 1.0.0-beta.23426.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20230901.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.CodeAnalysis From Version 8.0.0-beta.23371.1 -> To Version 8.0.0-beta.23451.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23368.1 -> To Version 1.0.0-beta.23426.1 (parent: Microsoft.DotNet.Arcade.Sdk --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 9950500 commit 047ca3b

15 files changed

+332
-27
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@
1212
</Dependency>
1313
</ProductDependencies>
1414
<ToolsetDependencies>
15-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23371.1">
15+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23451.1">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>602351e3681015ea789b2aeaa7b2a9156a8baf38</Sha>
17+
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
1818
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1919
</Dependency>
20-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23371.1">
20+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23451.1">
2121
<Uri>https://github.com/dotnet/arcade</Uri>
22-
<Sha>602351e3681015ea789b2aeaa7b2a9156a8baf38</Sha>
22+
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23371.1">
24+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23451.1">
2525
<Uri>https://github.com/dotnet/arcade</Uri>
26-
<Sha>602351e3681015ea789b2aeaa7b2a9156a8baf38</Sha>
26+
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23368.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
28+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
2929
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
30-
<Sha>3aa0b2b84cab7d94b9136547563d027fd78e82a6</Sha>
30+
<Sha>194f32828726c3f1f63f79f3dc09b9e99c157b11</Sha>
3131
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
3232
</Dependency>
3333
</ToolsetDependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</PropertyGroup>
1818
<PropertyGroup>
1919
<!-- Arcade dependencies -->
20-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23371.1</MicrosoftDotNetBuildTasksFeedVersion>
21-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23371.1</MicrosoftDotNetCodeAnalysisVersion>
20+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23451.1</MicrosoftDotNetBuildTasksFeedVersion>
21+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23451.1</MicrosoftDotNetCodeAnalysisVersion>
2222
<!--
2323
These are used as reference assemblies only, so they must not take a ProdCon/source-build
2424
version. Insert "RefOnly" to avoid assignment via PVP.

eng/common/SetupNugetSources.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ if ($dotnet31Source -ne $null) {
153153
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
154154
}
155155

156-
$dotnetVersions = @('5','6','7')
156+
$dotnetVersions = @('5','6','7','8')
157157

158158
foreach ($dotnetVersion in $dotnetVersions) {
159159
$feedPrefix = "dotnet" + $dotnetVersion;

eng/common/SetupNugetSources.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ if [ "$?" == "0" ]; then
105105
PackageSources+=('dotnet3.1-internal-transport')
106106
fi
107107

108-
DotNetVersions=('5' '6' '7')
108+
DotNetVersions=('5' '6' '7' '8')
109109

110110
for DotNetVersion in ${DotNetVersions[@]} ; do
111111
FeedPrefix="dotnet${DotNetVersion}";

eng/common/cross/toolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ elseif(ILLUMOS)
207207
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
208208
elseif(HAIKU)
209209
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
210+
set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
210211

211212
set(TOOLSET_PREFIX ${TOOLCHAIN}-)
212213
function(locate_toolchain_exec exec var)
@@ -217,7 +218,6 @@ elseif(HAIKU)
217218
endif()
218219

219220
find_program(EXEC_LOCATION_${exec}
220-
PATHS "${CROSS_ROOTFS}/cross-tools-x86_64/bin"
221221
NAMES
222222
"${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
223223
"${TOOLSET_PREFIX}${exec}")
-1.89 KB
Binary file not shown.

eng/common/native/init-compiler.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then
6363
# Set default versions
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.
66-
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"
66+
if [ "$compiler" = "clang" ]; then versions="17 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"
6767
elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi
6868

6969
for version in $versions; do
Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
#!/usr/bin/env bash
2+
3+
# getNonPortableDistroRid
4+
#
5+
# Input:
6+
# targetOs: (str)
7+
# targetArch: (str)
8+
# rootfsDir: (str)
9+
#
10+
# Return:
11+
# non-portable rid
12+
getNonPortableDistroRid()
13+
{
14+
local targetOs="$1"
15+
local targetArch="$2"
16+
local rootfsDir="$3"
17+
local nonPortableRid=""
18+
19+
if [ "$targetOs" = "linux" ]; then
20+
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%.*}"
26+
fi
27+
28+
if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then
29+
nonPortableRid="${ID}.${VERSION_ID}-${targetArch}"
30+
else
31+
# Rolling release distros either do not set VERSION_ID, set it as blank or
32+
# set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux);
33+
# so omit it here to be consistent with everything else.
34+
nonPortableRid="${ID}-${targetArch}"
35+
fi
36+
37+
elif [ -e "${rootfsDir}/android_platform" ]; then
38+
source "$rootfsDir"/android_platform
39+
nonPortableRid="$RID"
40+
fi
41+
fi
42+
43+
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%%.*}"; })
46+
nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}"
47+
elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then
48+
__android_sdk_version=$(getprop ro.build.version.sdk)
49+
nonPortableRid="android.$__android_sdk_version-${targetArch}"
50+
elif [ "$targetOs" = "illumos" ]; then
51+
__uname_version=$(uname -v)
52+
case "$__uname_version" in
53+
omnios-*)
54+
__omnios_major_version=$(echo "${__uname_version:8:2}")
55+
nonPortableRid=omnios."$__omnios_major_version"-"$targetArch"
56+
;;
57+
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+
;;
64+
esac
65+
elif [ "$targetOs" = "solaris" ]; then
66+
__uname_version=$(uname -v)
67+
__solaris_major_version=$(echo "${__uname_version%.*}")
68+
nonPortableRid=solaris."$__solaris_major_version"-"$targetArch"
69+
elif [ "$targetOs" = "haiku" ]; then
70+
__uname_release=$(uname -r)
71+
nonPortableRid=haiku.r"$__uname_release"-"$targetArch"
72+
fi
73+
74+
echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')"
75+
}
76+
77+
# initDistroRidGlobal
78+
#
79+
# Input:
80+
# os: (str)
81+
# arch: (str)
82+
# rootfsDir?: (nullable:string)
83+
#
84+
# Return:
85+
# None
86+
#
87+
# 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+
#
95+
initDistroRidGlobal()
96+
{
97+
local targetOs="$1"
98+
local targetArch="$2"
99+
local rootfsDir=""
100+
if [ "$#" -ge 3 ]; then
101+
rootfsDir="$3"
102+
fi
103+
104+
if [ -n "${rootfsDir}" ]; then
105+
# We may have a cross build. Check for the existence of the rootfsDir
106+
if [ ! -e "${rootfsDir}" ]; then
107+
echo "Error rootfsDir has been passed, but the location is not valid."
108+
exit 1
109+
fi
110+
fi
111+
112+
__DistroRid=$(getNonPortableDistroRid "${targetOs}" "${targetArch}" "${rootfsDir}")
113+
114+
if [ -z "${__PortableTargetOS:-}" ]; then
115+
__PortableTargetOS="$targetOs"
116+
117+
STRINGS="$(command -v strings || true)"
118+
if [ -z "$STRINGS" ]; then
119+
STRINGS="$(command -v llvm-strings || true)"
120+
fi
121+
122+
# Check for musl-based distros (e.g Alpine Linux, Void Linux).
123+
if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
124+
( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then
125+
__PortableTargetOS="linux-musl"
126+
fi
127+
fi
128+
129+
export __DistroRid __PortableTargetOS
130+
}
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
#!/usr/bin/env bash
2+
3+
# Use uname to determine what the OS is.
4+
OSName=$(uname -s | tr '[:upper:]' '[:lower:]')
5+
6+
if command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then
7+
OSName="android"
8+
fi
9+
10+
case "$OSName" in
11+
freebsd|linux|netbsd|openbsd|sunos|android|haiku)
12+
os="$OSName" ;;
13+
darwin)
14+
os=osx ;;
15+
*)
16+
echo "Unsupported OS $OSName detected!"
17+
exit 1 ;;
18+
esac
19+
20+
# On Solaris, `uname -m` is discouraged, see https://docs.oracle.com/cd/E36784_01/html/E36870/uname-1.html
21+
# and `uname -p` returns processor type (e.g. i386 on amd64).
22+
# The appropriate tool to determine CPU is isainfo(1) https://docs.oracle.com/cd/E36784_01/html/E36870/isainfo-1.html.
23+
if [ "$os" = "sunos" ]; then
24+
if uname -o 2>&1 | grep -q illumos; then
25+
os="illumos"
26+
else
27+
os="solaris"
28+
fi
29+
CPUName=$(isainfo -n)
30+
else
31+
# For the rest of the operating systems, use uname(1) to determine what the CPU is.
32+
CPUName=$(uname -m)
33+
fi
34+
35+
case "$CPUName" in
36+
arm64|aarch64)
37+
arch=arm64
38+
;;
39+
40+
loongarch64)
41+
arch=loongarch64
42+
;;
43+
44+
riscv64)
45+
arch=riscv64
46+
;;
47+
48+
amd64|x86_64)
49+
arch=x64
50+
;;
51+
52+
armv7l|armv8l)
53+
if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then
54+
arch=armel
55+
else
56+
arch=arm
57+
fi
58+
;;
59+
60+
armv6l)
61+
arch=armv6
62+
;;
63+
64+
i[3-6]86)
65+
echo "Unsupported CPU $CPUName detected, build might not succeed!"
66+
arch=x86
67+
;;
68+
69+
s390x)
70+
arch=s390x
71+
;;
72+
73+
ppc64le)
74+
arch=ppc64le
75+
;;
76+
*)
77+
echo "Unknown CPU $CPUName detected!"
78+
exit 1
79+
;;
80+
esac

eng/common/sdl/extract-artifact-packages.ps1

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,31 +35,33 @@ try {
3535
param(
3636
[string] $PackagePath # Full path to a NuGet package
3737
)
38-
38+
3939
if (!(Test-Path $PackagePath)) {
4040
Write-PipelineTelemetryError -Category 'Build' -Message "Input file does not exist: $PackagePath"
4141
ExitWithExitCode 1
4242
}
43-
43+
4444
$RelevantExtensions = @('.dll', '.exe', '.pdb')
4545
Write-Host -NoNewLine 'Extracting ' ([System.IO.Path]::GetFileName($PackagePath)) '...'
46-
46+
4747
$PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath)
4848
$ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId
49-
49+
5050
Add-Type -AssemblyName System.IO.Compression.FileSystem
51-
51+
5252
[System.IO.Directory]::CreateDirectory($ExtractPath);
53-
53+
5454
try {
5555
$zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath)
5656

5757
$zip.Entries |
5858
Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} |
5959
ForEach-Object {
60-
$TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.Name
61-
62-
[System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true)
60+
$TargetPath = Join-Path -Path $ExtractPath -ChildPath (Split-Path -Path $_.FullName)
61+
[System.IO.Directory]::CreateDirectory($TargetPath);
62+
63+
$TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.FullName
64+
[System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile)
6365
}
6466
}
6567
catch {

0 commit comments

Comments
 (0)