From bff1fe78907f488ae366322927e67ba96352a62d Mon Sep 17 00:00:00 2001 From: ta264 Date: Fri, 12 Nov 2021 19:45:54 +0000 Subject: [PATCH] Update to nugets with osx-arm64 runtimes --- build.sh | 19 +++++++++++-------- src/Directory.Build.props | 2 +- src/NzbDrone.Common/Sonarr.Common.csproj | 2 +- .../Sonarr.Core.Test.csproj | 2 +- src/NzbDrone.Core/Sonarr.Core.csproj | 2 +- .../Sonarr.Mono.Test.csproj | 2 +- src/NzbDrone.Mono/Sonarr.Mono.csproj | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/build.sh b/build.sh index 423711611..a6bb12bb5 100755 --- a/build.sh +++ b/build.sh @@ -136,12 +136,13 @@ PackageLinux() PackageMacOS() { local framework="$1" + local runtime="$2" - ProgressStart "Creating MacOS Package for $framework" + ProgressStart "Creating $runtime Package for $framework" - local folder=$artifactsFolder/macos/$framework/Sonarr + local folder=$artifactsFolder/$runtime/$framework/Sonarr - PackageFiles "$folder" "$framework" "osx-x64" + PackageFiles "$folder" "$framework" "$runtime" echo "Removing Service helpers" rm -f $folder/ServiceUninstall.* @@ -163,10 +164,11 @@ PackageMacOS() PackageMacOSApp() { local framework="$1" + local runtime="$2" - ProgressStart "Creating macOS App Package for $framework" + ProgressStart "Creating $runtime App Package for $framework" - local folder=$artifactsFolder/macos-app/$framework + local folder=$artifactsFolder/$runtime-app/$framework rm -rf $folder mkdir -p $folder @@ -174,7 +176,7 @@ PackageMacOSApp() mkdir -p $folder/Sonarr.app/Contents/MacOS echo "Copying Binaries" - cp -r $artifactsFolder/macos/$framework/Sonarr/* $folder/Sonarr.app/Contents/MacOS + cp -r $artifactsFolder/$runtime/$framework/Sonarr/* $folder/Sonarr.app/Contents/MacOS echo "Removing Update Folder" rm -r $folder/Sonarr.app/Contents/MacOS/Sonarr.Update @@ -221,8 +223,8 @@ Package() PackageWindows "$framework" "$runtime" ;; osx) - PackageMacOS "$framework" - PackageMacOSApp "$framework" + PackageMacOS "$framework" "$runtime" + PackageMacOSApp "$framework" "$runtime" ;; esac } @@ -366,6 +368,7 @@ then Package "net6.0" "linux-musl-arm64" Package "net6.0" "linux-arm" Package "net6.0" "osx-x64" + Package "net6.0" "osx-arm64" if [ "$ENABLE_BSD" = "YES" ]; then Package "net6.0" "freebsd-x64" diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b9c4e8099..3b1a4e322 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -6,7 +6,7 @@ AnyCPU true - win-x64;win-x86;osx-x64;linux-x64;linux-musl-x64;linux-arm;linux-arm64;linux-musl-arm64 + win-x64;win-x86;osx-x64;osx-arm64;linux-x64;linux-musl-x64;linux-arm;linux-arm64;linux-musl-arm64 $(MSBuildThisFileDirectory)..\ diff --git a/src/NzbDrone.Common/Sonarr.Common.csproj b/src/NzbDrone.Common/Sonarr.Common.csproj index 20c9a45dc..89ebdb588 100644 --- a/src/NzbDrone.Common/Sonarr.Common.csproj +++ b/src/NzbDrone.Common/Sonarr.Common.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj index aad5a17fd..4d510b27e 100644 --- a/src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/NzbDrone.Core/Sonarr.Core.csproj b/src/NzbDrone.Core/Sonarr.Core.csproj index 3eb5abff7..f18892e92 100644 --- a/src/NzbDrone.Core/Sonarr.Core.csproj +++ b/src/NzbDrone.Core/Sonarr.Core.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/NzbDrone.Mono.Test/Sonarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Sonarr.Mono.Test.csproj index 5b0169141..4e73b9912 100644 --- a/src/NzbDrone.Mono.Test/Sonarr.Mono.Test.csproj +++ b/src/NzbDrone.Mono.Test/Sonarr.Mono.Test.csproj @@ -7,7 +7,7 @@ See https://github.com/xamarin/XamarinComponents/issues/282 --> - + diff --git a/src/NzbDrone.Mono/Sonarr.Mono.csproj b/src/NzbDrone.Mono/Sonarr.Mono.csproj index a93fda8a9..84f5f70f8 100644 --- a/src/NzbDrone.Mono/Sonarr.Mono.csproj +++ b/src/NzbDrone.Mono/Sonarr.Mono.csproj @@ -8,7 +8,7 @@ See https://github.com/xamarin/XamarinComponents/issues/282 --> - +