Merge pull request #296 from FUSEEProjectTeam/feature/OpenTK4

Feature/OpenTK4
FUSEEProjectTeam · Apr 16, 2021 · 8c3a93a · 8c3a93a
2 parents 7eacaad + 9ce7197
commit 8c3a93a
Show file tree

Hide file tree

Showing 55 changed files with 213 additions and 550 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -37,9 +37,8 @@
     <!--
     Suppress warnings
     1701 and 1702 is standard.
-    NU1701: Package restore of OpenTK 3.1 with net462 - remove after update to OpenTK 4
     -->
-    <NoWarn>1701;1702;NU1701</NoWarn>
+    <NoWarn>1701;1702</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Examples/Complete/AdvancedUI/Android/Fusee.Examples.AdvancedUI.Android.csproj b/Examples/Complete/AdvancedUI/Android/Fusee.Examples.AdvancedUI.Android.csproj
@@ -57,7 +57,7 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="System" />
-    <PackageReference Include="protobuf-net" Version="3.0.62" />
+    <PackageReference Include="protobuf-net" Version="3.0.101" />
   </ItemGroup>
   <!-- Fusee References -->
   <ItemGroup>

diff --git a/Examples/Complete/AdvancedUI/Desktop/Fusee.Examples.AdvancedUI.Desktop.csproj b/Examples/Complete/AdvancedUI/Desktop/Fusee.Examples.AdvancedUI.Desktop.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
     <ProjectReference Include="..\Core\Fusee.Examples.AdvancedUI.Core.csproj" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 </Project>
diff --git a/Examples/Complete/BoneAnimation/Android/Fusee.Examples.Bone.Android.csproj b/Examples/Complete/BoneAnimation/Android/Fusee.Examples.Bone.Android.csproj
@@ -55,7 +55,7 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="System" />
-    <PackageReference Include="protobuf-net" Version="3.0.62" />
+    <PackageReference Include="protobuf-net" Version="3.0.101" />
   </ItemGroup>
   <!-- Fusee References -->
   <ItemGroup>

diff --git a/Examples/Complete/BoneAnimation/Desktop/Fusee.Examples.Bone.Desktop.csproj b/Examples/Complete/BoneAnimation/Desktop/Fusee.Examples.Bone.Desktop.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
     <ProjectReference Include="..\Core\Fusee.Examples.Bone.Core.csproj" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 </Project>
diff --git a/Examples/Complete/Camera/Android/Fusee.Examples.Camera.Android.csproj b/Examples/Complete/Camera/Android/Fusee.Examples.Camera.Android.csproj
@@ -59,7 +59,7 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="System" />
-    <PackageReference Include="protobuf-net" Version="3.0.62" />
+    <PackageReference Include="protobuf-net" Version="3.0.101" />
   </ItemGroup>
   <!-- Fusee References -->
   <ItemGroup>

diff --git a/Examples/Complete/Camera/Desktop/Fusee.Examples.Camera.Desktop.csproj b/Examples/Complete/Camera/Desktop/Fusee.Examples.Camera.Desktop.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
     <ProjectReference Include="..\Core\Fusee.Examples.Camera.Core.csproj" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 </Project>
diff --git a/Examples/Complete/GeometryEditing/Android/Fusee.Examples.GeometryEditing.Android.csproj b/Examples/Complete/GeometryEditing/Android/Fusee.Examples.GeometryEditing.Android.csproj
@@ -55,7 +55,7 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="System" />
-    <PackageReference Include="protobuf-net" Version="3.0.62" />
+    <PackageReference Include="protobuf-net" Version="3.0.101" />
   </ItemGroup>
   <!-- Fusee References -->
   <ItemGroup>

diff --git a/Examples/Complete/GeometryEditing/Desktop/Fusee.Examples.GeometryEditing.Desktop.csproj b/Examples/Complete/GeometryEditing/Desktop/Fusee.Examples.GeometryEditing.Desktop.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
     <ProjectReference Include="..\Core\Fusee.Examples.GeometryEditing.Core.csproj" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 </Project>
