From 417632b460cb01fe8879da7bb7e5f10b5db708c2 Mon Sep 17 00:00:00 2001
From: Pilzinsel64 <pilzinsel64@gmx.de>
Date: Thu, 19 Nov 2020 14:49:04 +0100
Subject: [PATCH] update projects to .NET 5 (Win7) & update OpenTK to latest
 Version to support .NET 5 (missing OpenTK.GLControl)

---
 .../Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj      | 12 +++---------
 Pilz.Drawing/Pilz.Drawing.vbproj                     |  2 +-
 Pilz.Networking/Pilz.Networking.vbproj               |  2 +-
 Pilz.Threading/Pilz.Threading.vbproj                 |  5 +----
 Pilz.UI/Pilz.UI.vbproj                               |  5 +----
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/Pilz.Drawing.Drawing3D.OpenGLRenderer/Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj b/Pilz.Drawing.Drawing3D.OpenGLRenderer/Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj
index ce4505e..300d770 100644
--- a/Pilz.Drawing.Drawing3D.OpenGLRenderer/Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj
+++ b/Pilz.Drawing.Drawing3D.OpenGLRenderer/Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <MyType>Windows</MyType>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net5.0-windows7.0</TargetFramework>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DocumentationFile>Pilz.Drawing.Drawing3D.OpenGLFactory.xml</DocumentationFile>
     <DefineTrace>true</DefineTrace>
@@ -29,14 +29,10 @@
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="OpenTK" Version="3.2" />
+    <PackageReference Include="OpenTK" Version="4.2.0" />
     <PackageReference Include="OpenTK.GLControl" Version="3.1.0" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
   <ItemGroup>
     <Import Include="Microsoft.VisualBasic" />
     <Import Include="System" />
@@ -52,9 +48,7 @@
     <Compile Update="Preview\ModelPreview.Designer.vb">
       <DependentUpon>ModelPreview.vb</DependentUpon>
     </Compile>
-    <Compile Update="Preview\ModelPreview.vb">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Update="Preview\ModelPreview.vb" />
     <Compile Update="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>
diff --git a/Pilz.Drawing/Pilz.Drawing.vbproj b/Pilz.Drawing/Pilz.Drawing.vbproj
index 0e80179..a57866f 100644
--- a/Pilz.Drawing/Pilz.Drawing.vbproj
+++ b/Pilz.Drawing/Pilz.Drawing.vbproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <MyType>Windows</MyType>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net5.0-windows7.0</TargetFramework>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DocumentationFile>Pilz.Drawing.xml</DocumentationFile>
     <DefineTrace>true</DefineTrace>
diff --git a/Pilz.Networking/Pilz.Networking.vbproj b/Pilz.Networking/Pilz.Networking.vbproj
index a0904db..284b218 100644
--- a/Pilz.Networking/Pilz.Networking.vbproj
+++ b/Pilz.Networking/Pilz.Networking.vbproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <MyType>Windows</MyType>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net5.0-windows7.0</TargetFramework>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DocumentationFile>Pilz.Networking.xml</DocumentationFile>
     <DefineTrace>true</DefineTrace>
diff --git a/Pilz.Threading/Pilz.Threading.vbproj b/Pilz.Threading/Pilz.Threading.vbproj
index 16c2449..b65cc8a 100644
--- a/Pilz.Threading/Pilz.Threading.vbproj
+++ b/Pilz.Threading/Pilz.Threading.vbproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <MyType>Windows</MyType>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net5.0-windows7.0</TargetFramework>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DocumentationFile>Pilz.Threading.xml</DocumentationFile>
     <DefineTrace>true</DefineTrace>
@@ -38,9 +38,6 @@
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
   <ItemGroup>
     <Import Include="Microsoft.VisualBasic" />
     <Import Include="System" />
diff --git a/Pilz.UI/Pilz.UI.vbproj b/Pilz.UI/Pilz.UI.vbproj
index 67cea06..8f56044 100644
--- a/Pilz.UI/Pilz.UI.vbproj
+++ b/Pilz.UI/Pilz.UI.vbproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <MyType>Windows</MyType>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net5.0-windows7.0</TargetFramework>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DocumentationFile>Pilz.UI.xml</DocumentationFile>
     <DefineTrace>true</DefineTrace>
@@ -43,9 +43,6 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
   <ItemGroup>
     <Import Include="Microsoft.VisualBasic" />
     <Import Include="System" />