diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ea2a0220d..948a0a527 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -15,12 +15,12 @@ variables:
buildName: '$(Build.SourceBranchName).$(radarrVersion)'
sentryOrg: 'servarr'
sentryUrl: 'https://sentry.servarr.com'
- dotnetVersion: '6.0.421'
+ dotnetVersion: '8.0.204'
nodeVersion: '20.X'
innoVersion: '6.2.2'
windowsImage: 'windows-2022'
linuxImage: 'ubuntu-20.04'
- macImage: 'macOS-11'
+ macImage: 'macOS-12'
trigger:
branches:
diff --git a/build.sh b/build.sh
index e792ed810..d16e3228a 100755
--- a/build.sh
+++ b/build.sh
@@ -79,9 +79,9 @@ Build()
if [[ -z "$RID" || -z "$FRAMEWORK" ]];
then
- dotnet msbuild -restore $slnFile -p:Configuration=Release -p:Platform=$platform -t:PublishAllRids
+ dotnet msbuild -restore $slnFile -p:SelfContained=True -p:Configuration=Release -p:Platform=$platform -t:PublishAllRids
else
- dotnet msbuild -restore $slnFile -p:Configuration=Release -p:Platform=$platform -p:RuntimeIdentifiers=$RID -t:PublishAllRids
+ dotnet msbuild -restore $slnFile -p:SelfContained=True -p:Configuration=Release -p:Platform=$platform -p:RuntimeIdentifiers=$RID -t:PublishAllRids
fi
ProgressEnd 'Build'
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 7edf52d85..ffc61eda1 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -99,13 +99,6 @@
$(MSBuildProjectName.Replace('Radarr','NzbDrone'))
-
-
-
-
-
-
-
diff --git a/src/NzbDrone.Common/Radarr.Common.csproj b/src/NzbDrone.Common/Radarr.Common.csproj
index 0dd14effd..3364adfaf 100644
--- a/src/NzbDrone.Common/Radarr.Common.csproj
+++ b/src/NzbDrone.Common/Radarr.Common.csproj
@@ -8,13 +8,13 @@
-
-
-
+
+
+
-
-
+
+
diff --git a/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj
index 5c83ca4a1..b536b23be 100644
--- a/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj
@@ -3,7 +3,7 @@
net8.0
-
+
diff --git a/src/NzbDrone.Core/Radarr.Core.csproj b/src/NzbDrone.Core/Radarr.Core.csproj
index cc63e8f2b..ef24166a2 100644
--- a/src/NzbDrone.Core/Radarr.Core.csproj
+++ b/src/NzbDrone.Core/Radarr.Core.csproj
@@ -3,17 +3,17 @@
net8.0
-
+
-
+
-
+
@@ -22,10 +22,10 @@
-
+
-
+
diff --git a/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj
index dec5ca9d2..57c61b1ef 100644
--- a/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj
+++ b/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj
@@ -4,7 +4,7 @@
Library
-
+
diff --git a/src/NzbDrone.Test.Common/Radarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Radarr.Test.Common.csproj
index 667e19269..e7baf786a 100644
--- a/src/NzbDrone.Test.Common/Radarr.Test.Common.csproj
+++ b/src/NzbDrone.Test.Common/Radarr.Test.Common.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/src/NzbDrone.Update/Radarr.Update.csproj b/src/NzbDrone.Update/Radarr.Update.csproj
index 41f24bd8e..0477ed74b 100644
--- a/src/NzbDrone.Update/Radarr.Update.csproj
+++ b/src/NzbDrone.Update/Radarr.Update.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/src/NzbDrone.Windows/Radarr.Windows.csproj b/src/NzbDrone.Windows/Radarr.Windows.csproj
index 8fdb8d495..844fff0d5 100644
--- a/src/NzbDrone.Windows/Radarr.Windows.csproj
+++ b/src/NzbDrone.Windows/Radarr.Windows.csproj
@@ -4,7 +4,7 @@
true
-
+
diff --git a/src/Radarr.Api.V3/Radarr.Api.V3.csproj b/src/Radarr.Api.V3/Radarr.Api.V3.csproj
index ddc83d4f0..e4d825685 100644
--- a/src/Radarr.Api.V3/Radarr.Api.V3.csproj
+++ b/src/Radarr.Api.V3/Radarr.Api.V3.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/src/Radarr.Http/Radarr.Http.csproj b/src/Radarr.Http/Radarr.Http.csproj
index effc2c361..52465606e 100644
--- a/src/Radarr.Http/Radarr.Http.csproj
+++ b/src/Radarr.Http/Radarr.Http.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/test.sh b/test.sh
index 0e0fe9bc6..22fd648dc 100755
--- a/test.sh
+++ b/test.sh
@@ -37,11 +37,14 @@ fi
if [ "$PLATFORM" = "Windows" ]; then
mkdir -p "$ProgramData/Radarr"
WHERE="$WHERE&Category!=LINUX"
-elif [ "$PLATFORM" = "Linux" ] || [ "$PLATFORM" = "Mac" ] ; then
+elif [ "$PLATFORM" = "Linux" ]; then
mkdir -p ~/.config/Radarr
WHERE="$WHERE&Category!=WINDOWS"
+elif [ "$PLATFORM" = "Mac" ]; then
+ mkdir -p ~/Library/Application\ Support/Radarr
+ WHERE="$WHERE&Category!=WINDOWS"
else
- echo "Platform must be provided as first arguement: Windows, Linux or Mac"
+ echo "Platform must be provided as first argument: Windows, Linux or Mac"
exit 1
fi