diff options
| author | Dean Ferreyra <dean@octw.com> | 2021-11-09 07:19:22 +0300 |
|---|---|---|
| committer | Dean Ferreyra <dean@octw.com> | 2021-11-09 07:19:22 +0300 |
| commit | 423921d1c2529be9f6f8770767a7ab5f93710c23 (patch) | |
| tree | 6c16c524a2a500f67d3868d9935c0c715dc3af5b | |
| parent | 459d1f27f619e5f3c7ac4e012efa30f2f48b5aba (diff) | |
Revert "Change Duplicati.UnitTest project to get System.Net.Http from NuGet"
This reverts commit 2f5bb306bd3f4c2c05201ae76d0d72afa9b9a66b.
This was an experiment that was accidentally committed.
| -rw-r--r-- | Duplicati/UnitTest/Duplicati.UnitTest.csproj | 35 | ||||
| -rw-r--r-- | Duplicati/UnitTest/app.config | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | Duplicati/UnitTest/packages.config | 9 |
3 files changed, 2 insertions, 44 deletions
diff --git a/Duplicati/UnitTest/Duplicati.UnitTest.csproj b/Duplicati/UnitTest/Duplicati.UnitTest.csproj index 536e173a8..e0459ce24 100644 --- a/Duplicati/UnitTest/Duplicati.UnitTest.csproj +++ b/Duplicati/UnitTest/Duplicati.UnitTest.csproj @@ -40,44 +40,9 @@ <HintPath>..\..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
- <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Data" />
- <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <HintPath>..\..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
- <Private>True</Private>
- <Private>True</Private>
- </Reference>
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
- <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <HintPath>..\..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <HintPath>..\..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
- <Private>True</Private>
- <Private>True</Private>
- </Reference>
- <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
- <Private>True</Private>
- <Private>True</Private>
- </Reference>
- <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <HintPath>..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
- <Private>True</Private>
- <Private>True</Private>
- </Reference>
- <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
- <Private>True</Private>
- <Private>True</Private>
- </Reference>
- <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
- <Private>True</Private>
- <Private>True</Private>
- </Reference>
<Reference Include="System.Web" />
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/UnitTest/app.config b/Duplicati/UnitTest/app.config index 4866b7b0b..1ca2093f4 100644 --- a/Duplicati/UnitTest/app.config +++ b/Duplicati/UnitTest/app.config @@ -13,7 +13,7 @@ </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.1.1.3" />
+ <bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.2.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
diff --git a/Duplicati/UnitTest/packages.config b/Duplicati/UnitTest/packages.config index 814110de8..344223e2a 100755..100644 --- a/Duplicati/UnitTest/packages.config +++ b/Duplicati/UnitTest/packages.config @@ -1,11 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <packages> <package id="NUnit" version="3.12.0" targetFramework="net471" /> - <package id="System.IO" version="4.3.0" targetFramework="net471" /> - <package id="System.Net.Http" version="4.3.4" targetFramework="net471" /> - <package id="System.Runtime" version="4.3.0" targetFramework="net471" /> - <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net471" /> - <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net471" /> - <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net471" /> - <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net471" /> </packages> |