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