зеркало из https://github.com/dotnet/cli-lab.git
Update dependencies from https://github.com/dotnet/arcade build 20240725.3
Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24179.6 -> To Version 9.0.0-beta.24375.3
This commit is contained in:
Родитель
3449111614
Коммит
b498dd9dfb
|
@ -3,9 +3,9 @@
|
|||
<ProductDependencies>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24368.9">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24375.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
|
||||
<Sha>3e18bd4f62388b829d0b9dcd1ee131431674aa5f</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
@ -34,10 +34,12 @@ jobs:
|
|||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: $(DncEngPublicBuildPool)
|
||||
image: windows.vs2022.amd64.open
|
||||
image: 1es-windows-2022-open
|
||||
os: windows
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: windows.vs2022.amd64
|
||||
image: 1es-windows-2022
|
||||
os: windows
|
||||
|
||||
steps:
|
||||
- ${{ if eq(parameters.is1ESPipeline, '') }}:
|
||||
|
|
|
@ -605,18 +605,18 @@ elif [[ "$__CodeName" == "illumos" ]]; then
|
|||
fi
|
||||
echo "Building binutils. Please wait.."
|
||||
if [[ "$__hasWget" == 1 ]]; then
|
||||
wget -O- https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf -
|
||||
wget -O- https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz | tar -xJf -
|
||||
else
|
||||
curl -SL https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf -
|
||||
curl -SL https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz | tar -xJf -
|
||||
fi
|
||||
mkdir build-binutils && cd build-binutils
|
||||
../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir"
|
||||
../binutils-2.42/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.11" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir"
|
||||
make -j "$JOBS" && make install && cd ..
|
||||
echo "Building gcc. Please wait.."
|
||||
if [[ "$__hasWget" == 1 ]]; then
|
||||
wget -O- https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf -
|
||||
wget -O- https://ftp.gnu.org/gnu/gcc/gcc-13.3.0/gcc-13.3.0.tar.xz | tar -xJf -
|
||||
else
|
||||
curl -SL https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf -
|
||||
curl -SL https://ftp.gnu.org/gnu/gcc/gcc-13.3.0/gcc-13.3.0.tar.xz | tar -xJf -
|
||||
fi
|
||||
CFLAGS="-fPIC"
|
||||
CXXFLAGS="-fPIC"
|
||||
|
@ -624,7 +624,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then
|
|||
CFLAGS_FOR_TARGET="-fPIC"
|
||||
export CFLAGS CXXFLAGS CXXFLAGS_FOR_TARGET CFLAGS_FOR_TARGET
|
||||
mkdir build-gcc && cd build-gcc
|
||||
../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \
|
||||
../gcc-13.3.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.11" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \
|
||||
--with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \
|
||||
--disable-libquadmath-support --disable-shared --enable-tls
|
||||
make -j "$JOBS" && make install && cd ..
|
||||
|
@ -632,7 +632,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then
|
|||
if [[ "$__UseMirror" == 1 ]]; then
|
||||
BaseUrl=https://pkgsrc.smartos.skylime.net
|
||||
fi
|
||||
BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All"
|
||||
BaseUrl="$BaseUrl/packages/SmartOS/2019Q4/${__illumosArch}/All"
|
||||
echo "Downloading manifest"
|
||||
if [[ "$__hasWget" == 1 ]]; then
|
||||
wget "$BaseUrl"
|
||||
|
|
|
@ -19,11 +19,9 @@ case "$compiler" in
|
|||
# clangx.y or clang-x.y
|
||||
version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
|
||||
majorVersion="${version%%.*}"
|
||||
[ -z "${version##*.*}" ] && minorVersion="${version#*.}"
|
||||
|
||||
if [ -z "$minorVersion" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -le 6 ]; then
|
||||
minorVersion=0;
|
||||
fi
|
||||
# LLVM based on v18 released in early 2024, with two releases per year
|
||||
maxVersion="$((18 + ((($(date +%Y) - 2024) * 12 + $(date +%m) - 3) / 6)))"
|
||||
compiler=clang
|
||||
;;
|
||||
|
||||
|
@ -31,7 +29,9 @@ case "$compiler" in
|
|||
# gccx.y or gcc-x.y
|
||||
version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
|
||||
majorVersion="${version%%.*}"
|
||||
[ -z "${version##*.*}" ] && minorVersion="${version#*.}"
|
||||
|
||||
# GCC based on v14 released in early 2024, with one release per year
|
||||
maxVersion="$((14 + ((($(date +%Y) - 2024) * 12 + $(date +%m) - 3) / 12)))"
|
||||
compiler=gcc
|
||||
;;
|
||||
esac
|
||||
|
@ -49,12 +49,10 @@ check_version_exists() {
|
|||
desired_version=-1
|
||||
|
||||
# Set up the environment to be used for building with the desired compiler.
|
||||
if command -v "$compiler-$1.$2" > /dev/null; then
|
||||
desired_version="-$1.$2"
|
||||
elif command -v "$compiler$1$2" > /dev/null; then
|
||||
desired_version="$1$2"
|
||||
elif command -v "$compiler-$1$2" > /dev/null; then
|
||||
desired_version="-$1$2"
|
||||
if command -v "$compiler-$1" > /dev/null; then
|
||||
desired_version="-$1"
|
||||
elif command -v "$compiler$1" > /dev/null; then
|
||||
desired_version="$1"
|
||||
fi
|
||||
|
||||
echo "$desired_version"
|
||||
|
@ -75,7 +73,7 @@ set_compiler_version_from_CC() {
|
|||
fi
|
||||
|
||||
# gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments.
|
||||
IFS=. read -r majorVersion minorVersion _ <<EOF
|
||||
IFS=. read -r majorVersion _ <<EOF
|
||||
$version
|
||||
EOF
|
||||
}
|
||||
|
@ -84,43 +82,29 @@ if [ -z "$CLR_CC" ]; then
|
|||
|
||||
# Set default versions
|
||||
if [ -z "$majorVersion" ]; then
|
||||
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
|
||||
if [ "$compiler" = "clang" ]; then versions="18 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"
|
||||
elif [ "$compiler" = "gcc" ]; then versions="14 13 12 11 10 9 8 7 6 5 4.9"; fi
|
||||
|
||||
for version in $versions; do
|
||||
_major="${version%%.*}"
|
||||
[ -z "${version##*.*}" ] && _minor="${version#*.}"
|
||||
desired_version="$(check_version_exists "$_major" "$_minor")"
|
||||
if [ "$desired_version" != "-1" ]; then majorVersion="$_major"; break; fi
|
||||
minVersion=8
|
||||
maxVersion="$((maxVersion + 1))" # +1 for headspace
|
||||
i="$maxVersion"
|
||||
while [ "$i" -ge $minVersion ]; do
|
||||
desired_version="$(check_version_exists "$i")"
|
||||
if [ "$desired_version" != "-1" ]; then majorVersion="$i"; break; fi
|
||||
i=$((i - 1))
|
||||
done
|
||||
|
||||
if [ -z "$majorVersion" ]; then
|
||||
if ! command -v "$compiler" > /dev/null; then
|
||||
echo "Error: No usable version of $compiler found."
|
||||
echo "Error: No compatible version of $compiler was found within the range of $minVersion to $maxVersion. Please upgrade your toolchain or specify the compiler explicitly using CLR_CC and CLR_CXX environment variables."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
CC="$(command -v "$compiler" 2> /dev/null)"
|
||||
CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
|
||||
set_compiler_version_from_CC
|
||||
else
|
||||
if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ] && { [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; }; then
|
||||
# If a major version was provided explicitly, and it was too old, find a newer compiler instead
|
||||
if ! command -v "$compiler" > /dev/null; then
|
||||
echo "Error: Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
CC="$(command -v "$compiler" 2> /dev/null)"
|
||||
CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
|
||||
set_compiler_version_from_CC
|
||||
fi
|
||||
fi
|
||||
else
|
||||
desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
|
||||
desired_version="$(check_version_exists "$majorVersion")"
|
||||
if [ "$desired_version" = "-1" ]; then
|
||||
echo "Error: Could not find specific version of $compiler: $majorVersion $minorVersion."
|
||||
echo "Error: Could not find specific version of $compiler: $majorVersion."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
|
|
@ -8,6 +8,6 @@
|
|||
}
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24368.9"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24375.3"
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче