diff --git a/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj b/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj index 8b63a6959..f99c18099 100644 --- a/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj +++ b/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/BuildTools/DependencyFinder/DependencyFinder.csproj b/BuildTools/DependencyFinder/DependencyFinder.csproj index 4d5104e7b..b2d393b4f 100644 --- a/BuildTools/DependencyFinder/DependencyFinder.csproj +++ b/BuildTools/DependencyFinder/DependencyFinder.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj b/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj index 70e11b000..a1c84cf38 100644 --- a/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj +++ b/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj index 9ff2e842f..9455f79a1 100644 --- a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj +++ b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/CommandLine/AutoUpdater/Duplicati.CommandLine.AutoUpdater.csproj b/Duplicati/CommandLine/AutoUpdater/Duplicati.CommandLine.AutoUpdater.csproj index f6f7dd514..af65c842e 100644 --- a/Duplicati/CommandLine/AutoUpdater/Duplicati.CommandLine.AutoUpdater.csproj +++ b/Duplicati/CommandLine/AutoUpdater/Duplicati.CommandLine.AutoUpdater.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net5.0 2.0.0.7 LGPL, Copyright ? Duplicati Team 2019 Duplicati.CommandLine.AutoUpdater diff --git a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj index 73fbee4c7..1aa442fb0 100644 --- a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj +++ b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net5.0 2.0.0.7 LGPL, Copyright ? Duplicati Team 2019 Duplicati.CommandLine.BackendTester diff --git a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj index f6a047013..7a8955787 100644 --- a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj +++ b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net5.0 2.0.0.7 LGPL, Copyright ? Duplicati Team 2019 Duplicati.CommandLine.BackendTool diff --git a/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj b/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj index f55467201..027d90c48 100644 --- a/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj +++ b/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net5.0 2.0.0.7 LGPL, Copyright ? Duplicati Team 2019 Duplicati.CommandLine.ConfigurationImporter diff --git a/Duplicati/CommandLine/Duplicati.CommandLine.csproj b/Duplicati/CommandLine/Duplicati.CommandLine.csproj index eada60c92..d5c1927c6 100644 --- a/Duplicati/CommandLine/Duplicati.CommandLine.csproj +++ b/Duplicati/CommandLine/Duplicati.CommandLine.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net5.0 2.0.0.7 LGPL, Copyright ? Duplicati Team 2019 Duplicati.CommandLine diff --git a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj index 6e5463a51..4d4d36526 100644 --- a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj +++ b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net5.0 2.0.0.7 LGPL, Copyright ? Duplicati Team 2019 Duplicati.CommandLine.RecoveryTool diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj index 327911f22..dedfb53e7 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net5.0 2.0.0.7 LGPL, Copyright ? Duplicati Team 2019 Duplicati.GUI.TrayIcon diff --git a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj index 4284d4c0f..027d5cab6 100644 --- a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj +++ b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 Library LGPL, Copyright © Duplicati Team 2019 diff --git a/Duplicati/Library/AutoUpdater/UpdaterManager.cs b/Duplicati/Library/AutoUpdater/UpdaterManager.cs index 8f3309f9c..487650597 100644 --- a/Duplicati/Library/AutoUpdater/UpdaterManager.cs +++ b/Duplicati/Library/AutoUpdater/UpdaterManager.cs @@ -1099,7 +1099,7 @@ namespace Duplicati.Library.AutoUpdater return r; } - var app = Environment.GetCommandLineArgs().First(); + var app = Environment.GetCommandLineArgs().First().Substring(0, Environment.GetCommandLineArgs().First().Length - 3) + "exe"; var args = Library.Utility.Utility.WrapAsCommandLine(Environment.GetCommandLineArgs().Skip(1), false); if (!Path.IsPathRooted(app)) diff --git a/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj b/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj index 16e881216..7f83ea55c 100644 --- a/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj +++ b/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 Library LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj b/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj index 05ab47579..aca37804f 100644 --- a/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj +++ b/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj b/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj index 51bf59670..c3c296c04 100644 --- a/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj +++ b/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright � Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj b/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj index 26a0ec5e6..0052d3925 100644 --- a/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj +++ b/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright � Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj index 7cc1b0eb7..a274b01e0 100644 --- a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj +++ b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright � Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj b/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj index 03b456f36..d04bb0a7b 100644 --- a/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj +++ b/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj b/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj index 892830302..de9514c70 100644 --- a/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj +++ b/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj index be7f17605..eb3a3d20e 100644 --- a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj +++ b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright � Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj b/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj index 901627186..3c6001d96 100644 --- a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj +++ b/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright � Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj b/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj index a3b5f8b01..04e59504f 100644 --- a/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj +++ b/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright � Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj b/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj index 6812728f2..2e4217635 100644 --- a/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj +++ b/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj b/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj index 4de7f9c3e..3dd6f475c 100644 --- a/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj +++ b/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright � Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj b/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj index 338241538..d0c280bc1 100644 --- a/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj +++ b/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright � Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj b/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj index f52e00447..88719452c 100644 --- a/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj +++ b/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj b/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj index e6f7aaf05..6011b53ab 100644 --- a/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj +++ b/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright � Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj b/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj index 9b1792930..4f7762999 100644 --- a/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj +++ b/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj index bd9b7ffd2..ccf857a30 100644 --- a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj +++ b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright � Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj index 30237db02..14759cc2a 100644 --- a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj +++ b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj b/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj index ddcee7f22..3264f4dca 100644 --- a/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj +++ b/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj b/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj index ef25d86fe..29a93757f 100644 --- a/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj +++ b/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj b/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj index 118f70c18..e6559e3f9 100644 --- a/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj +++ b/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj b/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj index 81cdfd6b1..ff1d9ee40 100644 --- a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj +++ b/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj index ca03fda67..eee4b310b 100644 --- a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj +++ b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright � Duplicati Team 2015 diff --git a/Duplicati/Library/Common/Duplicati.Library.Common.csproj b/Duplicati/Library/Common/Duplicati.Library.Common.csproj index 4d349bc93..9dc3ebe9a 100644 --- a/Duplicati/Library/Common/Duplicati.Library.Common.csproj +++ b/Duplicati/Library/Common/Duplicati.Library.Common.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj b/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj index c82f34cfb..6598e1720 100644 --- a/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj +++ b/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj b/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj index 4c73e6cab..af060a4d8 100644 --- a/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj +++ b/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright ? Duplicati Team 2015 diff --git a/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj b/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj index a0a1673a6..a0b644641 100644 --- a/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj +++ b/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright � Duplicati Team 2015 diff --git a/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj b/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj index 1fbbd9802..708fe64ad 100644 --- a/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj +++ b/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj b/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj index 1d188fd8c..e6e2ccc36 100644 --- a/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj +++ b/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj b/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj index d579b72e2..c1cc80145 100644 --- a/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj +++ b/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj @@ -1,6 +1,6 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright � Duplicati Team 2015 diff --git a/Duplicati/Library/Main/Duplicati.Library.Main.csproj b/Duplicati/Library/Main/Duplicati.Library.Main.csproj index e860a9acb..254e48bd9 100644 --- a/Duplicati/Library/Main/Duplicati.Library.Main.csproj +++ b/Duplicati/Library/Main/Duplicati.Library.Main.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright ? Duplicati Team 2015 diff --git a/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj b/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj index 791587b75..3cffc6061 100644 --- a/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj +++ b/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright ? Duplicati Team 2015 diff --git a/Duplicati/Library/SQLiteHelper/DatabaseUpgrader.cs b/Duplicati/Library/SQLiteHelper/DatabaseUpgrader.cs index 14c99c527..8c0f8fe72 100644 --- a/Duplicati/Library/SQLiteHelper/DatabaseUpgrader.cs +++ b/Duplicati/Library/SQLiteHelper/DatabaseUpgrader.cs @@ -56,7 +56,7 @@ namespace Duplicati.Library.SQLiteHelper public static class DatabaseUpgrader { //This is the "folder" where the embedded resources can be found - private const string FOLDER_NAME = "Duplicati.Library.Main.Database.Database_schema"; + private const string FOLDER_NAME = "Database_schema"; //This is the name of the schema sql private const string SCHEMA_NAME = "Schema.sql"; @@ -140,7 +140,7 @@ namespace Duplicati.Library.SQLiteHelper var asm = eltype.Assembly; string schema; - using (var rd = new System.IO.StreamReader(asm.GetManifestResourceStream($"{FOLDER_NAME}.{SCHEMA_NAME}"))) + using (var rd = new System.IO.StreamReader(asm.GetManifestResourceStream(eltype, $"{FOLDER_NAME}.{SCHEMA_NAME}"))) schema = rd.ReadToEnd(); //Get updates, and sort them according to version @@ -152,11 +152,12 @@ namespace Duplicati.Library.SQLiteHelper { //The resource name will be "Duplicati.Library.Main.Database.Database_schema.1.Sample upgrade.sql" //The number indicates the version that will be upgraded to - if (s.StartsWith(prefix, StringComparison.Ordinal) && !s.Equals(prefix + SCHEMA_NAME)) + //Could be ""Duplicati.Server.Database.Database_schema.1. Add Notifications.sql"" + if (s.Contains(prefix, StringComparison.Ordinal) && !s.EndsWith(prefix + SCHEMA_NAME)) { try { - string version = s.Substring(prefix.Length, s.IndexOf(".", prefix.Length + 1, StringComparison.Ordinal) - prefix.Length); + string version = s.Substring(s.IndexOf(prefix) + prefix.Length, s.IndexOf(".", s.IndexOf(prefix) + prefix.Length + 1, StringComparison.Ordinal) - s.IndexOf(prefix) - prefix.Length); int fileversion = int.Parse(version); string prev; diff --git a/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj b/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj index fb9c14642..c399c83cc 100644 --- a/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj +++ b/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright ? Duplicati Team 2015 diff --git a/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj b/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj index 4b6f400ac..12e3413ad 100644 --- a/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj +++ b/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 Duplicati.Library.Snapshots diff --git a/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj b/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj index 1222b4a9b..3808375fc 100644 --- a/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj +++ b/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright � Duplicati Team 2015 diff --git a/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj b/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj index 66db802da..ce2979d00 100644 --- a/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj +++ b/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/License/Duplicati.License.csproj b/Duplicati/License/Duplicati.License.csproj index 5d1ba7979..3fe81df2f 100644 --- a/Duplicati/License/Duplicati.License.csproj +++ b/Duplicati/License/Duplicati.License.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj b/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj index 8cf2f5d94..66a40599e 100644 --- a/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj +++ b/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright ? Duplicati Team 2015 diff --git a/Duplicati/Server/Duplicati.Server.csproj b/Duplicati/Server/Duplicati.Server.csproj index 0a1a8f6e5..3d69d2952 100644 --- a/Duplicati/Server/Duplicati.Server.csproj +++ b/Duplicati/Server/Duplicati.Server.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net5.0 2.0.0.7 LGPL, Copyright ? Duplicati Team 2019 Duplicati.Server diff --git a/Duplicati/Server/Program.cs b/Duplicati/Server/Program.cs index ddbbc8a8d..3826fa357 100644 --- a/Duplicati/Server/Program.cs +++ b/Duplicati/Server/Program.cs @@ -177,6 +177,8 @@ namespace Duplicati.Server public static int RealMain(string[] _args) { + System.Diagnostics.Debugger.Launch(); + //If we are on Windows, append the bundled "win-tools" programs to the search path //We add it last, to allow the user to override with other versions if (Platform.IsClientWindows) diff --git a/Duplicati/Service/Duplicati.Service.csproj b/Duplicati/Service/Duplicati.Service.csproj index a589f06e6..0830fcb29 100644 --- a/Duplicati/Service/Duplicati.Service.csproj +++ b/Duplicati/Service/Duplicati.Service.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 2.0.0.7 Exe LGPL, Copyright ? Duplicati Team 2019 diff --git a/Duplicati/Tools/Duplicati.Tools.csproj b/Duplicati/Tools/Duplicati.Tools.csproj index edd10e9c6..4a7766ead 100644 --- a/Duplicati/Tools/Duplicati.Tools.csproj +++ b/Duplicati/Tools/Duplicati.Tools.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright � Duplicati Team 2015 diff --git a/Duplicati/UnitTest/Duplicati.UnitTest.csproj b/Duplicati/UnitTest/Duplicati.UnitTest.csproj index cf5203512..2d0e7cb18 100644 --- a/Duplicati/UnitTest/Duplicati.UnitTest.csproj +++ b/Duplicati/UnitTest/Duplicati.UnitTest.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net5.0 2.0.0.7 LGPL, Copyright ? Duplicati Team 2019 Duplicati.UnitTest diff --git a/Duplicati/WindowsService/WindowsService.csproj b/Duplicati/WindowsService/WindowsService.csproj index 51f5720e6..d36f4b5d4 100644 --- a/Duplicati/WindowsService/WindowsService.csproj +++ b/Duplicati/WindowsService/WindowsService.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2019 Duplicati.WindowsService diff --git a/Installer/Windows/UpdateVersion/UpdateVersion.csproj b/Installer/Windows/UpdateVersion/UpdateVersion.csproj index 2f52b7be8..584c56439 100644 --- a/Installer/Windows/UpdateVersion/UpdateVersion.csproj +++ b/Installer/Windows/UpdateVersion/UpdateVersion.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Tools/SQLiteTool/SQLiteTool.csproj b/Tools/SQLiteTool/SQLiteTool.csproj index f8b00f970..c684f3d13 100644 --- a/Tools/SQLiteTool/SQLiteTool.csproj +++ b/Tools/SQLiteTool/SQLiteTool.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/Tools/ZipFileDebugger/ZipFileDebugger.csproj b/Tools/ZipFileDebugger/ZipFileDebugger.csproj index 07e2b19a3..be01c9117 100644 --- a/Tools/ZipFileDebugger/ZipFileDebugger.csproj +++ b/Tools/ZipFileDebugger/ZipFileDebugger.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + net5.0 2.0.0.7 LGPL, Copyright © Duplicati Team 2015 diff --git a/thirdparty/UnixSupport/UnixSupport.csproj b/thirdparty/UnixSupport/UnixSupport.csproj index 2b1f79558..791eb952e 100644 --- a/thirdparty/UnixSupport/UnixSupport.csproj +++ b/thirdparty/UnixSupport/UnixSupport.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net5.0 2.0.0.7 Exe LGPL, Copyright © Duplicati Team 2015