diff --git a/app-backup/duplicati/files/Makefile.patch b/app-backup/duplicati/files/001-Makefile.patch similarity index 74% rename from app-backup/duplicati/files/Makefile.patch rename to app-backup/duplicati/files/001-Makefile.patch index c0b62e1..1cd9803 100644 --- a/app-backup/duplicati/files/Makefile.patch +++ b/app-backup/duplicati/files/001-Makefile.patch @@ -1,12 +1,11 @@ diff --git a/Installer/Makefile/Makefile b/Installer/Makefile/Makefile -index 550e7b9..48bc8fc 100755 ---- a/Installer/Makefile/Makefile -+++ b/Installer/Makefile/Makefile +--- a/Installer/Makefile/Makefile (revision 13e07c6012e5f6c56e1ffa0a4e95ecf50f65b5b5) ++++ b/Installer/Makefile/Makefile (date 1687818474336) @@ -1,5 +1,5 @@ --BUILD_TOOL=msbuild --BUILD_ARGS=/property:Platform=Any\ CPU /property:Configuration=Release -+BUILD_TOOL=dotnet msbuild -+BUILD_ARGS=/property:Platform=Any\ CPU /property:Configuration=Release /property:DefineConstants=ENABLE_GTK - BUILD_ARGS_DEBUG=/property:Platform=Any\ CPU /property:Configuration=Debug - - NUGET_TOOL=nuget +-BUILD_TOOL=msbuild +-BUILD_ARGS=/property:Platform=Any\ CPU /property:Configuration=Release ++BUILD_TOOL=dotnet msbuild ++BUILD_ARGS=/property:Platform=Any\ CPU /property:Configuration=Release /property:DefineConstants=ENABLE_GTK + BUILD_ARGS_DEBUG=/property:Platform=Any\ CPU /property:Configuration=Debug + + NUGET_TOOL=nuget diff --git a/app-backup/duplicati/files/002-fix_csproj-files.patch b/app-backup/duplicati/files/002-fix_csproj-files.patch new file mode 100644 index 0000000..357a2ca --- /dev/null +++ b/app-backup/duplicati/files/002-fix_csproj-files.patch @@ -0,0 +1,971 @@ +Subject: [PATCH] Patch csproj +--- +Index: Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj b/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj +--- a/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj (date 1687819360112) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj b/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj +--- a/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj (date 1687819211952) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj b/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj +--- a/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj (date 1687819367369) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj b/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj +--- a/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj (date 1687819622988) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj b/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj +--- a/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj (date 1687819447123) +@@ -1,5 +1,6 @@ + + ++ + + + Debug +Index: Duplicati/WindowsService/WindowsService.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/WindowsService/WindowsService.csproj b/Duplicati/WindowsService/WindowsService.csproj +--- a/Duplicati/WindowsService/WindowsService.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/WindowsService/WindowsService.csproj (date 1687819712026) +@@ -1,5 +1,6 @@ + + ++ + + + Debug +Index: Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj b/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj +--- a/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj (date 1687819355177) +@@ -1,5 +1,6 @@ + + ++ + + + Debug +Index: Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj b/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj +--- a/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj (date 1687819376969) +@@ -1,5 +1,6 @@ + + ++ + + + Debug +Index: Duplicati/Tools/Duplicati.Tools.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Tools/Duplicati.Tools.csproj b/Duplicati/Tools/Duplicati.Tools.csproj +--- a/Duplicati/Tools/Duplicati.Tools.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Tools/Duplicati.Tools.csproj (date 1687819991375) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj b/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj +--- a/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj (date 1687819865064) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj b/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj +--- a/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj (date 1687819466658) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj b/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj +--- a/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj (date 1687819437217) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Common/Duplicati.Library.Common.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Common/Duplicati.Library.Common.csproj b/Duplicati/Library/Common/Duplicati.Library.Common.csproj +--- a/Duplicati/Library/Common/Duplicati.Library.Common.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Common/Duplicati.Library.Common.csproj (date 1687819553131) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj b/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj +--- a/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj (date 1687819322561) +@@ -1,5 +1,6 @@ + + ++ + + + Debug +Index: Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj b/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj +--- a/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj (date 1687819936378) +@@ -1,5 +1,6 @@ + + ++ + + + Debug +@@ -34,6 +35,7 @@ + + ..\..\..\packages\SharpAESCrypt.exe.1.3.3\lib\netstandard2.0\SharpAESCrypt.exe + ++ + + + +Index: Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj b/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj +--- a/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj (date 1687819530274) +@@ -1,5 +1,6 @@ + + ++ + + + Debug +@@ -65,6 +66,7 @@ + + ..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ++ + + + +Index: Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj b/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj +--- a/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj (date 1687819539698) +@@ -1,5 +1,6 @@ + + ++ + + + Debug +@@ -37,6 +38,7 @@ + + ..\..\..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll + ++ + + + +Index: Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj b/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj +--- a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj (date 1687820045320) +@@ -1,5 +1,6 @@ + + ++ + + + Debug +Index: Duplicati/Library/Backend/Idrivee2/Duplicati.Library.Backend.Idrivee2.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/Idrivee2/Duplicati.Library.Backend.Idrivee2.csproj b/Duplicati/Library/Backend/Idrivee2/Duplicati.Library.Backend.Idrivee2.csproj +--- a/Duplicati/Library/Backend/Idrivee2/Duplicati.Library.Backend.Idrivee2.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/Idrivee2/Duplicati.Library.Backend.Idrivee2.csproj (date 1687819410665) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Tools/SQLiteTool/SQLiteTool.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Tools/SQLiteTool/SQLiteTool.csproj b/Tools/SQLiteTool/SQLiteTool.csproj +--- a/Tools/SQLiteTool/SQLiteTool.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Tools/SQLiteTool/SQLiteTool.csproj (date 1687819690949) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Utility/Duplicati.Library.Utility.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj b/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj +--- a/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj (date 1687819211953) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Main/Duplicati.Library.Main.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Main/Duplicati.Library.Main.csproj b/Duplicati/Library/Main/Duplicati.Library.Main.csproj +--- a/Duplicati/Library/Main/Duplicati.Library.Main.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Main/Duplicati.Library.Main.csproj (date 1687819952769) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj +--- a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj (date 1687819795499) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: BuildTools/DependencyFinder/DependencyFinder.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/BuildTools/DependencyFinder/DependencyFinder.csproj b/BuildTools/DependencyFinder/DependencyFinder.csproj +--- a/BuildTools/DependencyFinder/DependencyFinder.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/BuildTools/DependencyFinder/DependencyFinder.csproj (date 1687819725491) +@@ -1,5 +1,6 @@ + + ++ + + Debug + x86 +Index: Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj b/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj +--- a/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj (date 1687819391920) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Compression/Duplicati.Library.Compression.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj b/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj +--- a/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj (date 1687819928148) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Logging/Duplicati.Library.Logging.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj b/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj +--- a/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj (date 1687819585011) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +@@ -37,6 +38,8 @@ + + + ++ ++ + + + +Index: Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj +--- a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj (date 1687819475551) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Tools/ZipFileDebugger/ZipFileDebugger.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Tools/ZipFileDebugger/ZipFileDebugger.csproj b/Tools/ZipFileDebugger/ZipFileDebugger.csproj +--- a/Tools/ZipFileDebugger/ZipFileDebugger.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Tools/ZipFileDebugger/ZipFileDebugger.csproj (date 1687820018438) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/CommandLine/Duplicati.CommandLine.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/CommandLine/Duplicati.CommandLine.csproj b/Duplicati/CommandLine/Duplicati.CommandLine.csproj +--- a/Duplicati/CommandLine/Duplicati.CommandLine.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/CommandLine/Duplicati.CommandLine.csproj (date 1687819743961) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: BuildTools/GnupgSigningTool/GnupgSigningTool.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj b/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj +--- a/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj (date 1687820009791) +@@ -1,5 +1,6 @@ + + ++ + + Debug + x86 +Index: Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj +--- a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj (date 1687819915314) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj b/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj +--- a/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj (date 1687819269499) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj +--- a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj (date 1687819771862) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj +--- a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj (date 1687819298723) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: thirdparty/mozroots/mozroots.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/thirdparty/mozroots/mozroots.csproj b/thirdparty/mozroots/mozroots.csproj +--- a/thirdparty/mozroots/mozroots.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/thirdparty/mozroots/mozroots.csproj (date 1687819211954) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Interface/Duplicati.Library.Interface.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj b/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj +--- a/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj (date 1687819572946) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj +--- a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj (date 1687819211951) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj b/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj +--- a/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj (date 1687819563315) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj b/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj +--- a/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj (date 1687819611643) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/License/Duplicati.License.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/License/Duplicati.License.csproj b/Duplicati/License/Duplicati.License.csproj +--- a/Duplicati/License/Duplicati.License.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/License/Duplicati.License.csproj (date 1687819211953) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj b/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj +--- a/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj (date 1687819596251) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj b/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj +--- a/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj (date 1687819902006) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj b/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj +--- a/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj (date 1687819430634) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj +--- a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj (date 1687819459265) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Server/Duplicati.Server.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Server/Duplicati.Server.csproj b/Duplicati/Server/Duplicati.Server.csproj +--- a/Duplicati/Server/Duplicati.Server.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Server/Duplicati.Server.csproj (date 1687819648477) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj +--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj (date 1687819223222) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +@@ -94,20 +95,12 @@ + ..\..\..\thirdparty\appindicator-sharp\appindicator-sharp.dll + False + +- +- ..\..\..\thirdparty\appindicator-sharp\gdk-sharp.dll +- gtk-sharp-2.0 +- +- +- ..\..\..\thirdparty\appindicator-sharp\gtk-sharp.dll +- gtk-sharp-2.0 +- +- +- glib-sharp-2.0 +- +- +- gtk-sharp-2.0 +- ++ ++ ++ ++ ++ ++ + + \Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\64bits\full\Xamarin.Mac.dll + +Index: Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj b/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj +--- a/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj (date 1687819980438) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj +--- a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj (date 1687819305792) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj b/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj +--- a/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj (date 1687819965098) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Localization/Duplicati.Library.Localization.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj b/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj +--- a/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj (date 1687819942465) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +@@ -37,6 +38,8 @@ + ..\..\..\packages\NGettext.0.6.4\lib\net46\NGettext.dll + + ++ ++ + + + +Index: Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj +--- a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj (date 1687819342313) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Service/Duplicati.Service.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Service/Duplicati.Service.csproj b/Duplicati/Service/Duplicati.Service.csproj +--- a/Duplicati/Service/Duplicati.Service.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Service/Duplicati.Service.csproj (date 1687819657909) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj b/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj +--- a/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj (date 1687819761923) +@@ -1,5 +1,6 @@ + + ++ + + Duplicati.snk + false +Index: Duplicati/UnitTest/Duplicati.UnitTest.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/UnitTest/Duplicati.UnitTest.csproj b/Duplicati/UnitTest/Duplicati.UnitTest.csproj +--- a/Duplicati/UnitTest/Duplicati.UnitTest.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/UnitTest/Duplicati.UnitTest.csproj (date 1687819676593) +@@ -1,5 +1,6 @@ + + ++ + + + Debug +Index: Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj b/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj +--- a/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj (date 1687819957342) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj b/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj +--- a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj (date 1687819398793) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj b/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj +--- a/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj (date 1687819874521) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj b/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj +--- a/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj (date 1687819857776) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU +Index: Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj +--- a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj (revision 6417c3d67f2784e1614266b230a678d3fcfd10e5) ++++ b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj (date 1687819337624) +@@ -1,5 +1,6 @@ + + ++ + + Debug + AnyCPU diff --git a/app-backup/duplicati/files/003-fix-duplicati-cli-only-sln.patch b/app-backup/duplicati/files/003-fix-duplicati-cli-only-sln.patch new file mode 100644 index 0000000..1a9e3b7 --- /dev/null +++ b/app-backup/duplicati/files/003-fix-duplicati-cli-only-sln.patch @@ -0,0 +1,19 @@ +Subject: [PATCH] sln +--- +Index: Duplicati CommandLine Only.sln +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati CommandLine Only.sln b/Duplicati CommandLine Only.sln +--- a/Duplicati CommandLine Only.sln (revision ea1fb47ffa4446a0d3fe1a5b257301a3cf532f81) ++++ b/Duplicati CommandLine Only.sln (date 1687819211951) +@@ -87,7 +87,7 @@ + EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.Rclone", "Duplicati\Library\Backend\Rclone\Duplicati.Library.Backend.Rclone.csproj", "{851A1CB8-3CEB-41B4-956F-34D760D2A8E5}" + EndProject +-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.IDrive", "Duplicati\Library\Backend\IDrive\Duplicati.Library.Backend.IDrive.csproj", "{C16639F6-DACC-4DD9-86CD-8B937516B340}" ++Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.Idrivee2", "Duplicati\Library\Backend\Idrivee2\Duplicati.Library.Backend.Idrivee2.csproj", "{C16639F6-DACC-4DD9-86CD-8B937516B340}" + EndProject + Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/app-backup/duplicati/files/004-loosen-gtk-check.patch b/app-backup/duplicati/files/004-loosen-gtk-check.patch new file mode 100644 index 0000000..ae9698e --- /dev/null +++ b/app-backup/duplicati/files/004-loosen-gtk-check.patch @@ -0,0 +1,19 @@ +Subject: [PATCH] Loosen GTK check +--- +Index: Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs +--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs (revision 39798b1a165d420c4e51b0eb6ceac1d5257ea812) ++++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs (date 1687821173287) +@@ -355,7 +355,7 @@ + private static bool TryGetGtk() + { + #if __WindowsGTK__ || ENABLE_GTK +- return typeof(Gtk.StatusIcon) != null && typeof(Gdk.Image) != null; ++ return typeof(Gtk.StatusIcon) != null /*&& typeof(Gdk.Image) != null*/; + #else + return false; + #endif diff --git a/app-backup/duplicati/files/dotnet-framework.patch b/app-backup/duplicati/files/archive/dotnet-framework.patch similarity index 99% rename from app-backup/duplicati/files/dotnet-framework.patch rename to app-backup/duplicati/files/archive/dotnet-framework.patch index 3be5332..9b1f09d 100644 --- a/app-backup/duplicati/files/dotnet-framework.patch +++ b/app-backup/duplicati/files/archive/dotnet-framework.patch @@ -68,58 +68,58 @@ index 3d934e7..9522f35 100644 --- a/Duplicati CommandLine Only.sln +++ b/Duplicati CommandLine Only.sln @@ -87,7 +87,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.J - EndProject - Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.Rclone", "Duplicati\Library\Backend\Rclone\Duplicati.Library.Backend.Rclone.csproj", "{851A1CB8-3CEB-41B4-956F-34D760D2A8E5}" - EndProject --Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.IDrive", "Duplicati\Library\Backend\IDrive\Duplicati.Library.Backend.IDrive.csproj", "{C16639F6-DACC-4DD9-86CD-8B937516B340}" -+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.Idrivee2", "Duplicati\Library\Backend\Idrivee2\Duplicati.Library.Backend.Idrivee2.csproj", "{C16639F6-DACC-4DD9-86CD-8B937516B340}" - EndProject - Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution + EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.Rclone", "Duplicati\Library\Backend\Rclone\Duplicati.Library.Backend.Rclone.csproj", "{851A1CB8-3CEB-41B4-956F-34D760D2A8E5}" + EndProject +-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.IDrive", "Duplicati\Library\Backend\IDrive\Duplicati.Library.Backend.IDrive.csproj", "{C16639F6-DACC-4DD9-86CD-8B937516B340}" ++Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.Idrivee2", "Duplicati\Library\Backend\Idrivee2\Duplicati.Library.Backend.Idrivee2.csproj", "{C16639F6-DACC-4DD9-86CD-8B937516B340}" + EndProject + Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj index a0fa7bb..289f4fb 100644 --- a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj +++ b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -212,11 +213,11 @@ - - - -- + + + +- - \ No newline at end of file -+ ++ diff --git a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj index 1140e4b..8ef53d7 100644 --- a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj +++ b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -172,4 +173,4 @@ - - - + + + - \ No newline at end of file -+ ++ diff --git a/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj b/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj index cf7c878..e40a9f6 100644 --- a/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj @@ -151,100 +151,100 @@ index 1e43ae8..5b7501a 100644 --- a/Duplicati/CommandLine/Duplicati.CommandLine.csproj +++ b/Duplicati/CommandLine/Duplicati.CommandLine.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -257,11 +258,11 @@ - - - -- + + + +- - \ No newline at end of file -+ ++ diff --git a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj index 49e0d80..3c6b97d 100644 --- a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj +++ b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -202,4 +203,4 @@ - - - + + + - \ No newline at end of file -+ ++ diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj index 5dbd5d4..57c296c 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU diff --git a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj index 50641d0..6aed5f9 100644 --- a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj +++ b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -87,4 +88,4 @@ - - - + + + - \ No newline at end of file -+ ++ diff --git a/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj b/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj index a2042d4..a463e67 100644 --- a/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj +++ b/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj @@ -1,5 +1,6 @@ -  - -+ - - - Debug +  + ++ + + + Debug @@ -81,11 +82,11 @@ - - - -- + + + +- - \ No newline at end of file -+ ++ diff --git a/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj b/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj index b7773af..2440887 100644 --- a/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj @@ -312,27 +312,27 @@ index 7ce3629..1064c2e 100644 --- a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj +++ b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -67,11 +68,11 @@ - - - -- + + + +- - \ No newline at end of file -+ ++ diff --git a/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj b/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj index 2a1531e..356d288 100644 --- a/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj @@ -364,53 +364,53 @@ index 64f6e9b..d0910ae 100644 --- a/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj +++ b/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -71,11 +72,11 @@ - - - -- + + + +- - \ No newline at end of file -+ ++ diff --git a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj index 1fc3e52..ae5991d 100644 --- a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj +++ b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -67,11 +68,11 @@ - - - -- + + + +- - \ No newline at end of file -+ ++ diff --git a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj b/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj index b2bec64..c43f06b 100644 --- a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj @@ -507,45 +507,45 @@ index 3a57a6e..90e6584 100644 --- a/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj +++ b/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -70,4 +71,4 @@ - - - + + + - \ No newline at end of file -+ ++ diff --git a/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj b/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj index dc9f711..5f2eb3b 100644 --- a/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj +++ b/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -93,11 +94,11 @@ - - - -- + + + +- - \ No newline at end of file -+ ++ diff --git a/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj b/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj index 522f8dc..d3f7c04 100644 --- a/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj @@ -587,65 +587,65 @@ index 6f5f420..45dc34c 100644 --- a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj +++ b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -117,4 +118,4 @@ - - - --> + + + --> - \ No newline at end of file -+ ++ diff --git a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj index 98cddeb..6818eb2 100644 --- a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj +++ b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -73,7 +74,7 @@ - - - -- + + + +- - \ No newline at end of file -+ ++ diff --git a/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj b/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj index f62ee2b..b7c87a0 100644 --- a/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj @@ -687,27 +687,27 @@ index cfc4101..dedd000 100644 --- a/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj +++ b/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -74,11 +75,11 @@ - - - -- + + + +- - \ No newline at end of file -+ ++ diff --git a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj b/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj index 5f7ba3e..9c1e3bb 100644 --- a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj @@ -749,296 +749,296 @@ index 44399a7..bc9f8db 100644 --- a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj +++ b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -71,11 +72,11 @@ - - - -- + + + +- - \ No newline at end of file -+ ++ diff --git a/Duplicati/Library/Common/Duplicati.Library.Common.csproj b/Duplicati/Library/Common/Duplicati.Library.Common.csproj index d90c144..e643f94 100644 --- a/Duplicati/Library/Common/Duplicati.Library.Common.csproj +++ b/Duplicati/Library/Common/Duplicati.Library.Common.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -81,7 +82,7 @@ - - - -- + + + +- - \ No newline at end of file -+ ++ diff --git a/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj b/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj index ee6d1b8..d40aebd 100644 --- a/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj +++ b/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -72,11 +73,11 @@ - - - -- + + + +- - \ No newline at end of file -+ ++ diff --git a/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj b/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj index 2acfde7..7c7da18 100644 --- a/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj +++ b/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj @@ -1,5 +1,6 @@ -  - -+ - - - Debug +  + ++ + + + Debug @@ -78,4 +79,4 @@ - - - + + + - \ No newline at end of file -+ ++ diff --git a/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj b/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj index 963c4c0..7aa5ca7 100644 --- a/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj +++ b/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -69,7 +70,7 @@ - - - -- + + + +- - \ No newline at end of file -+ ++ diff --git a/Duplicati/Library/Main/Duplicati.Library.Main.csproj b/Duplicati/Library/Main/Duplicati.Library.Main.csproj index 2788134..902afd7 100644 --- a/Duplicati/Library/Main/Duplicati.Library.Main.csproj +++ b/Duplicati/Library/Main/Duplicati.Library.Main.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -210,7 +211,7 @@ - - - -- - + + --> + - \ No newline at end of file -+ ++ diff --git a/Duplicati/Server/Duplicati.Server.csproj b/Duplicati/Server/Duplicati.Server.csproj index 168badb..73ab187 100644 --- a/Duplicati/Server/Duplicati.Server.csproj +++ b/Duplicati/Server/Duplicati.Server.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -340,11 +341,11 @@ - - - -- + + + +- - \ No newline at end of file -+ ++ diff --git a/Duplicati/Service/Duplicati.Service.csproj b/Duplicati/Service/Duplicati.Service.csproj index 0def67c..98163e7 100644 --- a/Duplicati/Service/Duplicati.Service.csproj +++ b/Duplicati/Service/Duplicati.Service.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -61,4 +62,4 @@ - - - + + + - \ No newline at end of file -+ ++ diff --git a/Duplicati/Tools/Duplicati.Tools.csproj b/Duplicati/Tools/Duplicati.Tools.csproj index 1496eda..181792f 100644 --- a/Duplicati/Tools/Duplicati.Tools.csproj +++ b/Duplicati/Tools/Duplicati.Tools.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -95,4 +96,4 @@ - - - + + + - \ No newline at end of file -+ ++ diff --git a/Duplicati/UnitTest/Duplicati.UnitTest.csproj b/Duplicati/UnitTest/Duplicati.UnitTest.csproj index 995e447..9e01593 100644 --- a/Duplicati/UnitTest/Duplicati.UnitTest.csproj +++ b/Duplicati/UnitTest/Duplicati.UnitTest.csproj @@ -1,5 +1,6 @@ -  - -+ - - - Debug +  + ++ + + + Debug @@ -217,4 +218,4 @@ - - - + + + - \ No newline at end of file -+ ++ diff --git a/Duplicati/WindowsService/WindowsService.csproj b/Duplicati/WindowsService/WindowsService.csproj index 170347b..bafa1b4 100644 --- a/Duplicati/WindowsService/WindowsService.csproj +++ b/Duplicati/WindowsService/WindowsService.csproj @@ -1,5 +1,6 @@ -  - -+ - - - Debug +  + ++ + + + Debug @@ -89,11 +90,11 @@ - - - -- + + + +- - \ No newline at end of file -+ ++ diff --git a/Tools/SQLiteTool/SQLiteTool.csproj b/Tools/SQLiteTool/SQLiteTool.csproj index 9457deb..4946a5f 100644 --- a/Tools/SQLiteTool/SQLiteTool.csproj +++ b/Tools/SQLiteTool/SQLiteTool.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -45,4 +46,4 @@ - - - + + + - \ No newline at end of file -+ ++ diff --git a/Tools/ZipFileDebugger/ZipFileDebugger.csproj b/Tools/ZipFileDebugger/ZipFileDebugger.csproj index 408dd65..307a597 100644 --- a/Tools/ZipFileDebugger/ZipFileDebugger.csproj +++ b/Tools/ZipFileDebugger/ZipFileDebugger.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU @@ -52,4 +53,4 @@ - - - + + + - \ No newline at end of file -+ ++ diff --git a/thirdparty/mozroots/mozroots.csproj b/thirdparty/mozroots/mozroots.csproj index 03ba919..fdd0a8a 100644 --- a/thirdparty/mozroots/mozroots.csproj +++ b/thirdparty/mozroots/mozroots.csproj @@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU +  + ++ + + Debug + AnyCPU diff --git a/app-backup/duplicati/files/guifix.patch b/app-backup/duplicati/files/archive/guifix.patch similarity index 98% rename from app-backup/duplicati/files/guifix.patch rename to app-backup/duplicati/files/archive/guifix.patch index 1022aae..d1772ea 100644 --- a/app-backup/duplicati/files/guifix.patch +++ b/app-backup/duplicati/files/archive/guifix.patch @@ -3,29 +3,29 @@ index 57c296c..b89e1a4 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj @@ -95,20 +95,12 @@ - ..\..\..\thirdparty\appindicator-sharp\appindicator-sharp.dll - False - -- -- ..\..\..\thirdparty\appindicator-sharp\gdk-sharp.dll -- gtk-sharp-2.0 -- -- -- ..\..\..\thirdparty\appindicator-sharp\gtk-sharp.dll -- gtk-sharp-2.0 -- -- -- glib-sharp-2.0 -- -- -- gtk-sharp-2.0 -- -+ -+ -+ -+ -+ -+ - - \Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\64bits\full\Xamarin.Mac.dll - + ..\..\..\thirdparty\appindicator-sharp\appindicator-sharp.dll + False + +- +- ..\..\..\thirdparty\appindicator-sharp\gdk-sharp.dll +- gtk-sharp-2.0 +- +- +- ..\..\..\thirdparty\appindicator-sharp\gtk-sharp.dll +- gtk-sharp-2.0 +- +- +- glib-sharp-2.0 +- +- +- gtk-sharp-2.0 +- ++ ++ ++ ++ ++ ++ + + \Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\64bits\full\Xamarin.Mac.dll + diff --git a/app-backup/duplicati/files/loosen-gtk-check.patch b/app-backup/duplicati/files/archive/loosen-gtk-check.patch similarity index 98% rename from app-backup/duplicati/files/loosen-gtk-check.patch rename to app-backup/duplicati/files/archive/loosen-gtk-check.patch index 79571dc..2b88e3f 100644 --- a/app-backup/duplicati/files/loosen-gtk-check.patch +++ b/app-backup/duplicati/files/archive/loosen-gtk-check.patch @@ -3,11 +3,11 @@ index 8551142..a03c380 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs @@ -355,7 +355,7 @@ namespace Duplicati.GUI.TrayIcon - private static bool TryGetGtk() - { - #if __WindowsGTK__ || ENABLE_GTK -- return typeof(Gtk.StatusIcon) != null && typeof(Gdk.Image) != null; -+ return typeof(Gtk.StatusIcon) != null /*&& typeof(Gdk.Image) != null*/; - #else - return false; - #endif + private static bool TryGetGtk() + { + #if __WindowsGTK__ || ENABLE_GTK +- return typeof(Gtk.StatusIcon) != null && typeof(Gdk.Image) != null; ++ return typeof(Gtk.StatusIcon) != null /*&& typeof(Gdk.Image) != null*/; + #else + return false; + #endif diff --git a/app-backup/duplicati/files/netstandard.patch b/app-backup/duplicati/files/archive/netstandard.patch similarity index 99% rename from app-backup/duplicati/files/netstandard.patch rename to app-backup/duplicati/files/archive/netstandard.patch index 59c2017..c914d39 100644 --- a/app-backup/duplicati/files/netstandard.patch +++ b/app-backup/duplicati/files/archive/netstandard.patch @@ -27,10 +27,10 @@ index 7c7da18..149a204 100644 --- a/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj +++ b/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj @@ -35,6 +35,7 @@ - - ..\..\..\packages\SharpAESCrypt.exe.1.3.3\lib\netstandard2.0\SharpAESCrypt.exe - -+ - - - + + ..\..\..\packages\SharpAESCrypt.exe.1.3.3\lib\netstandard2.0\SharpAESCrypt.exe + ++ + + + diff --git a/app-backup/duplicati/files/dotnet-framework.patch_backup b/app-backup/duplicati/files/dotnet-framework.patch_backup deleted file mode 100644 index e2079f4..0000000 --- a/app-backup/duplicati/files/dotnet-framework.patch_backup +++ /dev/null @@ -1,1462 +0,0 @@ -diff --git a/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj b/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj -index 4a6f240..2b98157 100644 ---- a/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj -+++ b/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -74,4 +75,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/BuildTools/DependencyFinder/DependencyFinder.csproj b/BuildTools/DependencyFinder/DependencyFinder.csproj -index 4274d9a..9ca5672 100644 ---- a/BuildTools/DependencyFinder/DependencyFinder.csproj -+++ b/BuildTools/DependencyFinder/DependencyFinder.csproj -@@ -1,5 +1,6 @@ - - -+ - - Debug - x86 -@@ -56,4 +57,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj b/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj -index e416fc8..c493ae8 100644 ---- a/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj -+++ b/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj -@@ -1,5 +1,6 @@ - - -+ - - Debug - x86 -@@ -58,4 +59,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj -index 0a9333d..40a80c3 100644 ---- a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj -+++ b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -diff --git a/Duplicati CommandLine Only.sln b/Duplicati CommandLine Only.sln -index 3d934e7..9522f35 100644 ---- a/Duplicati CommandLine Only.sln -+++ b/Duplicati CommandLine Only.sln -@@ -87,7 +87,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.J - EndProject - Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.Rclone", "Duplicati\Library\Backend\Rclone\Duplicati.Library.Backend.Rclone.csproj", "{851A1CB8-3CEB-41B4-956F-34D760D2A8E5}" - EndProject --Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.IDrive", "Duplicati\Library\Backend\IDrive\Duplicati.Library.Backend.IDrive.csproj", "{C16639F6-DACC-4DD9-86CD-8B937516B340}" -+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.Idrivee2", "Duplicati\Library\Backend\Idrivee2\Duplicati.Library.Backend.Idrivee2.csproj", "{C16639F6-DACC-4DD9-86CD-8B937516B340}" - EndProject - Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution -diff --git a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj -index a0fa7bb..289f4fb 100644 ---- a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj -+++ b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -212,11 +213,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj -index 1140e4b..8ef53d7 100644 ---- a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj -+++ b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -172,4 +173,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj b/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj -index cf7c878..e40a9f6 100644 ---- a/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj -+++ b/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj -@@ -1,5 +1,6 @@ -  - -+ - - - Debug -@@ -59,11 +60,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/CommandLine/Duplicati.CommandLine.csproj b/Duplicati/CommandLine/Duplicati.CommandLine.csproj -index 1e43ae8..5b7501a 100644 ---- a/Duplicati/CommandLine/Duplicati.CommandLine.csproj -+++ b/Duplicati/CommandLine/Duplicati.CommandLine.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -257,11 +258,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj -index 49e0d80..3c6b97d 100644 ---- a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj -+++ b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -202,4 +203,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj -index 5dbd5d4..57c296c 100644 ---- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj -+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -diff --git a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj -index 50641d0..6aed5f9 100644 ---- a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj -+++ b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -87,4 +88,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj b/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj -index a2042d4..a463e67 100644 ---- a/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj -+++ b/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj -@@ -1,5 +1,6 @@ -  - -+ - - - Debug -@@ -81,11 +82,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj b/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj -index b7773af..2440887 100644 ---- a/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj -+++ b/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Duplicati.snk - false -@@ -108,11 +109,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj b/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj -index d57688e..202232d 100644 ---- a/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj -+++ b/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -68,4 +69,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj b/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj -index 8e76192..45274ec 100644 ---- a/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj -+++ b/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -71,4 +72,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj -index 7ce3629..1064c2e 100644 ---- a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj -+++ b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -67,11 +68,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj b/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj -index 2a1531e..356d288 100644 ---- a/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj -+++ b/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj -@@ -1,5 +1,6 @@ -  - -+ - - - Debug -@@ -71,11 +72,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj b/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj -index 64f6e9b..d0910ae 100644 ---- a/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj -+++ b/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -71,11 +72,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj -index 1fc3e52..ae5991d 100644 ---- a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj -+++ b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -67,11 +68,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj b/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj -index b2bec64..c43f06b 100644 ---- a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj -+++ b/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -70,4 +71,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj b/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj -index e742a31..5347d99 100644 ---- a/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj -+++ b/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -61,4 +62,4 @@ - Duplicati.Library.Utility - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/Idrivee2/Duplicati.Library.Backend.Idrivee2.csproj b/Duplicati/Library/Backend/Idrivee2/Duplicati.Library.Backend.Idrivee2.csproj -index c446d49..cea5241 100644 ---- a/Duplicati/Library/Backend/Idrivee2/Duplicati.Library.Backend.Idrivee2.csproj -+++ b/Duplicati/Library/Backend/Idrivee2/Duplicati.Library.Backend.Idrivee2.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -111,4 +112,4 @@ - - - --> -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj b/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj -index 378f3c2..7d9a0a8 100644 ---- a/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj -+++ b/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -79,11 +80,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj b/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj -index 0a93f07..1ae2c37 100644 ---- a/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj -+++ b/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -diff --git a/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj b/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj -index 3a57a6e..90e6584 100644 ---- a/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj -+++ b/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -70,4 +71,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj b/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj -index dc9f711..5f2eb3b 100644 ---- a/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj -+++ b/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -93,11 +94,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj b/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj -index 522f8dc..d3f7c04 100644 ---- a/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj -+++ b/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -68,4 +69,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj b/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj -index ff71582..b633d4b 100644 ---- a/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj -+++ b/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -63,4 +64,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj -index 6f5f420..45dc34c 100644 ---- a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj -+++ b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -117,4 +118,4 @@ - - - --> -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj -index 98cddeb..6818eb2 100644 ---- a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj -+++ b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -73,7 +74,7 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj b/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj -index f62ee2b..b7c87a0 100644 ---- a/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj -+++ b/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -67,4 +68,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj b/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj -index 4f61794..c5d1d21 100644 ---- a/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj -+++ b/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj -@@ -1,5 +1,6 @@ -  - -+ - - - Debug -@@ -125,4 +126,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj b/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj -index cfc4101..dedd000 100644 ---- a/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj -+++ b/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -74,11 +75,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj b/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj -index 5f7ba3e..9c1e3bb 100644 ---- a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj -+++ b/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj -@@ -1,5 +1,6 @@ -  - -+ - - - Debug -@@ -113,4 +114,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj b/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj -index a22f356..dff5c39 100644 ---- a/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj -+++ b/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj -@@ -1,5 +1,6 @@ -  - -+ - - - Debug -@@ -77,4 +78,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj -index 44399a7..bc9f8db 100644 ---- a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj -+++ b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -71,11 +72,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Common/Duplicati.Library.Common.csproj b/Duplicati/Library/Common/Duplicati.Library.Common.csproj -index d90c144..e643f94 100644 ---- a/Duplicati/Library/Common/Duplicati.Library.Common.csproj -+++ b/Duplicati/Library/Common/Duplicati.Library.Common.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -81,7 +82,7 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj b/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj -index ee6d1b8..d40aebd 100644 ---- a/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj -+++ b/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -72,11 +73,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj b/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj -index 2acfde7..7c7da18 100644 ---- a/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj -+++ b/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj -@@ -1,5 +1,6 @@ -  - -+ - - - Debug -@@ -78,4 +79,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj b/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj -index 963c4c0..7aa5ca7 100644 ---- a/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj -+++ b/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -69,7 +70,7 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/Library/Main/Duplicati.Library.Main.csproj b/Duplicati/Library/Main/Duplicati.Library.Main.csproj -index 2788134..902afd7 100644 ---- a/Duplicati/Library/Main/Duplicati.Library.Main.csproj -+++ b/Duplicati/Library/Main/Duplicati.Library.Main.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -210,7 +211,7 @@ - - - -- - -- -\ No newline at end of file -+ -diff --git a/Duplicati/Server/Duplicati.Server.csproj b/Duplicati/Server/Duplicati.Server.csproj -index 168badb..73ab187 100644 ---- a/Duplicati/Server/Duplicati.Server.csproj -+++ b/Duplicati/Server/Duplicati.Server.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -340,11 +341,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Duplicati/Service/Duplicati.Service.csproj b/Duplicati/Service/Duplicati.Service.csproj -index 0def67c..98163e7 100644 ---- a/Duplicati/Service/Duplicati.Service.csproj -+++ b/Duplicati/Service/Duplicati.Service.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -61,4 +62,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/Tools/Duplicati.Tools.csproj b/Duplicati/Tools/Duplicati.Tools.csproj -index 1496eda..181792f 100644 ---- a/Duplicati/Tools/Duplicati.Tools.csproj -+++ b/Duplicati/Tools/Duplicati.Tools.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -95,4 +96,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/UnitTest/Duplicati.UnitTest.csproj b/Duplicati/UnitTest/Duplicati.UnitTest.csproj -index 995e447..9e01593 100644 ---- a/Duplicati/UnitTest/Duplicati.UnitTest.csproj -+++ b/Duplicati/UnitTest/Duplicati.UnitTest.csproj -@@ -1,5 +1,6 @@ -  - -+ - - - Debug -@@ -217,4 +218,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Duplicati/WindowsService/WindowsService.csproj b/Duplicati/WindowsService/WindowsService.csproj -index 170347b..bafa1b4 100644 ---- a/Duplicati/WindowsService/WindowsService.csproj -+++ b/Duplicati/WindowsService/WindowsService.csproj -@@ -1,5 +1,6 @@ -  - -+ - - - Debug -@@ -89,11 +90,11 @@ - - - -- -- -\ No newline at end of file -+ -diff --git a/Installer/Makefile/Makefile b/Installer/Makefile/Makefile -index 51eaf9f..e3626d8 100755 ---- a/Installer/Makefile/Makefile -+++ b/Installer/Makefile/Makefile -@@ -2,7 +2,7 @@ BUILD_TOOL=dotnet msbuild - BUILD_ARGS=/property:Platform=Any\ CPU /property:Configuration=Release - BUILD_ARGS_DEBUG=/property:Platform=Any\ CPU /property:Configuration=Debug - --NUGET_TOOL=dotnet -+NUGET_TOOL=mono /tmp/nuget.exe - NUGET_ARGS=restore - - OUTPUT_ARGS=/property:OutputPath=bin/Release -@@ -34,7 +34,7 @@ package: build - mkdir "$(PACKAGE_DIR)/usr/share/applications" - mkdir "$(PACKAGE_DIR)/usr/share/pixmaps" - mkdir "$(PACKAGE_DIR)/usr/share/doc" -- mkdir "$(PACKAGE_DIR)/usr/share/doc/duplicati" -+ mkdir "$(PACKAGE_DIR)/usr/share/doc/duplicati" - cp -R "$(SOURCE_DIR)/Duplicati/GUI/Duplicati.GUI.TrayIcon/bin/Release" "$(PACKAGE_DIR)/usr/lib/duplicati" - - rm -rf "$(PKG_TARGET)/SQLite" -@@ -51,7 +51,7 @@ package: build - - # If we edit files, we sometimes get backup files included - find "$(PACKAGE_DIR)" -type f -name \*\~ -exec rm -rf '{}' \; -- -+ - #Set permissions - #chown -R root:root "$(PACKAGE_DIR)" - chmod -R 755 "$(PACKAGE_DIR)" -@@ -62,17 +62,17 @@ package: build - for EXT in exe py sh; do \ - find "$(PACKAGE_DIR)" -type f -name \*.$(EXT) -exec chmod 755 "{}" \; ; \ - done -- -+ - chmod +x "$(PACKAGE_DIR)/usr/bin/duplicati" - chmod +x "$(PACKAGE_DIR)/usr/bin/duplicati-cli" -- -+ - if [ -e "duplicati.tar" ]; then \ - rm -rf "duplicati.tar"; \ - fi - if [ -e "duplicati.tar.gz" ]; then \ - rm -rf "duplicati.tar.gz"; \ - fi -- -+ - tar -C "$(PACKAGE_DIR)" -cf "duplicati.tar" . - gzip --best "duplicati.tar" - -diff --git a/Installer/Makefile/Makefile~ b/Installer/Makefile/Makefile~ -deleted file mode 100755 -index 0ab1bde..0000000 ---- a/Installer/Makefile/Makefile~ -+++ /dev/null -@@ -1,85 +0,0 @@ --BUILD_TOOL=dotnet msbuild --BUILD_ARGS=/property:Platform=Any\ CPU /property:Configuration=Release --BUILD_ARGS_DEBUG=/property:Platform=Any\ CPU /property:Configuration=Debug -- --NUGET_TOOL=dotnet nuget --NUGET_ARGS=restore -- --OUTPUT_ARGS=/property:OutputPath=bin/Release --SOURCE_DIR=../../. --PACKAGE_DIR=./pkg --PKG_TARGET=$(PACKAGE_DIR)/usr/lib/duplicati -- --all: package -- --build: -- $(NUGET_TOOL) $(NUGET_ARGS) "$(SOURCE_DIR)/Duplicati.sln" -- $(BUILD_TOOL) $(BUILD_ARGS) "$(SOURCE_DIR)/Duplicati.sln" -- $(BUILD_TOOL) $(BUILD_ARGS) "$(SOURCE_DIR)/BuildTools/UpdateVersionStamp/UpdateVersionStamp.sln" -- --debug: -- $(NUGET_TOOL) $(NUGET_ARGS) "$(SOURCE_DIR)/Duplicati.sln" -- $(BUILD_TOOL) $(BUILD_ARGS_DEBUG) "$(SOURCE_DIR)/Duplicati.sln" -- $(BUILD_TOOL) $(BUILD_ARGS_DEBUG) "$(SOURCE_DIR)/BuildTools/UpdateVersionStamp/UpdateVersionStamp.sln" -- --package: build -- if [ -e "$(PACKAGE_DIR)" ]; then \ -- rm -rf "$(PACKAGE_DIR)"; \ -- fi -- mkdir "$(PACKAGE_DIR)" -- mkdir "$(PACKAGE_DIR)/usr" -- mkdir "$(PACKAGE_DIR)/usr/lib" -- mkdir "$(PACKAGE_DIR)/usr/bin" -- mkdir "$(PACKAGE_DIR)/usr/share" -- mkdir "$(PACKAGE_DIR)/usr/share/applications" -- mkdir "$(PACKAGE_DIR)/usr/share/pixmaps" -- mkdir "$(PACKAGE_DIR)/usr/share/doc" -- mkdir "$(PACKAGE_DIR)/usr/share/doc/duplicati" -- cp -R "$(SOURCE_DIR)/Duplicati/GUI/Duplicati.GUI.TrayIcon/bin/Release" "$(PACKAGE_DIR)/usr/lib/duplicati" -- -- rm -rf "$(PKG_TARGET)/SQLite" -- rm -rf "$(PKG_TARGET)/win-tools" -- rm -rf "$(PKG_TARGET)/"*.mdb -- -- cp -R "$(SOURCE_DIR)/Duplicati/Server/webroot" "$(PACKAGE_DIR)/usr/lib/duplicati/" -- cp "$(SOURCE_DIR)/Installer/debian/duplicati-launcher.sh" "$(PACKAGE_DIR)/usr/bin/duplicati" -- cp "$(SOURCE_DIR)/Installer/debian/duplicati-commandline-launcher.sh" "$(PACKAGE_DIR)/usr/bin/duplicati-cli" -- cp "$(SOURCE_DIR)/Installer/debian/duplicati-server-launcher.sh" "$(PACKAGE_DIR)/usr/bin/duplicati-server" -- cp "$(SOURCE_DIR)/Installer/debian/duplicati.desktop" "$(PACKAGE_DIR)/usr/share/applications/" -- cp "$(SOURCE_DIR)/Installer/debian/duplicati.xpm" "$(PACKAGE_DIR)/usr/share/pixmaps/" -- cp "$(SOURCE_DIR)/Installer/debian/duplicati.png" "$(PACKAGE_DIR)/usr/share/pixmaps/" -- -- # If we edit files, we sometimes get backup files included -- find "$(PACKAGE_DIR)" -type f -name \*\~ -exec rm -rf '{}' \; -- -- #Set permissions -- #chown -R root:root "$(PACKAGE_DIR)" -- chmod -R 755 "$(PACKAGE_DIR)" -- -- find "$(PACKAGE_DIR)" -type d -exec chmod 755 "{}" \; -- find "$(PACKAGE_DIR)" -type f -exec chmod 644 "{}" \; -- -- for EXT in exe py sh; do \ -- find "$(PACKAGE_DIR)" -type f -name \*.$(EXT) -exec chmod 755 "{}" \; ; \ -- done -- -- chmod +x "$(PACKAGE_DIR)/usr/bin/duplicati" -- chmod +x "$(PACKAGE_DIR)/usr/bin/duplicati-cli" -- -- if [ -e "duplicati.tar" ]; then \ -- rm -rf "duplicati.tar"; \ -- fi -- if [ -e "duplicati.tar.gz" ]; then \ -- rm -rf "duplicati.tar.gz"; \ -- fi -- -- tar -C "$(PACKAGE_DIR)" -cf "duplicati.tar" . -- gzip --best "duplicati.tar" -- --clean: -- (find "$(SOURCE_DIR)" -type d -name bin -exec rm -rf "{}" \; &> /dev/null) || echo "bin cleaned" -- (find "$(SOURCE_DIR)" -type d -name obj -exec rm -rf "{}" \; &> /dev/null) || echo "obj cleaned" -- rm -rf "$(PACKAGE_DIR)" -- -- --.PHONY: build all clean package debug -diff --git a/Tools/SQLiteTool/SQLiteTool.csproj b/Tools/SQLiteTool/SQLiteTool.csproj -index 9457deb..4946a5f 100644 ---- a/Tools/SQLiteTool/SQLiteTool.csproj -+++ b/Tools/SQLiteTool/SQLiteTool.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -45,4 +46,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/Tools/ZipFileDebugger/ZipFileDebugger.csproj b/Tools/ZipFileDebugger/ZipFileDebugger.csproj -index 408dd65..307a597 100644 ---- a/Tools/ZipFileDebugger/ZipFileDebugger.csproj -+++ b/Tools/ZipFileDebugger/ZipFileDebugger.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU -@@ -52,4 +53,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/mono-path-override.props b/mono-path-override.props -index d7bbdc7..abc3b75 100644 ---- a/mono-path-override.props -+++ b/mono-path-override.props -@@ -1,28 +1,32 @@ -- -+ - -- -- -- true -+ -+ -+ - -- -- /Library/Frameworks/Mono.framework/Versions/Current/lib/mono -- /usr/lib/mono -- /usr/local/lib/mono -+ -+ -+ -+ - -- -- $(BaseFrameworkPathOverrideForMono)/4.5-api -- $(BaseFrameworkPathOverrideForMono)/4.5.1-api -- $(BaseFrameworkPathOverrideForMono)/4.5.2-api -- $(BaseFrameworkPathOverrideForMono)/4.6-api -- $(BaseFrameworkPathOverrideForMono)/4.6.1-api -- $(BaseFrameworkPathOverrideForMono)/4.6.2-api -- $(BaseFrameworkPathOverrideForMono)/4.7-api -- $(BaseFrameworkPathOverrideForMono)/4.7.1-api -- $(BaseFrameworkPathOverrideForMono)/4.7.2-api -- $(BaseFrameworkPathOverrideForMono)/4.8-api -- true -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ /usr/lib/mono/4.7.1-api -+ true - - -- $(FrameworkPathOverride)/Facades;$(AssemblySearchPaths) -+ -+ $(FrameworkPathOverride)/Facades;$(AssemblySearchPaths) - - -diff --git a/thirdparty/mozroots/mozroots.csproj b/thirdparty/mozroots/mozroots.csproj -index 03ba919..fdd0a8a 100644 ---- a/thirdparty/mozroots/mozroots.csproj -+++ b/thirdparty/mozroots/mozroots.csproj -@@ -1,5 +1,6 @@ -  - -+ - - Debug - AnyCPU