From 1e396ead5e1f9decd39c96ff69dd364f37f0ae1a Mon Sep 17 00:00:00 2001 From: Qstick Date: Sun, 10 Jan 2021 20:54:54 -0500 Subject: [PATCH] Bump NetFramework to 4.7.2 --- azure-pipelines.yml | 4 ++-- build.sh | 6 +++--- src/Directory.Build.props | 2 +- src/Directory.Build.targets | 2 +- src/NzbDrone.Api.Test/Radarr.Api.Test.csproj | 2 +- src/NzbDrone.Api/Radarr.Api.csproj | 2 +- src/NzbDrone.Automation.Test/Radarr.Automation.Test.csproj | 2 +- src/NzbDrone.Common.Test/Radarr.Common.Test.csproj | 4 ++-- src/NzbDrone.Common/Radarr.Common.csproj | 4 ++-- src/NzbDrone.Console/Radarr.Console.csproj | 2 +- src/NzbDrone.Core.Test/Radarr.Core.Test.csproj | 2 +- src/NzbDrone.Core/Radarr.Core.csproj | 4 ++-- src/NzbDrone.Host.Test/Radarr.Host.Test.csproj | 4 ++-- src/NzbDrone.Host/Radarr.Host.csproj | 6 +++--- .../Radarr.Integration.Test.csproj | 4 ++-- src/NzbDrone.Libraries.Test/Radarr.Libraries.Test.csproj | 2 +- src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj | 4 ++-- src/NzbDrone.Mono/Radarr.Mono.csproj | 4 ++-- src/NzbDrone.SignalR/Radarr.SignalR.csproj | 4 ++-- src/NzbDrone.Test.Common/NzbDroneRunner.cs | 2 +- src/NzbDrone.Test.Common/Radarr.Test.Common.csproj | 2 +- src/NzbDrone.Test.Dummy/Radarr.Test.Dummy.csproj | 2 +- src/NzbDrone.Update.Test/Radarr.Update.Test.csproj | 2 +- src/NzbDrone.Update/Radarr.Update.csproj | 2 +- src/NzbDrone.Windows.Test/Radarr.Windows.Test.csproj | 2 +- src/NzbDrone.Windows/Radarr.Windows.csproj | 2 +- src/NzbDrone/Radarr.csproj | 4 ++-- src/Radarr.Api.V3/Radarr.Api.V3.csproj | 2 +- src/Radarr.Http/Radarr.Http.csproj | 2 +- src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj | 2 +- src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj | 2 +- 31 files changed, 45 insertions(+), 45 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bc1227236..4c19fd41b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -96,7 +96,7 @@ stages: artifact: WindowsCoreTests displayName: Publish Windows Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/net462/linux-x64/publish' + - publish: '$(testsFolder)/net472/linux-x64/publish' artifact: LinuxTests displayName: Publish Linux Mono Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) @@ -261,7 +261,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-x64/net462 + rootFolderOrFile: $(artifactsFolder)/linux-x64/net472 - task: ArchiveFiles@2 displayName: Create Linux Core tar inputs: diff --git a/build.sh b/build.sh index 135f55081..79f85ea5e 100755 --- a/build.sh +++ b/build.sh @@ -136,7 +136,7 @@ PackageMacOS() PackageFiles "$folder" "$framework" "osx-x64" - if [ "$framework" = "net462" ]; then + if [ "$framework" = "net472" ]; then echo "Adding Startup script" cp macOS/Radarr $folder fi @@ -316,7 +316,7 @@ then PackageTests "net5.0" "linux-x64" PackageTests "net5.0" "linux-musl-x64" PackageTests "net5.0" "osx-x64" - PackageTests "net462" "linux-x64" + PackageTests "net472" "linux-x64" else PackageTests "$FRAMEWORK" "$RID" fi @@ -352,7 +352,7 @@ then Package "net5.0" "linux-musl-arm64" Package "net5.0" "linux-arm" Package "net5.0" "osx-x64" - Package "net462" "linux-x64" + Package "net472" "linux-x64" else Package "$FRAMEWORK" "$RID" fi diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 085a8ab6d..c723db101 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:net462;win-x86:net462;osx-x64:net462;linux-arm:net462;linux-arm64:net462;linux-musl-x64:net462;linux-musl-arm64:net462 + win-x64:net472;win-x86:net472;osx-x64:net472;linux-arm:net472;linux-arm64:net472;linux-musl-x64:net472;linux-musl-arm64:net472 $(MSBuildThisFileDirectory)..\ diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index e8efeb5ec..c5681e6b2 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -1,6 +1,6 @@ - + full diff --git a/src/NzbDrone.Api.Test/Radarr.Api.Test.csproj b/src/NzbDrone.Api.Test/Radarr.Api.Test.csproj index 62b098b20..757942be2 100644 --- a/src/NzbDrone.Api.Test/Radarr.Api.Test.csproj +++ b/src/NzbDrone.Api.Test/Radarr.Api.Test.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0;net472 diff --git a/src/NzbDrone.Api/Radarr.Api.csproj b/src/NzbDrone.Api/Radarr.Api.csproj index 46901e4f9..8551fc461 100644 --- a/src/NzbDrone.Api/Radarr.Api.csproj +++ b/src/NzbDrone.Api/Radarr.Api.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0;net472 diff --git a/src/NzbDrone.Automation.Test/Radarr.Automation.Test.csproj b/src/NzbDrone.Automation.Test/Radarr.Automation.Test.csproj index cb3d95521..3a6170ac0 100644 --- a/src/NzbDrone.Automation.Test/Radarr.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/Radarr.Automation.Test.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0;net472 diff --git a/src/NzbDrone.Common.Test/Radarr.Common.Test.csproj b/src/NzbDrone.Common.Test/Radarr.Common.Test.csproj index 1779814f0..7b7306832 100644 --- a/src/NzbDrone.Common.Test/Radarr.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/Radarr.Common.Test.csproj @@ -1,13 +1,13 @@ - net462;net5.0 + net5.0;net472 - + diff --git a/src/NzbDrone.Common/Radarr.Common.csproj b/src/NzbDrone.Common/Radarr.Common.csproj index 64351bcb5..5e8a180c0 100644 --- a/src/NzbDrone.Common/Radarr.Common.csproj +++ b/src/NzbDrone.Common/Radarr.Common.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0;net472 @@ -18,7 +18,7 @@ - + diff --git a/src/NzbDrone.Console/Radarr.Console.csproj b/src/NzbDrone.Console/Radarr.Console.csproj index 706412b3c..bc5851b45 100644 --- a/src/NzbDrone.Console/Radarr.Console.csproj +++ b/src/NzbDrone.Console/Radarr.Console.csproj @@ -1,7 +1,7 @@ Exe - net462;net5.0 + net5.0;net472 ..\NzbDrone.Host\Radarr.ico app.manifest diff --git a/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj index 09757527b..f8a99328e 100644 --- a/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/Radarr.Core.Test.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0;net472 diff --git a/src/NzbDrone.Core/Radarr.Core.csproj b/src/NzbDrone.Core/Radarr.Core.csproj index 4ca99556d..6d9300396 100644 --- a/src/NzbDrone.Core/Radarr.Core.csproj +++ b/src/NzbDrone.Core/Radarr.Core.csproj @@ -1,6 +1,6 @@  - net462;net5.0 + net5.0;net472 @@ -21,7 +21,7 @@ - + diff --git a/src/NzbDrone.Host.Test/Radarr.Host.Test.csproj b/src/NzbDrone.Host.Test/Radarr.Host.Test.csproj index 728a3e205..1fd96fbea 100644 --- a/src/NzbDrone.Host.Test/Radarr.Host.Test.csproj +++ b/src/NzbDrone.Host.Test/Radarr.Host.Test.csproj @@ -1,12 +1,12 @@ - net462;net5.0 + net5.0;net472 - + diff --git a/src/NzbDrone.Host/Radarr.Host.csproj b/src/NzbDrone.Host/Radarr.Host.csproj index 016d0824f..85dc5c3ef 100644 --- a/src/NzbDrone.Host/Radarr.Host.csproj +++ b/src/NzbDrone.Host/Radarr.Host.csproj @@ -1,9 +1,9 @@  - net462;net5.0 + net5.0;net472 Library - + @@ -31,7 +31,7 @@ True - + diff --git a/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj index 1cdd395d9..69e361a68 100644 --- a/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/Radarr.Integration.Test.csproj @@ -1,9 +1,9 @@  - net462;net5.0 + net5.0;net472 Library - + diff --git a/src/NzbDrone.Libraries.Test/Radarr.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/Radarr.Libraries.Test.csproj index 1a2dd3dc9..3a19e7f7a 100644 --- a/src/NzbDrone.Libraries.Test/Radarr.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/Radarr.Libraries.Test.csproj @@ -1,6 +1,6 @@ - net462;net5.0 + net5.0;net472 diff --git a/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj index 4c1c2d89e..d5668ef5d 100644 --- a/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj +++ b/src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj @@ -1,8 +1,8 @@ - net462;net5.0 + net5.0;net472 - +