From 65a673f02ddf7bb1351845d807c7fadeafa4eed5 Mon Sep 17 00:00:00 2001 From: Alexander Regueiro Date: Wed, 6 Apr 2022 06:40:41 +0100 Subject: [PATCH] core: Use Mono.Posix package instead of Mono.Posix.NETStandard package (#13114) resolves #13080 Avoids problems documented in issue #13080. --- src/Jackett.Common/Services/UpdateService.cs | 3 --- src/Jackett.Server/Jackett.Server.csproj | 2 +- src/Jackett.Server/Services/FilePermissionService.cs | 12 ++---------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/Jackett.Common/Services/UpdateService.cs b/src/Jackett.Common/Services/UpdateService.cs index fa43fec13..8be99be54 100644 --- a/src/Jackett.Common/Services/UpdateService.cs +++ b/src/Jackett.Common/Services/UpdateService.cs @@ -267,9 +267,6 @@ namespace Jackett.Common.Services || variant == Variants.JackettVariant.CoreLinuxAmdx64 || variant == Variants.JackettVariant.CoreLinuxArm32 || variant == Variants.JackettVariant.CoreLinuxArm64 || variant == Variants.JackettVariant.Mono) { - //Calling the file permission service to limit usage to netcoreapp. The Mono.Posix.NETStandard library causes issues outside of .NET Core - //https://github.com/xamarin/XamarinComponents/issues/282 - // When the files get extracted, the execute permission for jackett and JackettUpdater don't get carried across var jackettPath = tempDir + "/Jackett/jackett"; diff --git a/src/Jackett.Server/Jackett.Server.csproj b/src/Jackett.Server/Jackett.Server.csproj index 9774e369e..6f0664420 100644 --- a/src/Jackett.Server/Jackett.Server.csproj +++ b/src/Jackett.Server/Jackett.Server.csproj @@ -33,7 +33,6 @@ - @@ -57,6 +56,7 @@ + diff --git a/src/Jackett.Server/Services/FilePermissionService.cs b/src/Jackett.Server/Services/FilePermissionService.cs index 1434d822a..ba17ace46 100644 --- a/src/Jackett.Server/Services/FilePermissionService.cs +++ b/src/Jackett.Server/Services/FilePermissionService.cs @@ -1,9 +1,7 @@ -using Jackett.Common.Services.Interfaces; -using NLog; -#if !NET461 using System; +using Jackett.Common.Services.Interfaces; using Mono.Unix; -#endif +using NLog; namespace Jackett.Server.Services { @@ -15,11 +13,6 @@ namespace Jackett.Server.Services public void MakeFileExecutable(string path) { -#if !NET461 - - //Calling the file permission service to limit usage to netcoreapp. The Mono.Posix.NETStandard library causes issues outside of .NET Core - //https://github.com/xamarin/XamarinComponents/issues/282 - logger.Debug($"Attempting to give execute permission to: {path}"); try { @@ -32,7 +25,6 @@ namespace Jackett.Server.Services { logger.Error(ex); } -#endif } } }