8000 Update dependencies from https://github.com/dotnet/arcade build 20240… · dotnet/wpf-test@29acfb8 · GitHub
[go: up one dir, main page]

Skip to content

Commit 29acfb8

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20240725.3 (#328)
[main] Update dependencies from dotnet/arcade
1 parent 1122ae0 commit 29acfb8

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24374.3">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24375.3">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>c45d41114722ff910cde462f4be003b1d7fde58f</Sha>
6+
<Sha>3e18bd4f62388b829d0b9dcd1ee131431674aa5f</Sha>
77
</Dependency>
88
<Dependency Name="Microsoft.DotNet.Arcade.Wpf.Sdk" Version="6.0.0-preview.5.21220.1">
99
<Uri>https://github.com/dotnet/wpf</Uri>

eng/common/cross/build-rootfs.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -605,34 +605,34 @@ elif [[ "$__CodeName" == "illumos" ]]; then
605605
fi
606606
echo "Building binutils. Please wait.."
607607
if [[ "$__hasWget" == 1 ]]; then
608-
wget -O- https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf -
608+
wget -O- https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz | tar -xJf -
609< 10000 /code>609
else
610-
curl -SL https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf -
610+
curl -SL https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz | tar -xJf -
611611
fi
612612
mkdir build-binutils && cd build-binutils
613-
../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir"
613+
../binutils-2.42/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.11" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir"
614614
make -j "$JOBS" && make install && cd ..
615615
echo "Building gcc. Please wait.."
616616
if [[ "$__hasWget" == 1 ]]; then
617-
wget -O- https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf -
617+
wget -O- https://ftp.gnu.org/gnu/gcc/gcc-13.3.0/gcc-13.3.0.tar.xz | tar -xJf -
618618
else
619-
curl -SL https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf -
619+
curl -SL https://ftp.gnu.org/gnu/gcc/gcc-13.3.0/gcc-13.3.0.tar.xz | tar -xJf -
620620
fi
621621
CFLAGS="-fPIC"
622622
CXXFLAGS="-fPIC"
623623
CXXFLAGS_FOR_TARGET="-fPIC"
624624
CFLAGS_FOR_TARGET="-fPIC"
625625
export CFLAGS CXXFLAGS CXXFLAGS_FOR_TARGET CFLAGS_FOR_TARGET
626626
mkdir build-gcc && cd build-gcc
627-
../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \
627+
../gcc-13.3.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.11" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \
628628
--with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \
629629
--disable-libquadmath-support --disable-shared --enable-tls
630630
make -j "$JOBS" && make install && cd ..
631631
BaseUrl=https://pkgsrc.smartos.org
632632
if [[ "$__UseMirror" == 1 ]]; then
633633
BaseUrl=https://pkgsrc.smartos.skylime.net
634634
fi
635-
BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All"
635+
BaseUrl="$BaseUrl/packages/SmartOS/2019Q4/${__illumosArch}/All"
636636
echo "Downloading manifest"
637637
if [[ "$__hasWget" == 1 ]]; then
638638
wget "$BaseUrl"

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24374.3",
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24375.3",
1616
"Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6",
1717
"Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7"
1818
},

0 commit comments

Comments
 (0)
0