From 59cc0005a3f654ebdcedc689eeb486c7c1a00200 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Fri, 29 Jan 2016 10:47:39 +0100 Subject: Removed unused references and updated most libraries to come from NuGet sources instead of being provided in the thirdparty library --- .../Duplicati.CommandLine.BackendTester.csproj | 3 +- .../Duplicati.CommandLine.BackendTool.csproj | 5 +- Duplicati/CommandLine/Duplicati.CommandLine.csproj | 7 +-- .../Duplicati.CommandLine.RecoveryTool.csproj | 2 +- .../Duplicati.GUI.TrayIcon.csproj | 6 +-- .../Duplicati.Library.AutoUpdater.csproj | 3 +- Duplicati/Library/AutoUpdater/packages.config | 4 ++ ...plicati.Library.Backend.AmazonCloudDrive.csproj | 5 +- .../Backend/AmazonCloudDrive/packages.config | 4 ++ .../Duplicati.Library.Backend.AzureBlob.csproj | 32 +++++++----- .../Library/Backend/AzureBlob/packages.config | 11 ++++ .../Duplicati.Library.Backend.Backblaze.csproj | 5 +- .../Library/Backend/Backblaze/packages.config | 4 ++ .../Box/Duplicati.Library.Backend.Box.csproj | 5 +- Duplicati/Library/Backend/Box/packages.config | 4 ++ Duplicati/Library/Backend/CloudFiles/CloudFiles.cs | 8 +-- .../Duplicati.Library.Backend.CloudFiles.csproj | 4 -- .../FTP/Duplicati.Library.Backend.FTP.csproj | 4 -- .../File/Duplicati.Library.Backend.File.csproj | 4 -- ...Duplicati.Library.Backend.GoogleServices.csproj | 6 ++- .../Library/Backend/GoogleServices/packages.config | 4 ++ .../Mega/Duplicati.Library.Backend.Mega.csproj | 7 ++- Duplicati/Library/Backend/Mega/packages.config | 5 ++ .../Duplicati.Library.OAuthHelper.csproj | 5 +- .../Library/Backend/OAuthHelper/packages.config | 4 ++ .../Duplicati.Library.Backend.OneDrive.csproj | 3 +- Duplicati/Library/Backend/OneDrive/packages.config | 4 ++ .../Duplicati.Library.Backend.OpenStack.csproj | 5 +- .../Library/Backend/OpenStack/packages.config | 4 ++ .../Backend/S3/Duplicati.Library.Backend.S3.csproj | 13 +++-- Duplicati/Library/Backend/S3/S3Backend.cs | 4 +- Duplicati/Library/Backend/S3/S3Wrapper.cs | 5 +- Duplicati/Library/Backend/S3/packages.config | 5 ++ .../SSHv2/Duplicati.Library.Backend.SSHv2.csproj | 12 ++--- Duplicati/Library/Backend/SSHv2/packages.config | 4 ++ .../Duplicati.Library.Backend.TahoeLAFS.csproj | 6 +-- .../Library/Backend/TahoeLAFS/TahoeBackend.cs | 2 +- .../Library/Backend/TahoeLAFS/packages.config | 4 ++ .../WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj | 4 -- Duplicati/Library/Backend/WEBDAV/WEBDAV.cs | 6 +-- .../Duplicati.Library.Compression.csproj | 2 - .../Duplicati.Library.DynamicLoader.csproj | 3 -- .../Encryption/Duplicati.Library.Encryption.csproj | 7 +-- Duplicati/Library/Encryption/packages.config | 4 ++ .../Interface/Duplicati.Library.Interface.csproj | 3 -- .../Logging/Duplicati.Library.Logging.csproj | 2 - .../Library/Main/Duplicati.Library.Main.csproj | 9 ++-- Duplicati/Library/Main/packages.config | 4 ++ .../Duplicati.Library.Modules.Builtin.csproj | 10 ++-- Duplicati/Library/Modules/Builtin/packages.config | 5 ++ .../Snapshots/Duplicati.Library.Snapshots.csproj | 59 +++++++++++----------- Duplicati/Library/Snapshots/SystemIOWindows.cs | 7 +-- Duplicati/Library/Snapshots/WinNativeMethods.cs | 5 +- Duplicati/Library/Snapshots/packages.config | 6 +++ .../Duplicati.Library.UsageReporter.csproj | 11 ++-- Duplicati/Library/UsageReporter/packages.config | 5 ++ .../Utility/Duplicati.Library.Utility.csproj | 2 - Duplicati/License/Duplicati.License.csproj | 2 - .../Duplicati.Server.Serialization.csproj | 8 +-- .../Duplicati.Server.Serialization/packages.config | 4 ++ Duplicati/Server/Duplicati.Server.csproj | 15 +++--- Duplicati/Server/packages.config | 4 ++ 62 files changed, 237 insertions(+), 172 deletions(-) create mode 100644 Duplicati/Library/AutoUpdater/packages.config create mode 100644 Duplicati/Library/Backend/AmazonCloudDrive/packages.config create mode 100644 Duplicati/Library/Backend/AzureBlob/packages.config create mode 100644 Duplicati/Library/Backend/Backblaze/packages.config create mode 100644 Duplicati/Library/Backend/Box/packages.config create mode 100644 Duplicati/Library/Backend/GoogleServices/packages.config create mode 100644 Duplicati/Library/Backend/Mega/packages.config create mode 100644 Duplicati/Library/Backend/OAuthHelper/packages.config create mode 100644 Duplicati/Library/Backend/OneDrive/packages.config create mode 100644 Duplicati/Library/Backend/OpenStack/packages.config create mode 100644 Duplicati/Library/Backend/S3/packages.config create mode 100644 Duplicati/Library/Backend/SSHv2/packages.config create mode 100644 Duplicati/Library/Backend/TahoeLAFS/packages.config create mode 100644 Duplicati/Library/Encryption/packages.config create mode 100644 Duplicati/Library/Main/packages.config create mode 100644 Duplicati/Library/Modules/Builtin/packages.config create mode 100644 Duplicati/Library/Snapshots/packages.config create mode 100644 Duplicati/Library/UsageReporter/packages.config create mode 100644 Duplicati/Server/Duplicati.Server.Serialization/packages.config create mode 100644 Duplicati/Server/packages.config (limited to 'Duplicati') diff --git a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj index a3a4be85e..b351861b4 100644 --- a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj +++ b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj @@ -15,7 +15,7 @@ 3.5 - true + false Duplicati.snk v4.5 @@ -47,7 +47,6 @@ - diff --git a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj index b62290910..3273f0be5 100644 --- a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj +++ b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj @@ -9,7 +9,7 @@ Exe Duplicati.CommandLine.BackendTool Duplicati.CommandLine.BackendTool - true + false ..\Duplicati.snk v4.5 @@ -41,9 +41,6 @@ - - ..\..\..\thirdparty\Json.NET\Newtonsoft.Json.dll - diff --git a/Duplicati/CommandLine/Duplicati.CommandLine.csproj b/Duplicati/CommandLine/Duplicati.CommandLine.csproj index 37c58c88d..7bebeb3f9 100644 --- a/Duplicati/CommandLine/Duplicati.CommandLine.csproj +++ b/Duplicati/CommandLine/Duplicati.CommandLine.csproj @@ -10,7 +10,7 @@ Properties Duplicati.CommandLine Duplicati.CommandLine - true + false Duplicati.snk TrayWarning.ico @@ -45,12 +45,7 @@ - - - - ..\..\thirdparty\Json.NET\Newtonsoft.Json.dll - diff --git a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj index e49ae31d4..975a0f166 100644 --- a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj +++ b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj @@ -9,7 +9,7 @@ Exe Duplicati.CommandLine.RecoveryTool Duplicati.CommandLine.RecoveryTool - true + false Duplicati.snk v4.5 diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj index 6c652d97c..a93b51cb8 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj @@ -66,13 +66,8 @@ - - - - - ..\..\..\thirdparty\appindicator-sharp\appindicator-sharp.dll False @@ -92,6 +87,7 @@ ..\..\..\thirdparty\notify-sharp\notify-sharp.dll False + diff --git a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj index ff9b82e69..78440d3c0 100644 --- a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj +++ b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj @@ -38,7 +38,7 @@ - ..\..\..\thirdparty\Json.NET\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll @@ -74,5 +74,6 @@ + \ No newline at end of file diff --git a/Duplicati/Library/AutoUpdater/packages.config b/Duplicati/Library/AutoUpdater/packages.config new file mode 100644 index 000000000..2abc396bb --- /dev/null +++ b/Duplicati/Library/AutoUpdater/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Duplicati/Library/Backend/AmazonCloudDrive/Duplicati.Library.Backend.AmazonCloudDrive.csproj b/Duplicati/Library/Backend/AmazonCloudDrive/Duplicati.Library.Backend.AmazonCloudDrive.csproj index d490ada43..903f63516 100644 --- a/Duplicati/Library/Backend/AmazonCloudDrive/Duplicati.Library.Backend.AmazonCloudDrive.csproj +++ b/Duplicati/Library/Backend/AmazonCloudDrive/Duplicati.Library.Backend.AmazonCloudDrive.csproj @@ -34,7 +34,7 @@ - ..\..\..\..\thirdparty\Json.NET\Newtonsoft.Json.dll + ..\..\..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll @@ -61,4 +61,7 @@ Duplicati.Library.Interface + + + \ No newline at end of file diff --git a/Duplicati/Library/Backend/AmazonCloudDrive/packages.config b/Duplicati/Library/Backend/AmazonCloudDrive/packages.config new file mode 100644 index 000000000..2abc396bb --- /dev/null +++ b/Duplicati/Library/Backend/AmazonCloudDrive/packages.config @@ -0,0 +1,4 @@ + + + + \ 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 aeb6c6617..64414d026 100644 --- a/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj +++ b/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj @@ -39,27 +39,30 @@ - - - - + + ..\..\..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll + + + ..\..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + + + ..\..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + - ..\..\..\..\thirdparty\WindowsAzureStorage\Microsoft.Data.OData.dll + ..\..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll - ..\..\..\..\thirdparty\WindowsAzureStorage\Microsoft.Data.Services.Client.dll + ..\..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll - - ..\..\..\..\thirdparty\WindowsAzureStorage\Microsoft.WindowsAzure.Configuration.dll + + ..\..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - ..\..\..\..\thirdparty\WindowsAzureStorage\Microsoft.WindowsAzure.Storage.dll - - - ..\..\..\..\thirdparty\WindowsAzureStorage\Microsoft.Data.Edm.dll + ..\..\..\..\packages\WindowsAzure.Storage.6.2.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - - ..\..\..\..\thirdparty\Json.NET\Newtonsoft.Json.dll + + + ..\..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll @@ -84,6 +87,7 @@ +