From b952d3496d4e40caa3136144ef118628746fb653 Mon Sep 17 00:00:00 2001
From: Cinder Biscuits <cinder@cinderblocks.biz>
Date: Sun, 3 Sep 2017 18:42:22 -0500
Subject: [PATCH] Bump .NET projects up to 4.6.1 to consume our new Standard
 2.0 projects

---
 LibreMetaverse.GUI/LibreMetaverse.GUI.csproj       |  2 +-
 LibreMetaverse.GUI/MiniMap.cs                      |  2 +-
 .../LibreMetaverse.Rendering.Simple.csproj         | 10 ----------
 LibreMetaverse.Tests/LibreMetaverse.Tests.csproj   | 14 --------------
 Programs/Baker/Baker.csproj                        |  2 +-
 Programs/Baker/frmBaker.cs                         |  2 +-
 Programs/GridProxy/GridProxy.csproj                | 10 ----------
 Programs/GridProxy/GridProxyApp.csproj             |  2 +-
 Programs/WinGridProxy/WinGridProxy.csproj          |  2 +-
 Programs/examples/PacketDump/PacketDump.csproj     |  6 ------
 10 files changed, 6 insertions(+), 46 deletions(-)

diff --git a/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj b/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj
index 7af90610..c290cb33 100644
--- a/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj
+++ b/LibreMetaverse.GUI/LibreMetaverse.GUI.csproj
@@ -10,7 +10,7 @@
     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <OutputType>Library</OutputType>
     <RootNamespace>LibreMetaverse.GUI</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/LibreMetaverse.GUI/MiniMap.cs b/LibreMetaverse.GUI/MiniMap.cs
index f385758a..3b3e0e1c 100644
--- a/LibreMetaverse.GUI/MiniMap.cs
+++ b/LibreMetaverse.GUI/MiniMap.cs
@@ -26,7 +26,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
+using System.DrawingCore;
 using System.Windows.Forms;
 using OpenMetaverse.Imaging;
 using OpenMetaverse.Assets;
diff --git a/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj b/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj
index 67b5e7d1..b28417dd 100644
--- a/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj
+++ b/LibreMetaverse.Rendering.Simple/LibreMetaverse.Rendering.Simple.csproj
@@ -49,16 +49,6 @@
     <NoWarn>1591,1574,0419</NoWarn>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System">
-      <Name>System</Name>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LibreMetaverseTypes\LibreMetaverse.Types.csproj" />
     <ProjectReference Include="..\LibreMetaverse\LibreMetaverse.csproj" />
diff --git a/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj b/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj
index bb708b63..0b697665 100644
--- a/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj
+++ b/LibreMetaverse.Tests/LibreMetaverse.Tests.csproj
@@ -53,20 +53,6 @@
     <NoWarn>1591,1574,0419</NoWarn>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System">
-      <Name>System</Name>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.Xml</Name>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.8.1" />
     <PackageReference Include="NUnit.ConsoleRunner" Version="3.7.0" />
diff --git a/Programs/Baker/Baker.csproj b/Programs/Baker/Baker.csproj
index 2cfd9894..e1f17687 100644
--- a/Programs/Baker/Baker.csproj
+++ b/Programs/Baker/Baker.csproj
@@ -10,7 +10,7 @@
 	  <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
 	  <DefaultTargetSchema>IE50</DefaultTargetSchema>
 	  <DelaySign>false</DelaySign>
-	  <TargetFramework>netstandard2.0</TargetFramework>
+	  <TargetFramework>net461</TargetFramework>
 	  <OutputType>WinExe</OutputType>
 	  <AppDesignerFolder></AppDesignerFolder>
 	  <RootNamespace>Baker</RootNamespace>
diff --git a/Programs/Baker/frmBaker.cs b/Programs/Baker/frmBaker.cs
index 7e167da9..2dcb5204 100644
--- a/Programs/Baker/frmBaker.cs
+++ b/Programs/Baker/frmBaker.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Drawing;
+using System.DrawingCore;
 using System.Windows.Forms;
 using System.IO;
 using OpenMetaverse.Imaging;
diff --git a/Programs/GridProxy/GridProxy.csproj b/Programs/GridProxy/GridProxy.csproj
index 25e3e7c6..29596ee7 100644
--- a/Programs/GridProxy/GridProxy.csproj
+++ b/Programs/GridProxy/GridProxy.csproj
@@ -49,16 +49,6 @@
     <NoWarn>1591,1574,0419</NoWarn>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System">
-      <Name>System</Name>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.Xml</Name>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="XmlRpcCS" Version="2.1.1.2" />
diff --git a/Programs/GridProxy/GridProxyApp.csproj b/Programs/GridProxy/GridProxyApp.csproj
index c3011be8..a655771a 100644
--- a/Programs/GridProxy/GridProxyApp.csproj
+++ b/Programs/GridProxy/GridProxyApp.csproj
@@ -12,7 +12,7 @@
 	  <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
 	  <DefaultTargetSchema>IE50</DefaultTargetSchema>
 	  <DelaySign>false</DelaySign>
-	  <TargetFramework>netstandard2.0</TargetFramework>
+	  <TargetFramework>net461</TargetFramework>
 	  <OutputType>Exe</OutputType>
 	  <RootNamespace>GridProxyApp</RootNamespace>
 	  <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/Programs/WinGridProxy/WinGridProxy.csproj b/Programs/WinGridProxy/WinGridProxy.csproj
index 88bf8169..21baf0cf 100644
--- a/Programs/WinGridProxy/WinGridProxy.csproj
+++ b/Programs/WinGridProxy/WinGridProxy.csproj
@@ -10,7 +10,7 @@
     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <OutputType>WinExe</OutputType>
     <RootNamespace>WinGridProxy</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/Programs/examples/PacketDump/PacketDump.csproj b/Programs/examples/PacketDump/PacketDump.csproj
index 9604db1d..05b03936 100644
--- a/Programs/examples/PacketDump/PacketDump.csproj
+++ b/Programs/examples/PacketDump/PacketDump.csproj
@@ -55,12 +55,6 @@
 	  <NoWarn>1591,1574,0419</NoWarn>
 	  <PlatformTarget>AnyCPU</PlatformTarget>
 	</PropertyGroup>
-	<ItemGroup>
-	  <Reference Include="System">
-		  <Name>System</Name>
-		<Private>False</Private>
-	  </Reference>
-	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\..\..\LibreMetaverseTypes\LibreMetaverse.Types.csproj" />
 	  <ProjectReference Include="..\..\..\LibreMetaverse\LibreMetaverse.csproj" />