From 446bd0111ca8f1fc223592ab0daea3e48b19cdb3 Mon Sep 17 00:00:00 2001
From: Pilzinsel64 <pilzinsel64@gmx.de>
Date: Tue, 7 Jun 2022 12:47:34 +0200
Subject: [PATCH] upgrade to .net6 part 1

---
 .../Camera/Camera.vb                             |  2 ++
 .../Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj  | 16 ++++++----------
 .../Preview/ModelPreview.vb                      | 10 +++++-----
 Pilz.Drawing/Pilz.Drawing.vbproj                 |  3 ++-
 Pilz.Networking/Pilz.Networking.vbproj           |  2 +-
 Pilz.Threading/Pilz.Threading.vbproj             |  7 +++----
 Pilz.UI/Pilz.UI.vbproj                           | 10 +++-------
 Pilz.Win32/Pilz.Win32.vbproj                     |  3 ++-
 8 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/Pilz.Drawing.Drawing3D.OpenGLRenderer/Camera/Camera.vb b/Pilz.Drawing.Drawing3D.OpenGLRenderer/Camera/Camera.vb
index e0e25e7..8d56858 100644
--- a/Pilz.Drawing.Drawing3D.OpenGLRenderer/Camera/Camera.vb
+++ b/Pilz.Drawing.Drawing3D.OpenGLRenderer/Camera/Camera.vb
@@ -1,5 +1,7 @@
 Imports System.Windows.Forms
+
 Imports OpenTK
+Imports OpenTK.Mathematics
 
 Namespace CameraN
 
diff --git a/Pilz.Drawing.Drawing3D.OpenGLRenderer/Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj b/Pilz.Drawing.Drawing3D.OpenGLRenderer/Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj
index ce4505e..824d796 100644
--- a/Pilz.Drawing.Drawing3D.OpenGLRenderer/Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj
+++ b/Pilz.Drawing.Drawing3D.OpenGLRenderer/Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj
@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <MyType>Windows</MyType>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DocumentationFile>Pilz.Drawing.Drawing3D.OpenGLFactory.xml</DocumentationFile>
     <DefineTrace>true</DefineTrace>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DefineDebug>true</DefineDebug>
@@ -25,18 +26,15 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="OpenTK.Input" Version="4.7.2" />
+    <PackageReference Include="OpenTK.WinForms" Version="4.0.0-pre.6" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="OpenTK" Version="3.2" />
-    <PackageReference Include="OpenTK.GLControl" Version="3.1.0" />
+    <PackageReference Include="OpenTK" Version="4.7.2" />
     <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 +50,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.Drawing3D.OpenGLRenderer/Preview/ModelPreview.vb b/Pilz.Drawing.Drawing3D.OpenGLRenderer/Preview/ModelPreview.vb
index a973f11..0ed57ac 100644
--- a/Pilz.Drawing.Drawing3D.OpenGLRenderer/Preview/ModelPreview.vb
+++ b/Pilz.Drawing.Drawing3D.OpenGLRenderer/Preview/ModelPreview.vb
@@ -6,10 +6,11 @@ Imports OpenTK
 Imports OpenTK.Graphics.OpenGL
 Imports Pilz.S3DFileParser
 Imports Point = System.Drawing.Point
-Imports KeyboardState = OpenTK.Input.KeyboardState
-Imports Keyboard = OpenTK.Input.Keyboard
-Imports Key = OpenTK.Input.Key
 Imports Color = System.Drawing.Color
+Imports OpenTK.Mathematics
+Imports OpenTK.WinForms
+Imports OpenTK.Input
+Imports OpenTK.Windowing.GraphicsLibraryFramework
 
 Namespace PreviewN
 
@@ -132,7 +133,6 @@ Namespace PreviewN
             Me.glControl1.Size = Me.ClientSize
             Me.glControl1.TabIndex = 0
             Me.glControl1.TabStop = False
-            Me.glControl1.VSync = False
             Me.Controls.Add(Me.glControl1)
             Me.ResumeLayout(False)
 
@@ -247,7 +247,7 @@ Namespace PreviewN
         End Sub
 
         Private Sub glControl1_Resize(sender As Object, e As EventArgs) Handles glControl1.Resize
-            glControl1.Context.Update(glControl1.WindowInfo)
+            'glControl1.Context.Update(glControl1.WindowInfo)
             GL.Viewport(0, 0, glControl1.Width, glControl1.Height)
             ProjMatrix = Matrix4.CreatePerspectiveFieldOfView(FOV, glControl1.Width / glControl1.Height, 100.0F, 100000.0F)
             glControl1.Invalidate()
diff --git a/Pilz.Drawing/Pilz.Drawing.vbproj b/Pilz.Drawing/Pilz.Drawing.vbproj
index 0e80179..3166199 100644
--- a/Pilz.Drawing/Pilz.Drawing.vbproj
+++ b/Pilz.Drawing/Pilz.Drawing.vbproj
@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <MyType>Windows</MyType>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DocumentationFile>Pilz.Drawing.xml</DocumentationFile>
     <DefineTrace>true</DefineTrace>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DefineDebug>true</DefineDebug>
diff --git a/Pilz.Networking/Pilz.Networking.vbproj b/Pilz.Networking/Pilz.Networking.vbproj
index a0904db..433a80d 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>net6.0-windows</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..bb39b3f 100644
--- a/Pilz.Threading/Pilz.Threading.vbproj
+++ b/Pilz.Threading/Pilz.Threading.vbproj
@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <MyType>Windows</MyType>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DocumentationFile>Pilz.Threading.xml</DocumentationFile>
     <DefineTrace>true</DefineTrace>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DefineDebug>true</DefineDebug>
@@ -35,12 +36,10 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
     <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..36556b9 100644
--- a/Pilz.UI/Pilz.UI.vbproj
+++ b/Pilz.UI/Pilz.UI.vbproj
@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <MyType>Windows</MyType>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DocumentationFile>Pilz.UI.xml</DocumentationFile>
     <DefineTrace>true</DefineTrace>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DefineDebug>true</DefineDebug>
@@ -43,9 +44,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" />
@@ -58,9 +56,7 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Update="PaintingControl\PaintingControl.vb">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Update="PaintingControl\PaintingControl.vb" />
     <Compile Update="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>
diff --git a/Pilz.Win32/Pilz.Win32.vbproj b/Pilz.Win32/Pilz.Win32.vbproj
index cab3346..65bf85a 100644
--- a/Pilz.Win32/Pilz.Win32.vbproj
+++ b/Pilz.Win32/Pilz.Win32.vbproj
@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <MyType>Windows</MyType>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DocumentationFile>Pilz.Win32.xml</DocumentationFile>
     <DefineTrace>true</DefineTrace>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DefineDebug>true</DefineDebug>