Merge remote-tracking branch 'upstream/master' into gpg-update

12 files changed, 143 insertions, 92 deletions

diff --git a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj
index f5c9563ef..47f42addf 100644
--- a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj
+++ b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>

     <UpgradeBackupLocation />

     <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>

     <TargetFrameworkProfile />

     <UseMSBuildEngine>false</UseMSBuildEngine>

     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/Duplicati/CommandLine/BackendTester/app.config b/Duplicati/CommandLine/BackendTester/app.config
index d4c8ff83f..dd1b7be4b 100644
--- a/Duplicati/CommandLine/BackendTester/app.config
+++ b/Duplicati/CommandLine/BackendTester/app.config
@@ -1,29 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>

 <configuration>

+  <startup>

+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />

+  </startup>

   <runtime>

-    <loadFromRemoteSources enabled="true" />

     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

       <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />

+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />

       </dependentAssembly>

       <dependentAssembly>

         <assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />

+        <bindingRedirect oldVersion="0.0.0.0-3.0.4.0" newVersion="3.0.4.0" />

       </dependentAssembly>

       <dependentAssembly>

-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />

+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.2.0.0" />

       </dependentAssembly>

     </assemblyBinding>

   </runtime>

-  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>

 </configuration>

diff --git a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj
index bb77bbadc..af3ca4d8b 100644
--- a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj
+++ b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

@@ -9,7 +9,7 @@
     <RootNamespace>Duplicati.CommandLine.BackendTool</RootNamespace>

     <AssemblyName>Duplicati.CommandLine.BackendTool</AssemblyName>

     <AssemblyOriginatorKeyFile>..\Duplicati.snk</AssemblyOriginatorKeyFile>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>

     <TargetFrameworkProfile />

     <UseMSBuildEngine>false</UseMSBuildEngine>

     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/Duplicati/CommandLine/BackendTool/app.config b/Duplicati/CommandLine/BackendTool/app.config
index 1e3d7fb2e..8ce3e95a8 100644
--- a/Duplicati/CommandLine/BackendTool/app.config
+++ b/Duplicati/CommandLine/BackendTool/app.config
@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>

 <configuration>

-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>

-  <runtime>

-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

-      <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />

-      </dependentAssembly>

-    </assemblyBinding>

+  <startup>

+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />

+  </startup>  

+  <runtime>  

+       <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">  

+            <dependentAssembly>  

+                 <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />  

+                 <bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.2.0.0" />  

+            </dependentAssembly>  

+            <dependentAssembly>  

+                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />  

+                 <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />  

+            </dependentAssembly>  

+            <dependentAssembly>  

+                 <assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />  

+                 <bindingRedirect oldVersion="0.0.0.0-3.0.4.0" newVersion="3.0.4.0" />  

+            </dependentAssembly>  

+       </assemblyBinding>  

   </runtime>

 </configuration>

diff --git a/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj b/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj
index fac24af54..f1e88e434 100644
--- a/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj
+++ b/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Duplicati.CommandLine.ConfigurationImporter</RootNamespace>
     <AssemblyName>Duplicati.CommandLine.ConfigurationImporter</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -31,6 +32,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -51,6 +55,9 @@
       <Name>Duplicati.Server</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.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. 
          Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Duplicati/CommandLine/ConfigurationImporter/app.config b/Duplicati/CommandLine/ConfigurationImporter/app.config
new file mode 100644
index 000000000..5ab9ab477
--- /dev/null
+++ b/Duplicati/CommandLine/ConfigurationImporter/app.config
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
+  </startup>  
+  <runtime>  
+       <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">  
+            <dependentAssembly>  
+                 <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />  
+                 <bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.2.0.0" />
+            </dependentAssembly>  
+            <dependentAssembly>  
+                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />  
+                 <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />  
+            </dependentAssembly>  
+            <dependentAssembly>  
+                 <assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />  
+                 <bindingRedirect oldVersion="0.0.0.0-3.0.4.0" newVersion="3.0.4.0" />  
+            </dependentAssembly>  
+       </assemblyBinding>  
+  </runtime>
+</configuration>
diff --git a/Duplicati/CommandLine/Duplicati.CommandLine.csproj b/Duplicati/CommandLine/Duplicati.CommandLine.csproj
index ce68ac479..621485f26 100644
--- a/Duplicati/CommandLine/Duplicati.CommandLine.csproj
+++ b/Duplicati/CommandLine/Duplicati.CommandLine.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