diff --git a/Examples/Complete/Materials/Android/Fusee.Examples.Materials.Android.csproj b/Examples/Complete/Materials/Android/Fusee.Examples.Materials.Android.csproj
@@ -55,7 +55,7 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="System" />
-    <PackageReference Include="protobuf-net" Version="3.0.62" />
+    <PackageReference Include="protobuf-net" Version="3.0.101" />
   </ItemGroup>
   <!-- Fusee References -->
   <ItemGroup>

diff --git a/Examples/Complete/Materials/Desktop/Fusee.Examples.Materials.Desktop.csproj b/Examples/Complete/Materials/Desktop/Fusee.Examples.Materials.Desktop.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
     <ProjectReference Include="..\Core\Fusee.Examples.Materials.Core.csproj" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 </Project>
diff --git a/Examples/Complete/MeshingAround/Android/Fusee.Examples.MeshingAround.Android.csproj b/Examples/Complete/MeshingAround/Android/Fusee.Examples.MeshingAround.Android.csproj
@@ -55,7 +55,7 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="System" />
-    <PackageReference Include="protobuf-net" Version="3.0.62" />
+    <PackageReference Include="protobuf-net" Version="3.0.101" />
   </ItemGroup>
   <!-- Fusee References -->
   <ItemGroup>

diff --git a/Examples/Complete/MeshingAround/Desktop/Fusee.Examples.MeshingAround.Desktop.csproj b/Examples/Complete/MeshingAround/Desktop/Fusee.Examples.MeshingAround.Desktop.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
     <ProjectReference Include="..\Core\Fusee.Examples.MeshingAround.Core.csproj" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 </Project>
diff --git a/Examples/Complete/NormalMap/Android/Fusee.Examples.NormalMap.Android.csproj b/Examples/Complete/NormalMap/Android/Fusee.Examples.NormalMap.Android.csproj
@@ -60,7 +60,7 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="System" />
-    <PackageReference Include="protobuf-net" Version="3.0.62" />
+    <PackageReference Include="protobuf-net" Version="3.0.101" />
   </ItemGroup>
   <!-- Fusee References -->
   <ItemGroup>

diff --git a/Examples/Complete/NormalMap/Desktop/Fusee.Examples.NormalMap.Desktop.csproj b/Examples/Complete/NormalMap/Desktop/Fusee.Examples.NormalMap.Desktop.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
     <ProjectReference Include="..\Core\Fusee.Examples.NormalMap.Core.csproj" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 </Project>
diff --git a/Examples/Complete/Picking/Android/Fusee.Examples.Picking.Android.csproj b/Examples/Complete/Picking/Android/Fusee.Examples.Picking.Android.csproj
@@ -55,7 +55,7 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="System" />
-    <PackageReference Include="protobuf-net" Version="3.0.62" />
+    <PackageReference Include="protobuf-net" Version="3.0.101" />
   </ItemGroup>
   <!-- Fusee References -->
   <ItemGroup>

diff --git a/Examples/Complete/Picking/Desktop/Fusee.Examples.Picking.Desktop.csproj b/Examples/Complete/Picking/Desktop/Fusee.Examples.Picking.Desktop.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
     <ProjectReference Include="..\Core\Fusee.Examples.Picking.Core.csproj" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 </Project>
diff --git a/Examples/Complete/RenderLayer/Android/Fusee.Examples.RenderLayer.Android.csproj b/Examples/Complete/RenderLayer/Android/Fusee.Examples.RenderLayer.Android.csproj
@@ -55,7 +55,7 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="System" />
-    <PackageReference Include="protobuf-net" Version="3.0.62" />
+    <PackageReference Include="protobuf-net" Version="3.0.101" />
   </ItemGroup>
   <!-- Fusee References -->
   <ItemGroup>

diff --git a/Examples/Complete/RenderLayer/Desktop/Fusee.Examples.RenderLayer.Desktop.csproj b/Examples/Complete/RenderLayer/Desktop/Fusee.Examples.RenderLayer.Desktop.csproj
@@ -9,6 +9,6 @@
 		<ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
 		<ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
 		<ProjectReference Include="..\Core\Fusee.Examples.RenderLayer.Core.csproj" />
-		<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+		<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
 	</ItemGroup>
 </Project>
