initial upgrade to framework 4.6.2

- no code changes except those noted below
- projects upgrade to 4.6.2
- wixinstaller project upgraded automatically by VisualStudio
- wixinstaller updated to require 4.6.2
- Library.Encryption changed to Standard2.0 so accommodate update to SharpAesCrypt

4 files changed, 42 insertions, 34 deletions

diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
index 719de37c4..fb8321e00 100644
--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.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="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

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

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

@@ -25,7 +25,7 @@
     <UseApplicationTrust>false</UseApplicationTrust>

     <BootstrapperEnabled>true</BootstrapperEnabled>

     <ApplicationIcon>Duplicati.ico</ApplicationIcon>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>

     <TargetFrameworkProfile />

     <UseMSBuildEngine>false</UseMSBuildEngine>

     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

@@ -67,6 +67,12 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>

   </PropertyGroup>

   <ItemGroup>

+    <Reference Include="CoCoL, Version=1.5.0.19417, Culture=neutral, PublicKeyToken=0983de3c914beeaa, processorArchitecture=MSIL">

+      <HintPath>..\..\..\packages\CoCoL.1.6.1\lib\net45\CoCoL.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="Microsoft.CSharp" />

@@ -98,12 +104,6 @@
       <Private>False</Private>

     </Reference>

     <Reference Include="System.Drawing" />

-    <Reference Include="Newtonsoft.Json">

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

-    </Reference>

-    <Reference Include="CoCoL">

-      <HintPath>..\..\..\packages\CoCoL.1.5.1\lib\net45\CoCoL.dll</HintPath>

-    </Reference>

   </ItemGroup>

   <ItemGroup>

     <Compile Include="IBrowserWindow.cs" />

@@ -114,6 +114,7 @@
     <None Include="app.config" />

     <None Include="app.manifest" />

     <None Include="Duplicati.snk" />

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

     <None Include="Properties\Settings.settings">

       <Generator>SettingsSingleFileGenerator</Generator>

       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

@@ -153,11 +154,10 @@
     <EmbeddedResource Include="Resources\context_menu_pause.ico" />

     <EmbeddedResource Include="Resources\context_menu_play.ico" />

     <EmbeddedResource Include="Resources\context_menu_quit.ico" />

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

   </ItemGroup>

   <ItemGroup>

     <ProjectReference Include="..\..\CommandLine\ConfigurationImporter\Duplicati.CommandLine.ConfigurationImporter.csproj">

-      <Project>{7b1c019b-c4aa-4480-a259-790e125b36ce}</Project>

+      <Project>{b93e3bf0-daa7-49b7-b07d-0559c5816735}</Project>

       <Name>Duplicati.CommandLine.ConfigurationImporter</Name>

     </ProjectReference>

     <ProjectReference Include="..\..\Library\Backend\CloudFiles\Duplicati.Library.Backend.CloudFiles.csproj">

@@ -248,10 +248,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\Logging\Duplicati.Library.Logging.csproj">

       <Project>{D10A5FC0-11B4-4E70-86AA-8AEA52BD9798}</Project>

       <Name>Duplicati.Library.Logging</Name>

@@ -430,4 +426,12 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

   </ItemGroup>

-</Project>

+  <PropertyGroup>

+    <PreBuildEvent>

+    </PreBuildEvent>

+  </PropertyGroup>

+  <PropertyGroup>

+    <PostBuildEvent>

+    </PostBuildEvent>

+  </PropertyGroup>

+</Project>
\ No newline at end of file
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Properties/Settings.Designer.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Properties/Settings.Designer.cs
index 828ce2482..51a68537e 100644
--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Properties/Settings.Designer.cs
+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Properties/Settings.Designer.cs
@@ -1,28 +1,24 @@
 //------------------------------------------------------------------------------

 // <auto-generated>

 //     This code was generated by a tool.

-//     Runtime Version:4.0.30319.225

+//     Runtime Version:4.0.30319.42000

 //

 //     Changes to this file may cause incorrect behavior and will be lost if

 //     the code is regenerated.

 // </auto-generated>

 //------------------------------------------------------------------------------

 

-namespace Duplicati.GUI.TrayIcon.Properties

-{

-

-

+namespace Duplicati.GUI.TrayIcon.Properties {

+    

+    

     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]

-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase

-    {

-

+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.1.0.0")]

+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {

+        

         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

-

-        public static Settings Default

-        {

-            get

-            {

+        

+        public static Settings Default {

+            get {

                 return defaultInstance;

             }

         }

diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/app.config b/Duplicati/GUI/Duplicati.GUI.TrayIcon/app.config
index 88f9892a3..091fd1a71 100644
--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/app.config
+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/app.config
@@ -17,13 +17,21 @@
       </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" />

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

+      </dependentAssembly>

+      <dependentAssembly>

+        <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />

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

+      </dependentAssembly>

+      <dependentAssembly>

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

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

       </dependentAssembly>

     </assemblyBinding>

   </runtime>

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

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

 </configuration>

diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/packages.config b/Duplicati/GUI/Duplicati.GUI.TrayIcon/packages.config
index 040b8a7cf..54fa558e1 100644
--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/packages.config
+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CoCoL" version="1.5.1" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
+  <package id="CoCoL" version="1.6.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
 </packages>
\ No newline at end of file