From 45f7063879d919fb4e57c1eecc7b55bb07467d8c Mon Sep 17 00:00:00 2001
From: John Lewin <lewin76@gmail.com>
Date: Wed, 21 Mar 2018 22:25:13 -0700
Subject: [PATCH] Upgrade framework to 4.7.1

---
 App.config                                               | 2 +-
 Community.CsharpSqlite/Community.CsharpSqlite.csproj     | 2 +-
 Community.CsharpSqlite/app.config                        | 2 +-
 Launcher/Launcher.csproj                                 | 2 +-
 Launcher/app.config                                      | 2 +-
 MatterControl.OpenGL/MatterControl.OpenGL.csproj         | 3 ++-
 MatterControl.Printing/MatterControl.Printing.csproj     | 9 ++-------
 MatterControl.Printing/packages.config                   | 4 ----
 MatterControl.csproj                                     | 5 +----
 PluginSystem/MatterControlPluginSystem.csproj            | 2 +-
 PrinterDriverInstaller/InfInstaller.csproj               | 2 +-
 PrinterDriverInstaller/app.config                        | 2 +-
 PrinterEmulator/App.config                               | 2 +-
 PrinterEmulator/PrinterEmulator.csproj                   | 2 +-
 Submodules/agg-sharp                                     | 2 +-
 .../MatterControl.AutomationTests.csproj                 | 5 +----
 Tests/MatterControl.AutomationTests/app.config           | 2 +-
 Tests/MatterControl.AutomationTests/packages.config      | 1 -
 Tests/MatterControl.Tests/MatterControl.Tests.csproj     | 5 +----
 Tests/MatterControl.Tests/app.config                     | 2 +-
 Tests/MatterControl.Tests/packages.config                | 1 -
 TextCreator/TextCreator.csproj                           | 2 +-
 TextCreator/app.config                                   | 2 +-
 packages.config                                          | 1 -
 24 files changed, 22 insertions(+), 42 deletions(-)
 delete mode 100644 MatterControl.Printing/packages.config

diff --git a/App.config b/App.config
index e8470174a..d772c4ab7 100644
--- a/App.config
+++ b/App.config
@@ -19,7 +19,7 @@
     </assemblyBinding>
   </runtime>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
   </startup>
   <system.net>
     <defaultProxy>
diff --git a/Community.CsharpSqlite/Community.CsharpSqlite.csproj b/Community.CsharpSqlite/Community.CsharpSqlite.csproj
index 6905bc31a..390d22a88 100644
--- a/Community.CsharpSqlite/Community.CsharpSqlite.csproj
+++ b/Community.CsharpSqlite/Community.CsharpSqlite.csproj
@@ -31,7 +31,7 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <ReleaseVersion>1.1.4</ReleaseVersion>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Community.CsharpSqlite/app.config b/Community.CsharpSqlite/app.config
index 60bef29cd..2372da9bb 100644
--- a/Community.CsharpSqlite/app.config
+++ b/Community.CsharpSqlite/app.config
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
   </startup>
 </configuration>
diff --git a/Launcher/Launcher.csproj b/Launcher/Launcher.csproj
index 65a0f7197..9e378886f 100644
--- a/Launcher/Launcher.csproj
+++ b/Launcher/Launcher.csproj
@@ -17,7 +17,7 @@
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
     <ReleaseVersion>0.8.2</ReleaseVersion>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Launcher/app.config b/Launcher/app.config
index fd3b41004..ba98fc967 100644
--- a/Launcher/app.config
+++ b/Launcher/app.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
   </startup>
 </configuration>
diff --git a/MatterControl.OpenGL/MatterControl.OpenGL.csproj b/MatterControl.OpenGL/MatterControl.OpenGL.csproj
index 35cdfd0c3..b6158b49e 100644
--- a/MatterControl.OpenGL/MatterControl.OpenGL.csproj
+++ b/MatterControl.OpenGL/MatterControl.OpenGL.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MatterControl.OpenGL</RootNamespace>
     <AssemblyName>MatterControl.OpenGL</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/MatterControl.Printing/MatterControl.Printing.csproj b/MatterControl.Printing/MatterControl.Printing.csproj
index 66078ac23..95fbd1fde 100644
--- a/MatterControl.Printing/MatterControl.Printing.csproj
+++ b/MatterControl.Printing/MatterControl.Printing.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MatterControl.Printing</RootNamespace>
     <AssemblyName>MatterControl.Printing</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,9 +37,6 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -72,8 +70,5 @@
       <Name>VectorMath</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/MatterControl.Printing/packages.config b/MatterControl.Printing/packages.config
deleted file mode 100644
index 61fc68c2c..000000000
--- a/MatterControl.Printing/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/MatterControl.csproj b/MatterControl.csproj
index 294e282cf..5197b4f5d 100644
--- a/MatterControl.csproj
+++ b/MatterControl.csproj
@@ -38,7 +38,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>
   </PropertyGroup>
@@ -512,9 +512,6 @@
     <Reference Include="System.Reactive.Windows.Threading, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
       <HintPath>packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
     </Reference>