diff --git a/Examples/Complete/Simple/Android/Fusee.Examples.Simple.Android.csproj b/Examples/Complete/Simple/Android/Fusee.Examples.Simple.Android.csproj
@@ -55,7 +55,7 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="System" />
-    <PackageReference Include="protobuf-net" Version="3.0.62" />
+    <PackageReference Include="protobuf-net" Version="3.0.101" />
   </ItemGroup>
   <!-- Fusee References -->
   <ItemGroup>

diff --git a/Examples/Complete/Simple/Desktop/Fusee.Examples.Simple.Desktop.csproj b/Examples/Complete/Simple/Desktop/Fusee.Examples.Simple.Desktop.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
     <ProjectReference Include="..\Core\Fusee.Examples.Simple.Core.csproj" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 </Project>
diff --git a/Examples/Complete/SimpleDeferred/Android/Fusee.Examples.SimpleDeferred.Android.csproj b/Examples/Complete/SimpleDeferred/Android/Fusee.Examples.SimpleDeferred.Android.csproj
@@ -59,7 +59,7 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="System" />
-    <PackageReference Include="protobuf-net" Version="3.0.62" />
+    <PackageReference Include="protobuf-net" Version="3.0.101" />
   </ItemGroup>
   <!-- Fusee References -->
   <ItemGroup>

diff --git a/Examples/Complete/SimpleDeferred/Desktop/Fusee.Examples.SimpleDeferred.Desktop.csproj b/Examples/Complete/SimpleDeferred/Desktop/Fusee.Examples.SimpleDeferred.Desktop.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
     <ProjectReference Include="..\Core\Fusee.Examples.SimpleDeferred.Core.csproj" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 </Project>
diff --git a/Examples/Complete/SurfaceEffects/Android/Fusee.Examples.SurfaceEffects.Android.csproj b/Examples/Complete/SurfaceEffects/Android/Fusee.Examples.SurfaceEffects.Android.csproj
@@ -55,7 +55,7 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="System" />
-    <PackageReference Include="protobuf-net" Version="3.0.62" />
+    <PackageReference Include="protobuf-net" Version="3.0.101" />
   </ItemGroup>
   <!-- Fusee References -->
   <ItemGroup>

diff --git a/Examples/Complete/SurfaceEffects/Desktop/Fusee.Examples.SurfaceEffects.Desktop.csproj b/Examples/Complete/SurfaceEffects/Desktop/Fusee.Examples.SurfaceEffects.Desktop.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
     <ProjectReference Include="..\Core\Fusee.Examples.SurfaceEffects.Core.csproj" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 </Project>
diff --git a/Examples/Complete/ThreeDFont/Android/Fusee.Examples.ThreeDFont.Android.csproj b/Examples/Complete/ThreeDFont/Android/Fusee.Examples.ThreeDFont.Android.csproj
@@ -55,7 +55,7 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="System" />
-    <PackageReference Include="protobuf-net" Version="3.0.62" />
+    <PackageReference Include="protobuf-net" Version="3.0.101" />
   </ItemGroup>
   <!-- Fusee References -->
   <ItemGroup>

diff --git a/Examples/Complete/ThreeDFont/Desktop/Fusee.Examples.ThreeDFont.Desktop.csproj b/Examples/Complete/ThreeDFont/Desktop/Fusee.Examples.ThreeDFont.Desktop.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
     <ProjectReference Include="..\Core\Fusee.Examples.ThreeDFont.Core.csproj" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 </Project>
diff --git a/Examples/Complete/UI/Android/Fusee.Examples.UI.Android.csproj b/Examples/Complete/UI/Android/Fusee.Examples.UI.Android.csproj
@@ -56,7 +56,7 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="System" />
-    <PackageReference Include="protobuf-net" Version="3.0.62" />
+    <PackageReference Include="protobuf-net" Version="3.0.101" />
   </ItemGroup>
   <!-- Fusee References -->
   <ItemGroup>

diff --git a/Examples/Complete/UI/Desktop/Fusee.Examples.UI.Desktop.csproj b/Examples/Complete/UI/Desktop/Fusee.Examples.UI.Desktop.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
     <ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
     <ProjectReference Include="..\Core\Fusee.Examples.UI.Core.csproj" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 </Project>
