From 9dee7a3a73c1e185cc524684ac0155cac101868f Mon Sep 17 00:00:00 2001 From: Uruk Date: Thu, 18 Apr 2024 19:05:20 +0200 Subject: [PATCH] Update to .NET 8 Update discord webhook update ubuntu to 22, minimum required by net8 remove serialization --- .../MediaFiles/EpisodeImport/RecycleBinException.cs | 6 ------ .../MediaFiles/EpisodeImport/RootFolderNotFoundException.cs | 6 ------ .../VersionAdapters/ReleaseFileVersionAdapterFixture.cs | 4 ++-- src/NzbDrone.Mono.Test/Files/linux/lsb-release | 6 +++--- src/NzbDrone.Mono.Test/Files/linux/os-release | 6 +++--- 5 files changed, 8 insertions(+), 20 deletions(-) diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/RecycleBinException.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/RecycleBinException.cs index 645951518..9586d0e63 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/RecycleBinException.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/RecycleBinException.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using System.Runtime.Serialization; namespace NzbDrone.Core.MediaFiles.EpisodeImport { @@ -19,10 +18,5 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport : base(message, innerException) { } - - protected RecycleBinException(SerializationInfo info, StreamingContext context) - : base(info, context) - { - } } } diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/RootFolderNotFoundException.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/RootFolderNotFoundException.cs index 9690a4028..07aebc9bc 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/RootFolderNotFoundException.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/RootFolderNotFoundException.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using System.Runtime.Serialization; namespace NzbDrone.Core.MediaFiles.EpisodeImport { @@ -19,10 +18,5 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport : base(message, innerException) { } - - protected RootFolderNotFoundException(SerializationInfo info, StreamingContext context) - : base(info, context) - { - } } } diff --git a/src/NzbDrone.Mono.Test/EnvironmentInfo/VersionAdapters/ReleaseFileVersionAdapterFixture.cs b/src/NzbDrone.Mono.Test/EnvironmentInfo/VersionAdapters/ReleaseFileVersionAdapterFixture.cs index 496f4eefa..35a59b3ce 100644 --- a/src/NzbDrone.Mono.Test/EnvironmentInfo/VersionAdapters/ReleaseFileVersionAdapterFixture.cs +++ b/src/NzbDrone.Mono.Test/EnvironmentInfo/VersionAdapters/ReleaseFileVersionAdapterFixture.cs @@ -76,8 +76,8 @@ namespace NzbDrone.Mono.Test.EnvironmentInfo.VersionAdapters var version = Subject.Read(); version.Should().NotBeNull(); version.Name.Should().Be("ubuntu"); - version.Version.Should().Be("14.04"); - version.FullName.Should().Be("Ubuntu 14.04.5 LTS"); + version.Version.Should().Be("22.04"); + version.FullName.Should().Be("Ubuntu 22.04.4 LTS"); } } } diff --git a/src/NzbDrone.Mono.Test/Files/linux/lsb-release b/src/NzbDrone.Mono.Test/Files/linux/lsb-release index 55eb268d5..b0c21c9d1 100644 --- a/src/NzbDrone.Mono.Test/Files/linux/lsb-release +++ b/src/NzbDrone.Mono.Test/Files/linux/lsb-release @@ -1,4 +1,4 @@ DISTRIB_ID=Ubuntu -DISTRIB_RELEASE=14.04 -DISTRIB_CODENAME=trusty -DISTRIB_DESCRIPTION="Ubuntu 14.04.5 LTS" \ No newline at end of file +DISTRIB_RELEASE=22.04 +DISTRIB_CODENAME=jammy +DISTRIB_DESCRIPTION="Ubuntu 22.04.4 LTS" \ No newline at end of file diff --git a/src/NzbDrone.Mono.Test/Files/linux/os-release b/src/NzbDrone.Mono.Test/Files/linux/os-release index 724f6a79f..bc596239a 100644 --- a/src/NzbDrone.Mono.Test/Files/linux/os-release +++ b/src/NzbDrone.Mono.Test/Files/linux/os-release @@ -1,9 +1,9 @@ NAME="Ubuntu" -VERSION="14.04.5 LTS, Trusty Tahr" +VERSION="22.04.4 LTS, Jammy Jellyfish" ID=ubuntu ID_LIKE=debian -PRETTY_NAME="Ubuntu 14.04.5 LTS" -VERSION_ID="14.04" +PRETTY_NAME="Ubuntu 22.04.4 LTS" +VERSION_ID="22.04" HOME_URL="http://www.ubuntu.com/" SUPPORT_URL="http://help.ubuntu.com/" BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/" \ No newline at end of file