-    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
diff --git a/PluginSystem/MatterControlPluginSystem.csproj b/PluginSystem/MatterControlPluginSystem.csproj
index 3796584db..24943b16b 100644
--- a/PluginSystem/MatterControlPluginSystem.csproj
+++ b/PluginSystem/MatterControlPluginSystem.csproj
@@ -16,7 +16,7 @@
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
     <ReleaseVersion>1.1.4</ReleaseVersion>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/PrinterDriverInstaller/InfInstaller.csproj b/PrinterDriverInstaller/InfInstaller.csproj
index 1fe6b437a..830d493f2 100644
--- a/PrinterDriverInstaller/InfInstaller.csproj
+++ b/PrinterDriverInstaller/InfInstaller.csproj
@@ -17,7 +17,7 @@
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
     <ReleaseVersion>1.1.4</ReleaseVersion>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/PrinterDriverInstaller/app.config b/PrinterDriverInstaller/app.config
index fd3b41004..ba98fc967 100644
--- a/PrinterDriverInstaller/app.config
+++ b/PrinterDriverInstaller/app.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
   </startup>
 </configuration>
diff --git a/PrinterEmulator/App.config b/PrinterEmulator/App.config
index bae5d6d81..8fc055122 100644
--- a/PrinterEmulator/App.config
+++ b/PrinterEmulator/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
     </startup>
 </configuration>
diff --git a/PrinterEmulator/PrinterEmulator.csproj b/PrinterEmulator/PrinterEmulator.csproj
index 44a649204..64628daf4 100644
--- a/PrinterEmulator/PrinterEmulator.csproj
+++ b/PrinterEmulator/PrinterEmulator.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MatterHackers.PrinterEmulator</RootNamespace>
     <AssemblyName>PrinterEmulator</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 93d318ca6..56dcc696d 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 93d318ca668ce0f629cd6937753d57327e75e6e7
+Subproject commit 56dcc696d8f1ab7ba9a411147eea39cb7b322305
diff --git a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj
index 434da32c0..3b2b63768 100644
--- a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj
+++ b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MatterControl.AutomationTests</RootNamespace>
     <AssemblyName>MatterControl.AutomationTests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -45,9 +45,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/Tests/MatterControl.AutomationTests/app.config b/Tests/MatterControl.AutomationTests/app.config
index 3a40510e5..30d764315 100644
--- a/Tests/MatterControl.AutomationTests/app.config
+++ b/Tests/MatterControl.AutomationTests/app.config
@@ -20,4 +20,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" /></startup></configuration>
diff --git a/Tests/MatterControl.AutomationTests/packages.config b/Tests/MatterControl.AutomationTests/packages.config
index 793757e9c..5e624b84e 100644
--- a/Tests/MatterControl.AutomationTests/packages.config
+++ b/Tests/MatterControl.AutomationTests/packages.config
@@ -3,5 +3,4 @@
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="NUnit" version="3.9.0" targetFramework="net461" />
   <package id="NUnit.ApplicationDomain" version="11.0.0" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Tests/MatterControl.Tests/MatterControl.Tests.csproj b/Tests/MatterControl.Tests/MatterControl.Tests.csproj
index 296054436..113db7954 100644
--- a/Tests/MatterControl.Tests/MatterControl.Tests.csproj
+++ b/Tests/MatterControl.Tests/MatterControl.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MatterControl.Tests</RootNamespace>
     <AssemblyName>MatterControl.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <TargetFrameworkProfile />
@@ -48,9 +48,6 @@
       <HintPath>..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
diff --git a/Tests/MatterControl.Tests/app.config b/Tests/MatterControl.Tests/app.config
index 9c86354c6..fba5e952c 100644
--- a/Tests/MatterControl.Tests/app.config
+++ b/Tests/MatterControl.Tests/app.config
@@ -16,4 +16,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" /></startup></configuration>
diff --git a/Tests/MatterControl.Tests/packages.config b/Tests/MatterControl.Tests/packages.config
index 63e748682..8fa8777d9 100644
--- a/Tests/MatterControl.Tests/packages.config
+++ b/Tests/MatterControl.Tests/packages.config
@@ -4,5 +4,4 @@
   <package id="NUnit" version="3.9.0" targetFramework="net461" />
   <package id="NUnit.ApplicationDomain" version="11.0.0" targetFramework="net461" />
   <package id="NUnit3TestAdapter" version="3.9.0" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/TextCreator/TextCreator.csproj b/TextCreator/TextCreator.csproj
index d96ddc983..c72ea5448 100644
--- a/TextCreator/TextCreator.csproj
+++ b/TextCreator/TextCreator.csproj
@@ -15,7 +15,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/TextCreator/app.config b/TextCreator/app.config
index 8d60bfa13..edc605d58 100644
--- a/TextCreator/app.config
+++ b/TextCreator/app.config
@@ -16,4 +16,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" /></startup></configuration>
diff --git a/packages.config b/packages.config
index 1679dbf39..5ed94f34f 100644
--- a/packages.config
+++ b/packages.config
@@ -8,6 +8,5 @@
   <package id="System.Reactive.Linq" version="3.1.1" targetFramework="net461" />
   <package id="System.Reactive.PlatformServices" version="3.1.1" targetFramework="net461" />
   <package id="System.Reactive.Windows.Threading" version="3.1.1" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
   <package id="Zeroconf" version="2.9.0" targetFramework="net461" />
 </packages>
\ No newline at end of file