diff --git a/NuGet.config b/NuGet.config
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="wasm" value="packages" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
-   <activePackageSource>
-    <add key="All" value="(Aggregate source)" />
-  </activePackageSource>
 </configuration>
diff --git a/src/Base/Imp/Android/Fusee.Base.Imp.Android.csproj b/src/Base/Imp/Android/Fusee.Base.Imp.Android.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <TargetFramework>MonoAndroid81</TargetFramework>
     <DefineConstants>$(DefineConstants);PLATFORM_ANDROID</DefineConstants>

diff --git a/src/Base/Imp/Desktop/EmbeddedResourcesDllHandler.cs b/src/Base/Imp/Desktop/EmbeddedResourcesDllHandler.cs
@@ -43,10 +43,13 @@ public static void LoadEmbeddedDll(string dllName, string resourceName)
                 // See if the file exists, avoid rewriting it if not necessary
                 string dllPath = Path.Combine(dirName, dllName);
 
-                using (var fileStream = File.Create(dllPath))
+                if (!File.Exists(dllPath))
                 {
-                    resourceStream.Seek(0, SeekOrigin.Begin);
-                    resourceStream.CopyTo(fileStream);
+                    using (var fileStream = File.Create(dllPath))
+                    {
+                        resourceStream.Seek(0, SeekOrigin.Begin);
+                        resourceStream.CopyTo(fileStream);
+                    }
                 }
 
                 IntPtr h = LoadLibrary(dllPath);

diff --git a/src/Base/Imp/Desktop/Fusee.Base.Imp.Desktop.csproj b/src/Base/Imp/Desktop/Fusee.Base.Imp.Desktop.csproj
@@ -26,6 +26,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="SharpFontStandard" Version="4.0.1" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 </Project>
diff --git a/src/Engine/Common/RCEnums.cs b/src/Engine/Common/RCEnums.cs
@@ -537,10 +537,10 @@ public enum Gamepad : int
         X = 1,
         Y = 2,
         B = 3,
-        Start = 4,
-        Back = 5,
-        LeftShoulder = 6,
-        RightShoulder = 7,
+        Start = 7,
+        Back = 6,
+        LeftShoulder = 4,
+        RightShoulder = 5,
         L3 = 8,
         R3 = 9,
         DPadUp = 10,

diff --git a/src/Engine/Core/SceneRendererForward.cs b/src/Engine/Core/SceneRendererForward.cs
@@ -74,12 +74,17 @@ private set
         protected Animation _animation;
 
         /// <summary>
-        /// The Scene, containing the scene that gets rendered.
+        /// The <see cref="SceneContainer"/>, containing the scene that gets rendered.
         /// </summary>
         protected SceneContainer _sc;
 
         /// <summary>
-        /// The RenderContext, used to render the scene. This will be ignored if cameras are used.
+        /// The <see cref="SceneContainer"/>, containing the scene that gets rendered.
+        /// </summary>
+        public SceneContainer SC { get => _sc; }
+
+        /// <summary>
+        /// The <see cref="RenderContext"/>, used to render the scene. This will be ignored if cameras are used.
         /// </summary>
         protected RenderContext _rc;
 

diff --git a/src/Engine/Imp/Graphics/Android/Fusee.Engine.Imp.Graphics.Android.csproj b/src/Engine/Imp/Graphics/Android/Fusee.Engine.Imp.Graphics.Android.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <TargetFramework>MonoAndroid81</TargetFramework>
     <DefineConstants>$(DefineConstants);PLATFORM_ANDROID</DefineConstants>

diff --git a/src/Engine/Imp/Graphics/Desktop/Fusee.Engine.Imp.Graphics.Desktop.csproj b/src/Engine/Imp/Graphics/Desktop/Fusee.Engine.Imp.Graphics.Desktop.csproj
@@ -28,8 +28,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="OpenTK" Version="3.2.0" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="OpenTK" Version="4.6.3" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 
   <Import Project="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Shared\Fusee.Engine.Imp.Graphics.Shared.projitems" Label="Shared" />