Update to nugets with osx-arm64 runtimes

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"
+            PackageMacOS "$framework" "$runtime"
-            PackageMacOSApp "$framework"
+            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"

src/Directory.Build.props

@@ -6,7 +6,7 @@
 
     <PlatformTarget>AnyCPU</PlatformTarget>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <RuntimeIdentifiers>win-x64;win-x86;osx-x64;linux-x64;linux-musl-x64;linux-arm;linux-arm64;linux-musl-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;osx-x64;osx-arm64;linux-x64;linux-musl-x64;linux-arm;linux-arm64;linux-musl-arm64</RuntimeIdentifiers>
 
     <SonarrRootDir>$(MSBuildThisFileDirectory)..\</SonarrRootDir>
 

src/NzbDrone.Common/Sonarr.Common.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="SharpZipLib" Version="1.3.3" />
     <PackageReference Include="System.Text.Json" Version="6.0.4" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.0-0" />
+    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />

src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj

@@ -5,7 +5,7 @@
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.0.123" />
     <PackageReference Include="NBuilder" Version="6.1.0" />
-    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.0-0" />
+    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Test.Common\Sonarr.Test.Common.csproj" />

src/NzbDrone.Core/Sonarr.Core.csproj

@@ -17,7 +17,7 @@
     <PackageReference Include="NLog" Version="4.7.14" />
     <PackageReference Include="Kveer.XmlRPC" Version="1.2.0" />
     <PackageReference Include="MonoTorrent" Version="2.0.5" />
-    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.0-0" />
+    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
     <PackageReference Include="System.Text.Json" Version="6.0.4" />
   </ItemGroup>
   <ItemGroup>

src/NzbDrone.Mono.Test/Sonarr.Mono.Test.csproj

@@ -7,7 +7,7 @@
        See https://github.com/xamarin/XamarinComponents/issues/282
   -->
   <ItemGroup>
-    <PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1-servarr1" />
+    <PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1.34-servarr18" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Common.Test\Sonarr.Common.Test.csproj" />

src/NzbDrone.Mono/Sonarr.Mono.csproj

@@ -8,7 +8,7 @@
        See https://github.com/xamarin/XamarinComponents/issues/282
   -->
   <ItemGroup>
-    <PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1-servarr1" />
+    <PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1.34-servarr18" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" />
   </ItemGroup>
   <ItemGroup>