From 8c311a527aee8879d0114a7069b77768f51d3c8f Mon Sep 17 00:00:00 2001
From: Sam Khawase <sam.khawase@neofonie.de>
Date: Mon, 23 Mar 2015 13:47:36 +0100
Subject: [PATCH] Ported to .Net 4.6

---
 .../CShell.Completion.csproj                  |  3 +-
 Src/CShell.Completion/app.config              |  8 +++---
 Src/CShell.Core/CShell.Core.csproj            |  4 +--
 Src/CShell.Core/app.config                    |  8 +++---
 Src/CShell.Hosting/CShell.Hosting.csproj      |  3 +-
 Src/CShell.Hosting/app.config                 |  8 +++---
 Src/CShell/CShell.csproj                      |  4 +--
 Src/CShell/Properties/Resources.Designer.cs   |  2 +-
 Src/CShell/Properties/Settings.Designer.cs    |  4 +--
 Src/CShell/app.config                         | 28 +++++++++----------
 10 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/Src/CShell.Completion/CShell.Completion.csproj b/Src/CShell.Completion/CShell.Completion.csproj
index 266771d..51b3432 100644
--- a/Src/CShell.Completion/CShell.Completion.csproj
+++ b/Src/CShell.Completion/CShell.Completion.csproj
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CShell.Completion</RootNamespace>
     <AssemblyName>CShell.Completion</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Src/CShell.Completion/app.config b/Src/CShell.Completion/app.config
index 66e53f9..665d5ef 100644
--- a/Src/CShell.Completion/app.config
+++ b/Src/CShell.Completion/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
+        <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
diff --git a/Src/CShell.Core/CShell.Core.csproj b/Src/CShell.Core/CShell.Core.csproj
index 5810f80..8b657aa 100644
--- a/Src/CShell.Core/CShell.Core.csproj
+++ b/Src/CShell.Core/CShell.Core.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>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CShell</RootNamespace>
     <AssemblyName>CShell.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
diff --git a/Src/CShell.Core/app.config b/Src/CShell.Core/app.config
index 66e53f9..665d5ef 100644
--- a/Src/CShell.Core/app.config
+++ b/Src/CShell.Core/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
+        <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
diff --git a/Src/CShell.Hosting/CShell.Hosting.csproj b/Src/CShell.Hosting/CShell.Hosting.csproj
index ae4b409..699a8dd 100644
--- a/Src/CShell.Hosting/CShell.Hosting.csproj
+++ b/Src/CShell.Hosting/CShell.Hosting.csproj
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CShell.Hosting</RootNamespace>
     <AssemblyName>CShell.Hosting</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Src/CShell.Hosting/app.config b/Src/CShell.Hosting/app.config
index 66e53f9..665d5ef 100644
--- a/Src/CShell.Hosting/app.config
+++ b/Src/CShell.Hosting/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
+        <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
diff --git a/Src/CShell/CShell.csproj b/Src/CShell/CShell.csproj
index c6348ed..743bf63 100644
--- a/Src/CShell/CShell.csproj
+++ b/Src/CShell/CShell.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)' == '' ">x86</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CShell</RootNamespace>
     <AssemblyName>CShell</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
diff --git a/Src/CShell/Properties/Resources.Designer.cs b/Src/CShell/Properties/Resources.Designer.cs
index 2b0d262..fba6423 100644
--- a/Src/CShell/Properties/Resources.Designer.cs
+++ b/Src/CShell/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18052
+//     Runtime Version:4.0.30319.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/Src/CShell/Properties/Settings.Designer.cs b/Src/CShell/Properties/Settings.Designer.cs
index 93b4a32..b8fa4a8 100644
--- a/Src/CShell/Properties/Settings.Designer.cs
+++ b/Src/CShell/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18052
+//     Runtime Version:4.0.30319.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace CShell.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Src/CShell/app.config b/Src/CShell/app.config
index 8e33b52..2b824c8 100644
--- a/Src/CShell/app.config
+++ b/Src/CShell/app.config
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog" />
+    <section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog"/>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="CShell.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="CShell.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   
   <runtime>
     <!--enable loading older asseblies, see: http://blogs.msdn.com/b/shawnfa/archive/2009/06/08/more-implicit-uses-of-cas-policy-loadfromremotesources.aspx -->
-    <loadFromRemoteSources enabled="true" />
+    <loadFromRemoteSources enabled="true"/>
     
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="WPFToolkit.Extended" publicKeyToken="3e4669d2f30244f4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.8.0.0" newVersion="1.8.0.0" />
+        <assemblyIdentity name="WPFToolkit.Extended" publicKeyToken="3e4669d2f30244f4" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.8.0.0" newVersion="1.8.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Caliburn.Micro" publicKeyToken="8e5891231f2ed21f" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.4.0.0" newVersion="1.4.0.0" />
+        <assemblyIdentity name="Caliburn.Micro" publicKeyToken="8e5891231f2ed21f" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.4.0.0" newVersion="1.4.0.0"/>
       </dependentAssembly>
         <dependentAssembly>
     
-            <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
+            <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral"/>
     
-            <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
+            <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0"/>
     
         </dependentAssembly>
     
     </assemblyBinding>
   </runtime>
-  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>
+  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup>
   
   <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <targets>
-      <target name="file" xsi:type="File" layout="${level} ${longdate} ${logger} ${message} ${exception:format=tostring}" fileName="${basedir}/Logs/${shortdate}.log" keepFileOpen="false" />
+      <target name="file" xsi:type="File" layout="${level} ${longdate} ${logger} ${message} ${exception:format=tostring}" fileName="${basedir}/Logs/${shortdate}.log" keepFileOpen="false"/>
     </targets>
     <rules>
-      <logger name="*" minlevel="Warn" writeTo="file" />
+      <logger name="*" minlevel="Warn" writeTo="file"/>
     </rules>
   </nlog>
 
   <userSettings>
     <CShell.Properties.Settings>
       <setting name="LastWorkspace" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="OpenLastWorkspace" serializeAs="String">
         <value>True</value>