From 3f0f4f1a50c1b3e987476ce73e206dc9a12027ea Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 30 Sep 2021 02:32:10 +0100 Subject: [PATCH] Update build scripts for .NET 6. --- .travis.yml | 2 +- build.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 021d6fa05..c26513d81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: csharp solution: Aaru.sln mono: none -dotnet: 3.1.103 +dotnet: 6.0.100 script: - dotnet restore Aaru.sln - dotnet build Aaru.sln diff --git a/build.sh b/build.sh index a2210e630..0eff26aec 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ for conf in Debug Release; do for distro in alpine-x64 linux-arm64 linux-arm linux-x64 osx-x64 win-arm64 win-arm win-x64 win-x86 debian-arm debian-arm64 debian-x64 rhel-arm64 rhel-x64 sles-x64; do - dotnet publish -f netcoreapp3.1 -r ${distro} -c ${conf} + dotnet publish -f net6 -r ${distro} -c ${conf} # Package the Linux packages if [[ ${distro} == alpine* ]] || [[ ${distro} == linux* ]]; then @@ -22,7 +22,7 @@ do else pkg="deb" fi - dotnet ${pkg} -f netcoreapp3.1 -r ${distro} -c ${conf} -o ../build + dotnet ${pkg} -f net6 -r ${distro} -c ${conf} -o ../build done done @@ -67,10 +67,10 @@ mkdir -p build/macos/Aaru.app/Contents/Resources mkdir -p build/macos/Aaru.app/Contents/MacOS cp Aaru/Aaru.icns build/macos/Aaru.app/Contents/Resources cp Aaru/Info.plist build/macos/Aaru.app/Contents -cp -r Aaru/bin/Release/netcoreapp3.1/osx-x64/publish/* build/macos/Aaru.app/Contents/MacOS +cp -r Aaru/bin/Release/net6/osx-x64/publish/* build/macos/Aaru.app/Contents/MacOS rm -Rf build/macos-dbg/Aaru.app mkdir -p build/macos-dbg/Aaru.app/Contents/Resources mkdir -p build/macos-dbg/Aaru.app/Contents/MacOS cp Aaru/Aaru.icns build/macos-dbg/Aaru.app/Contents/Resources cp Aaru/Info.plist build/macos-dbg/Aaru.app/Contents -cp -r Aaru/bin/Debug/netcoreapp3.1/osx-x64/publish/* build/macos-dbg/Aaru.app/Contents/MacOS +cp -r Aaru/bin/Debug/net6/osx-x64/publish/* build/macos-dbg/Aaru.app/Contents/MacOS