Update build scripts for .NET 7.0.

This commit is contained in:
2022-12-23 17:37:31 +00:00
parent e10c237ebd
commit 89ea1b2b3e
2 changed files with 11 additions and 11 deletions

View File

@@ -8,9 +8,9 @@ mkdir -p build
cd Aaru
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;
for distro in alpine-arm64 alpine-arm alpine-x64 linux-arm64 linux-arm linux-x64 osx-arm64 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 net6 -r ${distro} -c ${conf}
dotnet publish -f net7.0 -r ${distro} -c ${conf}
# Package the Linux packages (stopped working)
# if [[ ${distro} == alpine* ]] || [[ ${distro} == linux* ]]; then
@@ -22,7 +22,7 @@ do
# else
# pkg="deb"
# fi
# dotnet ${pkg} -f net6 -r ${distro} -c ${conf} -o ../build
# dotnet ${pkg} -f net7.0 -r ${distro} -c ${conf} -o ../build
#
# Package the Linux packages using MSBuild
@@ -40,8 +40,8 @@ do
extension="deb"
fi
dotnet msbuild Aaru.csproj /t:${task} /p:TargetFramework=net6 /p:RuntimeIdentifier=${distro} /p:Configuration=${conf}
mv bin/${conf}/net6/${distro}/*.${extension} ../build
dotnet msbuild Aaru.csproj /t:${task} /p:TargetFramework=net7.0 /p:RuntimeIdentifier=${distro} /p:Configuration=${conf}
mv bin/${conf}/net7.0/${distro}/*.${extension} ../build
done
done
@@ -87,10 +87,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/net6/osx-x64/publish/* build/macos/Aaru.app/Contents/MacOS
cp -r Aaru/bin/Release/net7.0/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/net6/osx-x64/publish/* build/macos-dbg/Aaru.app/Contents/MacOS
cp -r Aaru/bin/Debug/net7.0/osx-x64/publish/* build/macos-dbg/Aaru.app/Contents/MacOS