@@ -16,7 +16,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>

     <UpgradeBackupLocation>

     </UpgradeBackupLocation>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>

     <TargetFrameworkProfile />

     <UseMSBuildEngine>false</UseMSBuildEngine>

     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

@@ -47,8 +47,36 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>

   </PropertyGroup>

   <ItemGroup>

+    <Reference Include="Microsoft.Azure.KeyVault.Core, Version=3.0.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <HintPath>..\..\packages\Microsoft.Azure.KeyVault.Core.3.0.4\lib\net461\Microsoft.Azure.KeyVault.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <HintPath>..\..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <HintPath>..\..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.Data.Services.Client, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <HintPath>..\..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.20\lib\net461\Microsoft.Rest.ClientRuntime.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.19\lib\net461\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>

+    </Reference>

+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

+      <HintPath>..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>

+    </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core" />

+    <Reference Include="System.Net" />

+    <Reference Include="System.Net.Http.WebRequest" />

+    <Reference Include="System.Runtime" />

+    <Reference Include="System.Runtime.Serialization" />

+    <Reference Include="System.Spatial, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <HintPath>..\..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll</HintPath>

+    </Reference>

   </ItemGroup>

   <ItemGroup>

     <Compile Include="Help.cs" />

@@ -95,10 +123,6 @@
       <Project>{0CA86ECF-5BEC-4909-B4F6-110A03B30B92}</Project>

       <Name>Duplicati.Library.DynamicLoader</Name>

     </ProjectReference>

-    <ProjectReference Include="..\Library\Encryption\Duplicati.Library.Encryption.csproj">

-      <Project>{94484FDB-2EFA-4CF0-9BE6-A561157B4F87}</Project>

-      <Name>Duplicati.Library.Encryption</Name>

-    </ProjectReference>

     <ProjectReference Include="..\Library\Interface\Duplicati.Library.Interface.csproj">

       <Project>{C5899F45-B0FF-483C-9D38-24A9FCAAB237}</Project>

       <Name>Duplicati.Library.Interface</Name>

@@ -217,6 +241,7 @@
       <SubType>Designer</SubType>

     </None>

     <None Include="Duplicati.snk" />

+    <None Include="packages.config" />

   </ItemGroup>

   <ItemGroup>

     <None Include="app.config" />

diff --git a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj
index bce802313..eecbcc15e 100644
--- a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj
+++ b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

@@ -9,9 +9,10 @@
     <RootNamespace>Duplicati.CommandLine.RecoveryTool</RootNamespace>

     <AssemblyName>Duplicati.CommandLine.RecoveryTool</AssemblyName>

     <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>

     <UseMSBuildEngine>false</UseMSBuildEngine>

     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

+    <TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

@@ -38,10 +39,23 @@
     <Externalconsole>true</Externalconsole>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" />

-    <Reference Include="Newtonsoft.Json">

-      <HintPath>..\..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

+    <Reference Include="Microsoft.Azure.KeyVault.Core, Version=3.0.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.3.0.4\lib\net461\Microsoft.Azure.KeyVault.Core.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.20\lib\net461\Microsoft.Rest.ClientRuntime.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.19\lib\net461\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>

     </Reference>

+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>

+    </Reference>

+    <Reference Include="System" />

+    <Reference Include="System.Net" />

+    <Reference Include="System.Net.Http.WebRequest" />

+    <Reference Include="System.Runtime" />

+    <Reference Include="System.Runtime.Serialization" />

   </ItemGroup>

   <ItemGroup>

     <Compile Include="Program.cs" />

