diff options
author | Kenneth Skovhede <kenneth@hexad.dk> | 2016-01-29 12:47:39 +0300 |
---|---|---|
committer | Kenneth Skovhede <kenneth@hexad.dk> | 2016-01-29 12:47:39 +0300 |
commit | 59cc0005a3f654ebdcedc689eeb486c7c1a00200 (patch) | |
tree | b82f0f104a6d9bc61c93018206ab3b92fe2b3fa9 /Duplicati/Library/Backend | |
parent | 707ab752dbb3cc8fa0c96c14164cb6079c3b8c25 (diff) |
Removed unused references and updated most libraries to come from NuGet sources instead of being provided in the thirdparty library
Diffstat (limited to 'Duplicati/Library/Backend')
33 files changed, 130 insertions, 72 deletions
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 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\..\..\thirdparty\Json.NET\Newtonsoft.Json.dll</HintPath> + <HintPath>..\..\..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -61,4 +61,7 @@ <Name>Duplicati.Library.Interface</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> </Project>
\ 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" /> +</packages>
\ 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 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="System.Core" /> - <Reference Include="System.Xml.Linq" /> - <Reference Include="Microsoft.CSharp" /> - <Reference Include="System.Data" /> - <Reference Include="System.Xml" /> + <Reference Include="Newtonsoft.Json"> + <HintPath>..\..\..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> + </Reference> + <Reference Include="System.Spatial"> + <HintPath>..\..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath> + </Reference> + <Reference Include="Microsoft.Data.Edm"> + <HintPath>..\..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath> + </Reference> <Reference Include="Microsoft.Data.OData"> - <HintPath>..\..\..\..\thirdparty\WindowsAzureStorage\Microsoft.Data.OData.dll</HintPath> + <HintPath>..\..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath> </Reference> <Reference Include="Microsoft.Data.Services.Client"> - <HintPath>..\..\..\..\thirdparty\WindowsAzureStorage\Microsoft.Data.Services.Client.dll</HintPath> + <HintPath>..\..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath> </Reference> - <Reference Include="Microsoft.WindowsAzure.Configuration"> - <HintPath>..\..\..\..\thirdparty\WindowsAzureStorage\Microsoft.WindowsAzure.Configuration.dll</HintPath> + <Reference Include="Microsoft.Azure.KeyVault.Core"> + <HintPath>..\..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath> </Reference> <Reference Include="Microsoft.WindowsAzure.Storage"> - <HintPath>..\..\..\..\thirdparty\WindowsAzureStorage\Microsoft.WindowsAzure.Storage.dll</HintPath> - </Reference> - <Reference Include="Microsoft.Data.Edm"> - <HintPath>..\..\..\..\thirdparty\WindowsAzureStorage\Microsoft.Data.Edm.dll</HintPath> + <HintPath>..\..\..\..\packages\WindowsAzure.Storage.6.2.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath> </Reference> - <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\..\..\thirdparty\Json.NET\Newtonsoft.Json.dll</HintPath> + <Reference Include="System.Data" /> + <Reference Include="Microsoft.WindowsAzure.Configuration"> + <HintPath>..\..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -84,6 +87,7 @@ </ItemGroup> <ItemGroup> <None Include="Duplicati.snk" /> + <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. diff --git a/Duplicati/Library/Backend/AzureBlob/packages.config b/Duplicati/Library/Backend/AzureBlob/packages.config new file mode 100644 index 000000000..89349b958 --- /dev/null +++ b/Duplicati/Library/Backend/AzureBlob/packages.config @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" /> + <package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" /> + <package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" /> + <package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" /> + <package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" /> + <package id="System.Spatial" version="5.6.4" targetFramework="net45" /> + <package id="WindowsAzure.Storage" version="6.2.0" targetFramework="net45" /> +</packages>
\ 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 5beca3f45..5d5941dd9 100644 --- a/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj +++ b/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj @@ -34,7 +34,7 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\..\..\thirdparty\Json.NET\Newtonsoft.Json.dll</HintPath> + <HintPath>..\..\..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -62,4 +62,7 @@ <Name>Duplicati.Library.Interface</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> </Project>
\ No newline at end of file diff --git a/Duplicati/Library/Backend/Backblaze/packages.config b/Duplicati/Library/Backend/Backblaze/packages.config new file mode 100644 index 000000000..2abc396bb --- /dev/null +++ b/Duplicati/Library/Backend/Backblaze/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" /> +</packages>
\ 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 c6f0cd1d8..71b54c136 100644 --- a/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj +++ b/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj @@ -34,7 +34,7 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\..\..\thirdparty\Json.NET\Newtonsoft.Json.dll</HintPath> + <HintPath>..\..\..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -61,4 +61,7 @@ <Name>Duplicati.Library.OAuthHelper</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> </Project>
\ No newline at end of file diff --git a/Duplicati/Library/Backend/Box/packages.config b/Duplicati/Library/Backend/Box/packages.config new file mode 100644 index 000000000..2abc396bb --- /dev/null +++ b/Duplicati/Library/Backend/Box/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" /> +</packages>
\ No newline at end of file diff --git a/Duplicati/Library/Backend/CloudFiles/CloudFiles.cs b/Duplicati/Library/Backend/CloudFiles/CloudFiles.cs index 853f71769..e7d38bf10 100644 --- a/Duplicati/Library/Backend/CloudFiles/CloudFiles.cs +++ b/Duplicati/Library/Backend/CloudFiles/CloudFiles.cs @@ -98,9 +98,9 @@ namespace Duplicati.Library.Backend //This allows the use of containers that have names that are not valid hostnames,
// such as container names with spaces in them
if (u.Host.Equals(DUMMY_HOSTNAME))
- m_path = System.Web.HttpUtility.UrlDecode(u.PathAndQuery);
+ m_path = Library.Utility.Uri.UrlDecode(u.PathAndQuery);
else
- m_path = u.Host + System.Web.HttpUtility.UrlDecode(u.PathAndQuery);
+ m_path = u.Host + Library.Utility.Uri.UrlDecode(u.PathAndQuery);
}
else
{
@@ -188,7 +188,7 @@ namespace Duplicati.Library.Backend repeat = lst.Count == ITEM_LIST_LIMIT;
if (repeat)
- markerUrl = "&marker=" + System.Web.HttpUtility.UrlEncode(lastItemName);
+ markerUrl = "&marker=" + Library.Utility.Uri.UrlEncode(lastItemName);
} while (repeat);
@@ -423,7 +423,7 @@ namespace Duplicati.Library.Backend private string UrlEncode(string value)
{
- return System.Web.HttpUtility.UrlEncode(value).Replace("+", "%20").Replace("%2f", "/");
+ return Library.Utility.Uri.UrlEncode(value).Replace("+", "%20").Replace("%2f", "/");
}
}
}
diff --git a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj index 071ebf8f2..a0517c685 100644 --- a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj +++ b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj @@ -39,10 +39,6 @@ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Web" />
- <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj b/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj index 1f0be13cb..d2afc9724 100644 --- a/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj +++ b/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj @@ -39,10 +39,6 @@ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj index 15eb6ec30..8f29410c3 100644 --- a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj +++ b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj @@ -39,10 +39,6 @@ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="FileBackend.cs" />
diff --git a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj b/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj index cab947077..e39c70fbf 100644 --- a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj +++ b/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj @@ -32,9 +32,8 @@ </PropertyGroup> <ItemGroup> <Reference Include="System" /> - <Reference Include="System.Web" /> <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\..\..\thirdparty\Json.NET\Newtonsoft.Json.dll</HintPath> + <HintPath>..\..\..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -64,4 +63,7 @@ <Name>Duplicati.Library.OAuthHelper</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> </Project>
\ No newline at end of file diff --git a/Duplicati/Library/Backend/GoogleServices/packages.config b/Duplicati/Library/Backend/GoogleServices/packages.config new file mode 100644 index 000000000..2abc396bb --- /dev/null +++ b/Duplicati/Library/Backend/GoogleServices/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" /> +</packages>
\ 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 4cf978cd8..db317a7fe 100644 --- a/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj +++ b/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj @@ -34,10 +34,10 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\..\..\thirdparty\Json.NET\Newtonsoft.Json.dll</HintPath> + <HintPath>..\..\..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> <Reference Include="MegaApiClient"> - <HintPath>..\..\..\..\thirdparty\MegaApi\MegaApiClient.dll</HintPath> + <HintPath>..\..\..\..\packages\MegaApiClient.1.1.3\lib\net40\MegaApiClient.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -60,4 +60,7 @@ <Name>Duplicati.Library.Utility</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> </Project>
\ No newline at end of file diff --git a/Duplicati/Library/Backend/Mega/packages.config b/Duplicati/Library/Backend/Mega/packages.config new file mode 100644 index 000000000..0f3f0a037 --- /dev/null +++ b/Duplicati/Library/Backend/Mega/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="MegaApiClient" version="1.1.3" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" /> +</packages>
\ No newline at end of file diff --git a/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj b/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj index 9c9a9ad7d..f36492ebe 100644 --- a/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj +++ b/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj @@ -34,7 +34,7 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\..\..\thirdparty\Json.NET\Newtonsoft.Json.dll</HintPath> + <HintPath>..\..\..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -55,4 +55,7 @@ <Name>Duplicati.Library.Localization</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> </Project>
\ No newline at end of file diff --git a/Duplicati/Library/Backend/OAuthHelper/packages.config b/Duplicati/Library/Backend/OAuthHelper/packages.config new file mode 100644 index 000000000..2abc396bb --- /dev/null +++ b/Duplicati/Library/Backend/OAuthHelper/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" /> +</packages>
\ 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 afa49aa8f..9a9d59e10 100644 --- a/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj +++ b/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj @@ -41,11 +41,12 @@ </PropertyGroup>
<ItemGroup>
<None Include="Duplicati.snk" />
+ <None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="Newtonsoft.Json">
- <HintPath>..\..\..\..\thirdparty\Json.NET\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/Library/Backend/OneDrive/packages.config b/Duplicati/Library/Backend/OneDrive/packages.config new file mode 100644 index 000000000..2abc396bb --- /dev/null +++ b/Duplicati/Library/Backend/OneDrive/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" /> +</packages>
\ 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 7dabb2240..d1731d540 100644 --- a/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj +++ b/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj @@ -34,7 +34,7 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\..\..\thirdparty\Json.NET\Newtonsoft.Json.dll</HintPath> + <HintPath>..\..\..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -62,4 +62,7 @@ <Name>Duplicati.Library.OAuthHelper</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> </Project>
\ No newline at end of file diff --git a/Duplicati/Library/Backend/OpenStack/packages.config b/Duplicati/Library/Backend/OpenStack/packages.config new file mode 100644 index 000000000..2abc396bb --- /dev/null +++ b/Duplicati/Library/Backend/OpenStack/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" /> +</packages>
\ 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 a07a5e7ec..6640a4fb3 100644 --- a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj +++ b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj @@ -39,13 +39,11 @@ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Web" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
- <Reference Include="AWSSDK">
- <HintPath>..\..\..\..\thirdparty\AWS SDK\AWSSDK.dll</HintPath>
+ <Reference Include="AWSSDK.Core">
+ <HintPath>..\..\..\..\packages\AWSSDK.Core.3.1.4.3\lib\net45\AWSSDK.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="AWSSDK.S3">
+ <HintPath>..\..\..\..\packages\AWSSDK.S3.3.1.3.10\lib\net45\AWSSDK.S3.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -72,6 +70,7 @@ <ItemGroup>
<None Include="app.config" />
<None Include="Duplicati.snk" />
+ <None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Duplicati/Library/Backend/S3/S3Backend.cs b/Duplicati/Library/Backend/S3/S3Backend.cs index b1b1051b0..59b9cc1ab 100644 --- a/Duplicati/Library/Backend/S3/S3Backend.cs +++ b/Duplicati/Library/Backend/S3/S3Backend.cs @@ -200,7 +200,7 @@ namespace Duplicati.Library.Backend if (host.ToLower() == s3host)
{
- m_bucket = System.Web.HttpUtility.UrlDecode(u.PathAndQuery);
+ m_bucket = Library.Utility.Uri.UrlDecode(u.PathAndQuery);
if (m_bucket.StartsWith("/"))
m_bucket = m_bucket.Substring(1);
@@ -218,7 +218,7 @@ namespace Duplicati.Library.Backend {
m_bucket = host.Substring(0, host.Length - ("." + s3host).Length);
host = s3host;
- m_prefix = System.Web.HttpUtility.UrlDecode(u.PathAndQuery);
+ m_prefix = Library.Utility.Uri.UrlDecode(u.PathAndQuery);
if (m_prefix.StartsWith("/"))
m_prefix = m_prefix.Substring(1);
diff --git a/Duplicati/Library/Backend/S3/S3Wrapper.cs b/Duplicati/Library/Backend/S3/S3Wrapper.cs index bcc1d0c62..ae5b14157 100644 --- a/Duplicati/Library/Backend/S3/S3Wrapper.cs +++ b/Duplicati/Library/Backend/S3/S3Wrapper.cs @@ -22,7 +22,6 @@ using System.Collections.Generic; using System.Text;
using Amazon.S3;
using Amazon.S3.Model;
-using System.Xml;
using Duplicati.Library.Interface;
namespace Duplicati.Library.Backend
@@ -40,11 +39,11 @@ namespace Duplicati.Library.Backend public S3Wrapper(string awsID, string awsKey, string locationConstraint, string servername, string storageClass, bool useSSL)
{
- AmazonS3Config cfg = new AmazonS3Config();
+ var cfg = new AmazonS3Config();
cfg.UseHttp = !useSSL;
cfg.ServiceURL = (useSSL ? "https://" : "http://") + servername;
- cfg.UserAgent = "Duplicati v" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString() + " S3 client with AWS SDK v" + cfg.GetType().Assembly.GetName().Version.ToString();
+ //cfg.UserAgent = "Duplicati v" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString() + " S3 client with AWS SDK v" + cfg.GetType().Assembly.GetName().Version.ToString();
cfg.BufferSize = (int)Duplicati.Library.Utility.Utility.DEFAULT_BUFFER_SIZE;
m_client = new Amazon.S3.AmazonS3Client(awsID, awsKey, cfg);
diff --git a/Duplicati/Library/Backend/S3/packages.config b/Duplicati/Library/Backend/S3/packages.config new file mode 100644 index 000000000..650da16f5 --- /dev/null +++ b/Duplicati/Library/Backend/S3/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="AWSSDK.Core" version="3.1.4.3" targetFramework="net45" /> + <package id="AWSSDK.S3" version="3.1.3.10" targetFramework="net45" /> +</packages>
\ 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 8109e4662..2d78861d0 100644 --- a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj +++ b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj @@ -11,7 +11,7 @@ <RootNamespace>Duplicati.Library.Backend</RootNamespace>
<AssemblyName>Duplicati.Library.Backend.SSHv2</AssemblyName>
<FileAlignment>512</FileAlignment>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
@@ -40,15 +40,8 @@ <ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
<Reference Include="Renci.SshNet">
- <HintPath>..\..\..\..\thirdparty\SSH.NET\Renci.SshNet.dll</HintPath>
+ <HintPath>..\..\..\..\packages\SSH.NET.2013.4.7\lib\net40\Renci.SshNet.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -74,6 +67,7 @@ </ItemGroup>
<ItemGroup>
<None Include="Duplicati.snk" />
+ <None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Duplicati/Library/Backend/SSHv2/packages.config b/Duplicati/Library/Backend/SSHv2/packages.config new file mode 100644 index 000000000..9830519ea --- /dev/null +++ b/Duplicati/Library/Backend/SSHv2/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="SSH.NET" version="2013.4.7" targetFramework="net45" /> +</packages>
\ 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 2445b7917..25b5eeaab 100644 --- a/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj +++ b/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj @@ -41,11 +41,10 @@ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="System.Web" />
+ <Reference Include="System.Core" />
<Reference Include="Newtonsoft.Json">
- <HintPath>..\..\..\..\thirdparty\Json.NET\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
- <Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -71,6 +70,7 @@ </Compile>
<Compile Include="TahoeBackend.cs" />
<Compile Include="Strings.cs" />
+ <None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Interface\Duplicati.Library.Interface.csproj">
diff --git a/Duplicati/Library/Backend/TahoeLAFS/TahoeBackend.cs b/Duplicati/Library/Backend/TahoeLAFS/TahoeBackend.cs index 082435ebd..666dbf507 100644 --- a/Duplicati/Library/Backend/TahoeLAFS/TahoeBackend.cs +++ b/Duplicati/Library/Backend/TahoeLAFS/TahoeBackend.cs @@ -111,7 +111,7 @@ namespace Duplicati.Library.Backend private System.Net.HttpWebRequest CreateRequest(string remotename, string queryparams)
{
- System.Net.HttpWebRequest req = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(m_url + (System.Web.HttpUtility.UrlEncode(remotename).Replace("+", "%20")) + (string.IsNullOrEmpty(queryparams) || queryparams.Trim().Length == 0 ? "" : "?" + queryparams));
+ System.Net.HttpWebRequest req = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(m_url + (Library.Utility.Uri.UrlEncode(remotename).Replace("+", "%20")) + (string.IsNullOrEmpty(queryparams) || queryparams.Trim().Length == 0 ? "" : "?" + queryparams));
req.KeepAlive = false;
req.UserAgent = "Duplicati Tahoe-LAFS Client v" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
diff --git a/Duplicati/Library/Backend/TahoeLAFS/packages.config b/Duplicati/Library/Backend/TahoeLAFS/packages.config new file mode 100644 index 000000000..2abc396bb --- /dev/null +++ b/Duplicati/Library/Backend/TahoeLAFS/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" /> +</packages>
\ 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 e183366aa..b2e4d5991 100644 --- a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj +++ b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj @@ -39,10 +39,6 @@ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Web" />
- <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/Library/Backend/WEBDAV/WEBDAV.cs b/Duplicati/Library/Backend/WEBDAV/WEBDAV.cs index ac5a36953..9d2d1e8db 100644 --- a/Duplicati/Library/Backend/WEBDAV/WEBDAV.cs +++ b/Duplicati/Library/Backend/WEBDAV/WEBDAV.cs @@ -100,7 +100,7 @@ namespace Duplicati.Library.Backend if (!m_path.EndsWith("/"))
m_path += "/";
- m_path = System.Web.HttpUtility.UrlDecode(m_path);
+ m_path = Library.Utility.Uri.UrlDecode(m_path);
m_rawurl = new Utility.Uri(m_useSSL ? "https" : "http", u.Host, m_path).ToString();
int port = u.Port;
@@ -168,7 +168,7 @@ namespace Duplicati.Library.Backend {
//IIS uses %20 for spaces and %2B for +
//Apache uses %20 for spaces and + for +
- string name = System.Web.HttpUtility.UrlDecode(n.InnerText.Replace("+", "%2B"));
+ string name = Library.Utility.Uri.UrlDecode(n.InnerText.Replace("+", "%2B"));
string cmp_path;
@@ -328,7 +328,7 @@ namespace Duplicati.Library.Backend private System.Net.HttpWebRequest CreateRequest(string remotename)
{
- System.Net.HttpWebRequest req = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(m_url + System.Web.HttpUtility.UrlEncode(remotename).Replace("+", "%20"));
+ System.Net.HttpWebRequest req = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(m_url + Library.Utility.Uri.UrlEncode(remotename).Replace("+", "%20"));
if (m_useIntegratedAuthentication)
{
req.UseDefaultCredentials = true;
|