@@ -131,10 +145,6 @@
       <Project>{0CA86ECF-5BEC-4909-B4F6-110A03B30B92}</Project>

       <Name>Duplicati.Library.DynamicLoader</Name>

     </ProjectReference>

-    <ProjectReference Include="..\..\Library\Encryption\Duplicati.Library.Encryption.csproj">

-      <Project>{94484FDB-2EFA-4CF0-9BE6-A561157B4F87}</Project>

-      <Name>Duplicati.Library.Encryption</Name>

-    </ProjectReference>

     <ProjectReference Include="..\..\Library\Interface\Duplicati.Library.Interface.csproj">

       <Project>{C5899F45-B0FF-483C-9D38-24A9FCAAB237}</Project>

       <Name>Duplicati.Library.Interface</Name>

diff --git a/Duplicati/CommandLine/RecoveryTool/app.config b/Duplicati/CommandLine/RecoveryTool/app.config
index f171dd7bb..dd1b7be4b 100644
--- a/Duplicati/CommandLine/RecoveryTool/app.config
+++ b/Duplicati/CommandLine/RecoveryTool/app.config
@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>

 <configuration>

+  <startup>

+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />

+  </startup>

   <runtime>

     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

       <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />

+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />

       </dependentAssembly>

       <dependentAssembly>

         <assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />

+        <bindingRedirect oldVersion="0.0.0.0-3.0.4.0" newVersion="3.0.4.0" />

       </dependentAssembly>

       <dependentAssembly>

-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />

+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.2.0.0" />

       </dependentAssembly>

     </assemblyBinding>

   </runtime>

-</configuration>
\ No newline at end of file
+</configuration>

diff --git a/Duplicati/CommandLine/RecoveryTool/packages.config b/Duplicati/CommandLine/RecoveryTool/packages.config
index ee51c2373..03d845d3b 100644
--- a/Duplicati/CommandLine/RecoveryTool/packages.config
+++ b/Duplicati/CommandLine/RecoveryTool/packages.config
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
+  <package id="Microsoft.Azure.KeyVault.Core" version="3.0.4" targetFramework="net462" />
+  <package id="Microsoft.Rest.ClientRuntime" version="2.3.20" targetFramework="net462" />
+  <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.19" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" />
 </packages>
\ No newline at end of file
diff --git a/Duplicati/CommandLine/app.config b/Duplicati/CommandLine/app.config
index 0a60cd6ff..1eab5a6e8 100644
--- a/Duplicati/CommandLine/app.config
+++ b/Duplicati/CommandLine/app.config
@@ -1,31 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>

 <configuration>

+  <startup useLegacyV2RuntimeActivationPolicy="true">

+      <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />

+  </startup>

   <runtime>

-    <loadFromRemoteSources enabled="true" />

     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

       <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />

+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />

       </dependentAssembly>

       <dependentAssembly>

         <assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />

+        <bindingRedirect oldVersion="0.0.0.0-3.0.4.0" newVersion="3.0.4.0" />

       </dependentAssembly>

       <dependentAssembly>

-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />

+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.2.0.0" />

       </dependentAssembly>

     </assemblyBinding>

   </runtime>

-  <startup useLegacyV2RuntimeActivationPolicy="true">

-      <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />

-  </startup>

 </configuration>

diff --git a/Duplicati/CommandLine/packages.config b/Duplicati/CommandLine/packages.config
new file mode 100644
index 000000000..bc2727bd9
--- /dev/null
+++ b/Duplicati/CommandLine/packages.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Azure.KeyVault.Core" version="3.0.4" targetFramework="net462" />
+  <package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net462" />
+  <package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net462" />
+  <package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net462" />
+  <package id="Microsoft.Rest.ClientRuntime" version="2.3.20" targetFramework="net462" />
+  <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.19" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" />
+  <package id="System.Spatial" version="5.8.4" targetFramework="net462" />
+</packages>
\ No newline at end of file