From 7460e593f9cb46ce34085d99cc407d5d162c987e Mon Sep 17 00:00:00 2001
From: Nikos Kastellanos <nkastellanos@gmail.com>
Date: Tue, 24 Dec 2024 19:14:13 +0200
Subject: [PATCH 01/11] Kni.Platform.WinForms.DX11

---
 BuildNuget.bat                                                  | 2 +-
 KNI.sln                                                         | 2 +-
 Kni.Platform.WinForms.DX11.sln                                  | 2 +-
 ...ork.WindowsDX11.csproj => Kni.Platform.WinForms.DX11.csproj} | 0
 Platforms/XNA.Framework.Oculus.OvrDX11.csproj                   | 2 +-
 Tests/Kni.Tests.WindowsDX11.csproj                              | 2 +-
 Tools/MonoGame.Content.Builder/MGCB.csproj                      | 2 +-
 default.build                                                   | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename Platforms/{XNA.Framework.WindowsDX11.csproj => Kni.Platform.WinForms.DX11.csproj} (100%)

diff --git a/BuildNuget.bat b/BuildNuget.bat
index 9308f272b41..ec23662505d 100644
--- a/BuildNuget.bat
+++ b/BuildNuget.bat
@@ -22,7 +22,7 @@ dotnet pack src\Xna.Framework.Content.Pipeline.Media\Xna.Framework.Content.Pipel
 "C:\Program Files (x86)\NuGet3\nuget.exe" pack NuGetPackages/MonoGame.Framework.iOS.nuspec				-OutputDirectory NuGetPackages\Output\  -BasePath .  -Version 3.14.9001.0  -Properties Configuration=Release
 "C:\Program Files (x86)\NuGet3\nuget.exe" pack NuGetPackages/MonoGame.Framework.WindowsUniversal.nuspec	-OutputDirectory NuGetPackages\Output\  -BasePath .  -Version 3.14.9001.0  -Properties Configuration=Release
 
-dotnet pack Platforms\Xna.Framework.WindowsDX11.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
+dotnet pack Platforms\Kni.Platform.WinForms.DX11.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
 dotnet pack Platforms\Xna.Framework.DesktopGL.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
 dotnet pack Kni.Platform.Blazor.GL.sln --output NuGetPackages\Output\ /t:Build /p:Configuration=Release 
 dotnet pack Platforms\Xna.Framework.Ref.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release 
diff --git a/KNI.sln b/KNI.sln
index 859ed8d0ab8..482c1cd3c88 100644
--- a/KNI.sln
+++ b/KNI.sln
@@ -65,7 +65,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Ref", "Platfo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.UAP", "Platforms\Xna.Framework.UAP.csproj", "{09C41A48-7BF3-4A46-9EB8-CE95B4C27CA9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.WindowsDX11", "Platforms\Xna.Framework.WindowsDX11.csproj", "{7DE47032-A904-4C29-BD22-2D235E8D91BA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.WinForms.DX11", "Platforms\Kni.Platform.WinForms.DX11.csproj", "{7DE47032-A904-4C29-BD22-2D235E8D91BA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Oculus.OvrDX11", "Platforms\Xna.Framework.Oculus.OvrDX11.csproj", "{9DE8C1A3-25EB-4FD7-A0B6-34720AD48B47}"
 EndProject
diff --git a/Kni.Platform.WinForms.DX11.sln b/Kni.Platform.WinForms.DX11.sln
index 8059521d81f..b485407315f 100644
--- a/Kni.Platform.WinForms.DX11.sln
+++ b/Kni.Platform.WinForms.DX11.sln
@@ -44,7 +44,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Content.Pipel
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Content.Pipeline.Media", "src\Xna.Framework.Content.Pipeline.Media\Xna.Framework.Content.Pipeline.Media.csproj", "{63486463-8AEE-483E-862A-7720CD62B4DF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.WindowsDX11", "Platforms\Xna.Framework.WindowsDX11.csproj", "{7DE47032-A904-4C29-BD22-2D235E8D91BA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.WinForms.DX11", "Platforms\Kni.Platform.WinForms.DX11.csproj", "{7DE47032-A904-4C29-BD22-2D235E8D91BA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Oculus.OvrDX11", "Platforms\Xna.Framework.Oculus.OvrDX11.csproj", "{9DE8C1A3-25EB-4FD7-A0B6-34720AD48B47}"
 EndProject
diff --git a/Platforms/XNA.Framework.WindowsDX11.csproj b/Platforms/Kni.Platform.WinForms.DX11.csproj
similarity index 100%
rename from Platforms/XNA.Framework.WindowsDX11.csproj
rename to Platforms/Kni.Platform.WinForms.DX11.csproj
diff --git a/Platforms/XNA.Framework.Oculus.OvrDX11.csproj b/Platforms/XNA.Framework.Oculus.OvrDX11.csproj
index 2fb5035eed7..bb18f136f57 100644
--- a/Platforms/XNA.Framework.Oculus.OvrDX11.csproj
+++ b/Platforms/XNA.Framework.Oculus.OvrDX11.csproj
@@ -55,7 +55,7 @@
       <Name>Xna.Framework.XR</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="XNA.Framework.WindowsDX11.csproj">
+    <ProjectReference Include="Kni.Platform.WinForms.DX11.csproj">
       <Private>False</Private>
     </ProjectReference>
     <PackageReference Include="nkast.LibOVR" Version="2.2.0" />
diff --git a/Tests/Kni.Tests.WindowsDX11.csproj b/Tests/Kni.Tests.WindowsDX11.csproj
index b2edabf1132..38981470d4e 100644
--- a/Tests/Kni.Tests.WindowsDX11.csproj
+++ b/Tests/Kni.Tests.WindowsDX11.csproj
@@ -1203,7 +1203,7 @@
       <Project>{63486463-8aee-483e-862a-7720cd62b4df}</Project>
       <Name>Xna.Framework.Content.Pipeline.Media</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Platforms\XNA.Framework.WindowsDX11.csproj">
+    <ProjectReference Include="..\Platforms\Kni.Platform.WinForms.DX11.csproj">
       <Project>{7de47032-a904-4c29-bd22-2d235e8d91ba}</Project>
       <Name>XNA.Framework.WindowsDX11</Name>
     </ProjectReference>
diff --git a/Tools/MonoGame.Content.Builder/MGCB.csproj b/Tools/MonoGame.Content.Builder/MGCB.csproj
index 873b336699d..5ae93468e9f 100644
--- a/Tools/MonoGame.Content.Builder/MGCB.csproj
+++ b/Tools/MonoGame.Content.Builder/MGCB.csproj
@@ -128,7 +128,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0-windows' Or '$(TargetFramework)' == 'net472' ">
-    <ProjectReference Include="..\..\Platforms\XNA.Framework.WindowsDX11.csproj">
+    <ProjectReference Include="..\..\Platforms\Kni.Platform.WinForms.DX11.csproj">
       <Project>{7DE47032-A904-4C29-BD22-2D235E8D91BA}</Project>
       <Name>XNA.Framework.WindowsDX11</Name>
     </ProjectReference>
diff --git a/default.build b/default.build
index 4c0549effcb..9e858d9a672 100644
--- a/default.build
+++ b/default.build
@@ -84,7 +84,7 @@
     <exec program="${nugetPath}" commandline="pack NuGetPackages/MonoGame.Framework.Android.nuspec		-OutputDirectory ${project::get-base-directory()}\Artifacts\Packages\  -BasePath .  -Version ${nugetPackageVersion}  -Properties Configuration=Release" />
     <exec program="${nugetPath}" commandline="pack NuGetPackages/MonoGame.Framework.iOS.nuspec			-OutputDirectory ${project::get-base-directory()}\Artifacts\Packages\  -BasePath .  -Version ${nugetPackageVersion}  -Properties Configuration=Release" />
 
-    <exec program="dotnet" commandline="pack Platforms\Xna.Framework.WindowsDX11.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
+    <exec program="dotnet" commandline="pack Platforms\Kni.Platform.WinForms.DX11.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
     <exec program="dotnet" commandline="pack Platforms\Xna.Framework.DesktopGL.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
     <exec program="dotnet" commandline="pack Kni.Platform.Blazor.GL.sln --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
     <exec program="dotnet" commandline="pack Platforms\XNA.Framework.Oculus.OvrDX11.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />

From 0523d27c89f1ab26349cbe9be591e68c4ee7cff9 Mon Sep 17 00:00:00 2001
From: Nikos Kastellanos <nkastellanos@gmail.com>
Date: Tue, 24 Dec 2024 19:17:50 +0200
Subject: [PATCH 02/11] Kni.Platform.UAP.DX11

---
 KNI.sln                                                       | 2 +-
 Kni.Platform.UAP.DX11.sln                                     | 2 +-
 ...{XNA.Framework.UAP.csproj => Kni.Platform.UAP.DX11.csproj} | 0
 default.build                                                 | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename Platforms/{XNA.Framework.UAP.csproj => Kni.Platform.UAP.DX11.csproj} (100%)

diff --git a/KNI.sln b/KNI.sln
index 482c1cd3c88..b41c6d26219 100644
--- a/KNI.sln
+++ b/KNI.sln
@@ -63,7 +63,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.iOS.Xamarin",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Ref", "Platforms\Xna.Framework.Ref.csproj", "{2ACF610C-9188-4F16-A611-577C1223DD90}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.UAP", "Platforms\Xna.Framework.UAP.csproj", "{09C41A48-7BF3-4A46-9EB8-CE95B4C27CA9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kni.Platform.UAP.DX11", "Platforms\Kni.Platform.UAP.DX11.csproj", "{09C41A48-7BF3-4A46-9EB8-CE95B4C27CA9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.WinForms.DX11", "Platforms\Kni.Platform.WinForms.DX11.csproj", "{7DE47032-A904-4C29-BD22-2D235E8D91BA}"
 EndProject
diff --git a/Kni.Platform.UAP.DX11.sln b/Kni.Platform.UAP.DX11.sln
index 2af4b2c0358..a914a01d210 100644
--- a/Kni.Platform.UAP.DX11.sln
+++ b/Kni.Platform.UAP.DX11.sln
@@ -26,7 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Storage", "sr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.XR", "src\Xna.Framework.XR\Xna.Framework.XR.csproj", "{6D0D985D-B256-4208-9E78-77897D461698}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.UAP", "Platforms\Xna.Framework.UAP.csproj", "{09C41A48-7BF3-4A46-9EB8-CE95B4C27CA9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kni.Platform.UAP.DX11", "Platforms\Kni.Platform.UAP.DX11.csproj", "{09C41A48-7BF3-4A46-9EB8-CE95B4C27CA9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Platforms/XNA.Framework.UAP.csproj b/Platforms/Kni.Platform.UAP.DX11.csproj
similarity index 100%
rename from Platforms/XNA.Framework.UAP.csproj
rename to Platforms/Kni.Platform.UAP.DX11.csproj
diff --git a/default.build b/default.build
index 9e858d9a672..c1cee4cc31a 100644
--- a/default.build
+++ b/default.build
@@ -191,8 +191,8 @@
   <target name="build_windowsUAP10" description="Build Windows 10 UAP">
 
       <!--
-      <exec program="${msbuild17}" commandline='Platforms\XNA.Framework.UAP.csproj /t:Restore /p:Configuration=Release' />
-      <exec program="${msbuild17}" commandline='Platforms\XNA.Framework.UAP.csproj /p:Configuration=Release' />
+      <exec program="${msbuild17}" commandline='Platforms\Kni.Platform.UAP.DX11.csproj /t:Restore /p:Configuration=Release' />
+      <exec program="${msbuild17}" commandline='Platforms\Kni.Platform.UAP.DX11.csproj /p:Configuration=Release' />
       -->
       <exec program="${msbuild17}" commandline='Kni.Platform.UAP.DX11.sln /t:Restore /p:Configuration=Release' />
       <exec program="${msbuild17}" commandline='Kni.Platform.UAP.DX11.sln /t:Build /p:Configuration=Release /p:Platform="Any CPU"' />

From 3ae2a118442da310d1c71ac186eb511b8a8fadd8 Mon Sep 17 00:00:00 2001
From: Nikos Kastellanos <nkastellanos@gmail.com>
Date: Tue, 24 Dec 2024 19:20:55 +0200
Subject: [PATCH 03/11] Kni.Platform.Ref

---
 .github/workflows/dotnet.yml                                | 2 +-
 BuildNuget.bat                                              | 2 +-
 KNI.sln                                                     | 2 +-
 Kni.Platform.Ref.sln                                        | 2 +-
 .../{XNA.Framework.Ref.csproj => Kni.Platform.Ref.csproj}   | 0
 default.build                                               | 6 +++---
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename Platforms/{XNA.Framework.Ref.csproj => Kni.Platform.Ref.csproj} (100%)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index a1d009e508e..5509b8b350f 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -51,7 +51,7 @@ jobs:
    # - name: Build
    #   run: dotnet build KNI.sln --no-restore --property:WarningLevel=1
     - name: Build Ref
-      run: dotnet build Platforms\Xna.Framework.Ref.csproj --property:WarningLevel=1
+      run: dotnet build Platforms\Kni.Platform.Ref.csproj --property:WarningLevel=1
     - name: Build Blazor.GL
       run: dotnet build Kni.Platform.Blazor.GL.sln --property:WarningLevel=1
     - name: Build WinForms.DX11
diff --git a/BuildNuget.bat b/BuildNuget.bat
index ec23662505d..e91f4ed3958 100644
--- a/BuildNuget.bat
+++ b/BuildNuget.bat
@@ -25,7 +25,7 @@ dotnet pack src\Xna.Framework.Content.Pipeline.Media\Xna.Framework.Content.Pipel
 dotnet pack Platforms\Kni.Platform.WinForms.DX11.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
 dotnet pack Platforms\Xna.Framework.DesktopGL.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
 dotnet pack Kni.Platform.Blazor.GL.sln --output NuGetPackages\Output\ /t:Build /p:Configuration=Release 
-dotnet pack Platforms\Xna.Framework.Ref.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release 
+dotnet pack Platforms\Kni.Platform.Ref.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release 
 dotnet pack Platforms\XNA.Framework.Oculus.OvrDX11.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release 
 
 dotnet pack Platforms\Xna.Framework.Cardboard.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
diff --git a/KNI.sln b/KNI.sln
index b41c6d26219..752a7719ac3 100644
--- a/KNI.sln
+++ b/KNI.sln
@@ -61,7 +61,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.iOS", "Platfo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.iOS.Xamarin", "Platforms\Xna.Framework.iOS.Xamarin.csproj", "{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Ref", "Platforms\Xna.Framework.Ref.csproj", "{2ACF610C-9188-4F16-A611-577C1223DD90}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.Ref", "Platforms\Kni.Platform.Ref.csproj", "{2ACF610C-9188-4F16-A611-577C1223DD90}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kni.Platform.UAP.DX11", "Platforms\Kni.Platform.UAP.DX11.csproj", "{09C41A48-7BF3-4A46-9EB8-CE95B4C27CA9}"
 EndProject
diff --git a/Kni.Platform.Ref.sln b/Kni.Platform.Ref.sln
index 7a40abf07b2..df6b45c39f3 100644
--- a/Kni.Platform.Ref.sln
+++ b/Kni.Platform.Ref.sln
@@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Storage", "sr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.XR", "src\Xna.Framework.XR\Xna.Framework.XR.csproj", "{6D0D985D-B256-4208-9E78-77897D461698}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Ref", "Platforms\Xna.Framework.Ref.csproj", "{91E64EE8-04D3-4850-A3CA-C4839EF167F2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.Ref", "Platforms\Kni.Platform.Ref.csproj", "{91E64EE8-04D3-4850-A3CA-C4839EF167F2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Platforms/XNA.Framework.Ref.csproj b/Platforms/Kni.Platform.Ref.csproj
similarity index 100%
rename from Platforms/XNA.Framework.Ref.csproj
rename to Platforms/Kni.Platform.Ref.csproj
diff --git a/default.build b/default.build
index c1cee4cc31a..90a170bd161 100644
--- a/default.build
+++ b/default.build
@@ -70,7 +70,7 @@
 
     <exec program="dotnet" commandline="pack src\Xna.Framework\Xna.Framework.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
     <exec program="dotnet" commandline="pack src\Xna.Framework.Design\Xna.Framework.Design.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
-    <exec program="dotnet" commandline="pack Platforms\Xna.Framework.Ref.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
+    <exec program="dotnet" commandline="pack Platforms\Kni.Platform.Ref.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
 
     <exec program="dotnet" commandline="pack src\Xna.Framework.Content.Pipeline\Xna.Framework.Content.Pipeline.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
     <exec program="dotnet" commandline="pack src\Xna.Framework.Content.Pipeline.Audio\Xna.Framework.Content.Pipeline.Audio.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
@@ -126,8 +126,8 @@
     
   <target name="build_ref" description="Build reference">
 
-      <exec program="dotnet" commandline="build Platforms\Xna.Framework.Ref.csproj /t:restore" />
-      <exec program="dotnet" commandline="build Platforms\Xna.Framework.Ref.csproj /t:Build /p:Configuration=Release" />
+      <exec program="dotnet" commandline="build Platforms\Kni.Platform.Ref.csproj /t:restore" />
+      <exec program="dotnet" commandline="build Platforms\Kni.Platform.Ref.csproj /t:Build /p:Configuration=Release" />
 
   </target>
   

From cbb57d2907d065701f13887834095dd502cff06a Mon Sep 17 00:00:00 2001
From: Nikos Kastellanos <nkastellanos@gmail.com>
Date: Tue, 24 Dec 2024 19:24:48 +0200
Subject: [PATCH 04/11] Kni.Platform.WinForms.DX11.OculusOVR

---
 BuildNuget.bat                                                  | 2 +-
 KNI.sln                                                         | 2 +-
 Kni.Platform.WinForms.DX11.sln                                  | 2 +-
 ...rDX11.csproj => Kni.Platform.WinForms.DX11.OculusOVR.csproj} | 0
 default.build                                                   | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename Platforms/{XNA.Framework.Oculus.OvrDX11.csproj => Kni.Platform.WinForms.DX11.OculusOVR.csproj} (100%)

diff --git a/BuildNuget.bat b/BuildNuget.bat
index e91f4ed3958..13fb6407b76 100644
--- a/BuildNuget.bat
+++ b/BuildNuget.bat
@@ -26,7 +26,7 @@ dotnet pack Platforms\Kni.Platform.WinForms.DX11.csproj --output NuGetPackages\O
 dotnet pack Platforms\Xna.Framework.DesktopGL.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
 dotnet pack Kni.Platform.Blazor.GL.sln --output NuGetPackages\Output\ /t:Build /p:Configuration=Release 
 dotnet pack Platforms\Kni.Platform.Ref.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release 
-dotnet pack Platforms\XNA.Framework.Oculus.OvrDX11.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release 
+dotnet pack Platforms\Kni.Platform.WinForms.DX11.OculusOVR.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release 
 
 dotnet pack Platforms\Xna.Framework.Cardboard.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
 
diff --git a/KNI.sln b/KNI.sln
index 752a7719ac3..d65834c34ad 100644
--- a/KNI.sln
+++ b/KNI.sln
@@ -67,7 +67,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kni.Platform.UAP.DX11", "Pl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.WinForms.DX11", "Platforms\Kni.Platform.WinForms.DX11.csproj", "{7DE47032-A904-4C29-BD22-2D235E8D91BA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Oculus.OvrDX11", "Platforms\Xna.Framework.Oculus.OvrDX11.csproj", "{9DE8C1A3-25EB-4FD7-A0B6-34720AD48B47}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.WinForms.DX11.OculusOVR", "Platforms\Kni.Platform.WinForms.DX11.OculusOVR.csproj", "{9DE8C1A3-25EB-4FD7-A0B6-34720AD48B47}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EffectCompiler", "Tools\EffectCompiler\EffectCompiler.csproj", "{46474D32-2E58-6957-6E64-6F7773324D47}"
 EndProject
diff --git a/Kni.Platform.WinForms.DX11.sln b/Kni.Platform.WinForms.DX11.sln
index b485407315f..02a40fbe653 100644
--- a/Kni.Platform.WinForms.DX11.sln
+++ b/Kni.Platform.WinForms.DX11.sln
@@ -46,7 +46,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Content.Pipel
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.WinForms.DX11", "Platforms\Kni.Platform.WinForms.DX11.csproj", "{7DE47032-A904-4C29-BD22-2D235E8D91BA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Oculus.OvrDX11", "Platforms\Xna.Framework.Oculus.OvrDX11.csproj", "{9DE8C1A3-25EB-4FD7-A0B6-34720AD48B47}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.WinForms.DX11.OculusOVR", "Platforms\Kni.Platform.WinForms.DX11.OculusOVR.csproj", "{9DE8C1A3-25EB-4FD7-A0B6-34720AD48B47}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EffectCompiler", "Tools\EffectCompiler\EffectCompiler.csproj", "{46474D32-2E58-6957-6E64-6F7773324D47}"
 EndProject
diff --git a/Platforms/XNA.Framework.Oculus.OvrDX11.csproj b/Platforms/Kni.Platform.WinForms.DX11.OculusOVR.csproj
similarity index 100%
rename from Platforms/XNA.Framework.Oculus.OvrDX11.csproj
rename to Platforms/Kni.Platform.WinForms.DX11.OculusOVR.csproj
diff --git a/default.build b/default.build
index 90a170bd161..bf3ad0d2804 100644
--- a/default.build
+++ b/default.build
@@ -87,7 +87,7 @@
     <exec program="dotnet" commandline="pack Platforms\Kni.Platform.WinForms.DX11.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
     <exec program="dotnet" commandline="pack Platforms\Xna.Framework.DesktopGL.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
     <exec program="dotnet" commandline="pack Kni.Platform.Blazor.GL.sln --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
-    <exec program="dotnet" commandline="pack Platforms\XNA.Framework.Oculus.OvrDX11.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
+    <exec program="dotnet" commandline="pack Platforms\Kni.Platform.WinForms.DX11.OculusOVR.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
 
     <exec program="dotnet" commandline="pack Platforms\Xna.Framework.Cardboard.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
 

From 84ec7d44dba3a1cbea04f63d22d7fa461b45bfa6 Mon Sep 17 00:00:00 2001
From: Nikos Kastellanos <nkastellanos@gmail.com>
Date: Tue, 24 Dec 2024 19:30:46 +0200
Subject: [PATCH 05/11] Kni.Platform.iOS.GL

---
 KNI.sln                                                       | 4 ++--
 Kni.Platform.iOS.GL.Xamarin.sln                               | 2 +-
 Kni.Platform.iOS.GL.sln                                       | 2 +-
 ....iOS.Xamarin.csproj => Kni.Platform.iOS.GL.Xamarin.csproj} | 0
 .../{XNA.Framework.iOS.csproj => Kni.Platform.iOS.GL.csproj}  | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename Platforms/{XNA.Framework.iOS.Xamarin.csproj => Kni.Platform.iOS.GL.Xamarin.csproj} (100%)
 rename Platforms/{XNA.Framework.iOS.csproj => Kni.Platform.iOS.GL.csproj} (100%)

diff --git a/KNI.sln b/KNI.sln
index d65834c34ad..f13f490219a 100644
--- a/KNI.sln
+++ b/KNI.sln
@@ -57,9 +57,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Cardboard", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.DesktopGL", "Platforms\Xna.Framework.DesktopGL.csproj", "{6D75E618-19CA-4C51-9546-F10965FBC0B8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.iOS", "Platforms\Xna.Framework.iOS.csproj", "{D93291EF-3419-412E-BC56-376BD6A02224}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.iOS.GL", "Platforms\Kni.Platform.iOS.GL.csproj", "{D93291EF-3419-412E-BC56-376BD6A02224}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.iOS.Xamarin", "Platforms\Xna.Framework.iOS.Xamarin.csproj", "{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.iOS.GL.Xamarin", "Platforms\Kni.Platform.iOS.GL.Xamarin.csproj", "{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.Ref", "Platforms\Kni.Platform.Ref.csproj", "{2ACF610C-9188-4F16-A611-577C1223DD90}"
 EndProject
diff --git a/Kni.Platform.iOS.GL.Xamarin.sln b/Kni.Platform.iOS.GL.Xamarin.sln
index e065256b000..627afe214c3 100644
--- a/Kni.Platform.iOS.GL.Xamarin.sln
+++ b/Kni.Platform.iOS.GL.Xamarin.sln
@@ -26,7 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Storage", "sr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.XR", "src\Xna.Framework.XR\Xna.Framework.XR.csproj", "{6D0D985D-B256-4208-9E78-77897D461698}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.iOS.Xamarin", "Platforms\Xna.Framework.iOS.Xamarin.csproj", "{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.iOS.GL.Xamarin", "Platforms\Kni.Platform.iOS.GL.Xamarin.csproj", "{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Kni.Platform.iOS.GL.sln b/Kni.Platform.iOS.GL.sln
index a8cd94dc7d5..6fdf67c070d 100644
--- a/Kni.Platform.iOS.GL.sln
+++ b/Kni.Platform.iOS.GL.sln
@@ -26,7 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Storage", "sr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.XR", "src\Xna.Framework.XR\Xna.Framework.XR.csproj", "{6D0D985D-B256-4208-9E78-77897D461698}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.iOS", "Platforms\Xna.Framework.iOS.csproj", "{D93291EF-3419-412E-BC56-376BD6A02224}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.iOS.GL", "Platforms\Kni.Platform.iOS.GL.csproj", "{D93291EF-3419-412E-BC56-376BD6A02224}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Platforms/XNA.Framework.iOS.Xamarin.csproj b/Platforms/Kni.Platform.iOS.GL.Xamarin.csproj
similarity index 100%
rename from Platforms/XNA.Framework.iOS.Xamarin.csproj
rename to Platforms/Kni.Platform.iOS.GL.Xamarin.csproj
diff --git a/Platforms/XNA.Framework.iOS.csproj b/Platforms/Kni.Platform.iOS.GL.csproj
similarity index 100%
rename from Platforms/XNA.Framework.iOS.csproj
rename to Platforms/Kni.Platform.iOS.GL.csproj

From 029cea450cb3dc45aebfe2a6dfe384afdc4f82bf Mon Sep 17 00:00:00 2001
From: Nikos Kastellanos <nkastellanos@gmail.com>
Date: Tue, 24 Dec 2024 19:35:00 +0200
Subject: [PATCH 06/11] Kni.Platform.SDL2.GL

---
 BuildNuget.bat                                              | 2 +-
 KNI.sln                                                     | 2 +-
 Kni.Platform.SDL2.GL.sln                                    | 2 +-
 ...amework.DesktopGL.csproj => Kni.Platform.SDL2.GL.csproj} | 0
 Tests/Kni.Tests.DesktopGL.csproj                            | 2 +-
 default.build                                               | 6 +++---
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename Platforms/{XNA.Framework.DesktopGL.csproj => Kni.Platform.SDL2.GL.csproj} (100%)

diff --git a/BuildNuget.bat b/BuildNuget.bat
index 13fb6407b76..d335244f811 100644
--- a/BuildNuget.bat
+++ b/BuildNuget.bat
@@ -23,7 +23,7 @@ dotnet pack src\Xna.Framework.Content.Pipeline.Media\Xna.Framework.Content.Pipel
 "C:\Program Files (x86)\NuGet3\nuget.exe" pack NuGetPackages/MonoGame.Framework.WindowsUniversal.nuspec	-OutputDirectory NuGetPackages\Output\  -BasePath .  -Version 3.14.9001.0  -Properties Configuration=Release
 
 dotnet pack Platforms\Kni.Platform.WinForms.DX11.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
-dotnet pack Platforms\Xna.Framework.DesktopGL.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
+dotnet pack Platforms\Kni.Platform.SDL2.GL.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
 dotnet pack Kni.Platform.Blazor.GL.sln --output NuGetPackages\Output\ /t:Build /p:Configuration=Release 
 dotnet pack Platforms\Kni.Platform.Ref.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release 
 dotnet pack Platforms\Kni.Platform.WinForms.DX11.OculusOVR.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release 
diff --git a/KNI.sln b/KNI.sln
index f13f490219a..a9501493ae3 100644
--- a/KNI.sln
+++ b/KNI.sln
@@ -55,7 +55,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Blazor", "Pla
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Cardboard", "Platforms\Xna.Framework.Cardboard.csproj", "{BF257928-8B5D-4371-BD03-C18DA71918C3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.DesktopGL", "Platforms\Xna.Framework.DesktopGL.csproj", "{6D75E618-19CA-4C51-9546-F10965FBC0B8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.SDL2.GL", "Platforms\Kni.Platform.SDL2.GL.csproj", "{6D75E618-19CA-4C51-9546-F10965FBC0B8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.iOS.GL", "Platforms\Kni.Platform.iOS.GL.csproj", "{D93291EF-3419-412E-BC56-376BD6A02224}"
 EndProject
diff --git a/Kni.Platform.SDL2.GL.sln b/Kni.Platform.SDL2.GL.sln
index c3ca8b17941..495925639f4 100644
--- a/Kni.Platform.SDL2.GL.sln
+++ b/Kni.Platform.SDL2.GL.sln
@@ -30,7 +30,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.XR", "src\Xna
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Design", "src\Xna.Framework.Design\Xna.Framework.Design.csproj", "{E37F98D7-C4E8-4556-B322-AEF99638ECE1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.DesktopGL", "Platforms\Xna.Framework.DesktopGL.csproj", "{6D75E618-19CA-4C51-9546-F10965FBC0B8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.SDL2.GL", "Platforms\Kni.Platform.SDL2.GL.csproj", "{6D75E618-19CA-4C51-9546-F10965FBC0B8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Tests.DesktopGL", "Tests\Kni.Tests.DesktopGL.csproj", "{DED2DDB6-D4BE-B1B4-2E54-657374732E57}"
 EndProject
diff --git a/Platforms/XNA.Framework.DesktopGL.csproj b/Platforms/Kni.Platform.SDL2.GL.csproj
similarity index 100%
rename from Platforms/XNA.Framework.DesktopGL.csproj
rename to Platforms/Kni.Platform.SDL2.GL.csproj
diff --git a/Tests/Kni.Tests.DesktopGL.csproj b/Tests/Kni.Tests.DesktopGL.csproj
index dd4e9c19c92..44e00ff9902 100644
--- a/Tests/Kni.Tests.DesktopGL.csproj
+++ b/Tests/Kni.Tests.DesktopGL.csproj
@@ -1126,7 +1126,7 @@
       <Project>{63486463-8aee-483e-862a-7720cd62b4df}</Project>
       <Name>Xna.Framework.Content.Pipeline.Media</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Platforms\XNA.Framework.DesktopGL.csproj">
+    <ProjectReference Include="..\Platforms\Kni.Platform.SDL2.GL.csproj">
       <Project>{6D75E618-19CA-4C51-9546-F10965FBC0B8}</Project>
       <Name>XNA.Framework.DesktopGL</Name>
     </ProjectReference>
diff --git a/default.build b/default.build
index bf3ad0d2804..e793d55b8ae 100644
--- a/default.build
+++ b/default.build
@@ -85,7 +85,7 @@
     <exec program="${nugetPath}" commandline="pack NuGetPackages/MonoGame.Framework.iOS.nuspec			-OutputDirectory ${project::get-base-directory()}\Artifacts\Packages\  -BasePath .  -Version ${nugetPackageVersion}  -Properties Configuration=Release" />
 
     <exec program="dotnet" commandline="pack Platforms\Kni.Platform.WinForms.DX11.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
-    <exec program="dotnet" commandline="pack Platforms\Xna.Framework.DesktopGL.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
+    <exec program="dotnet" commandline="pack Platforms\Kni.Platform.SDL2.GL.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
     <exec program="dotnet" commandline="pack Kni.Platform.Blazor.GL.sln --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
     <exec program="dotnet" commandline="pack Platforms\Kni.Platform.WinForms.DX11.OculusOVR.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
 
@@ -147,8 +147,8 @@
   
   <target name="build_desktopGL" description="Build DesktopGL">
 
-      <exec program="dotnet" commandline="build Platforms\XNA.Framework.DesktopGL.csproj /t:restore" />
-      <exec program="dotnet" commandline="build Platforms\XNA.Framework.DesktopGL.csproj /t:Build /p:Configuration=Release" />
+      <exec program="dotnet" commandline="build Platforms\Kni.Platform.SDL2.GL.csproj /t:restore" />
+      <exec program="dotnet" commandline="build Platforms\Kni.Platform.SDL2.GL.csproj /t:Build /p:Configuration=Release" />
       
   </target>
 

From 6aab302b5b38609652d1d35670278c234fbf22cd Mon Sep 17 00:00:00 2001
From: Nikos Kastellanos <nkastellanos@gmail.com>
Date: Tue, 24 Dec 2024 19:39:48 +0200
Subject: [PATCH 07/11] Kni.Platform.Cardboard.GL

---
 BuildNuget.bat                                                  | 2 +-
 KNI.sln                                                         | 2 +-
 Kni.Platform.Cardboard.GL.sln                                   | 2 +-
 ...mework.Cardboard.csproj => Kni.Platform.Cardboard.GL.csproj} | 0
 default.build                                                   | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename Platforms/{XNA.Framework.Cardboard.csproj => Kni.Platform.Cardboard.GL.csproj} (100%)

diff --git a/BuildNuget.bat b/BuildNuget.bat
index d335244f811..f4c580af462 100644
--- a/BuildNuget.bat
+++ b/BuildNuget.bat
@@ -28,6 +28,6 @@ dotnet pack Kni.Platform.Blazor.GL.sln --output NuGetPackages\Output\ /t:Build /
 dotnet pack Platforms\Kni.Platform.Ref.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release 
 dotnet pack Platforms\Kni.Platform.WinForms.DX11.OculusOVR.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release 
 
-dotnet pack Platforms\Xna.Framework.Cardboard.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
+dotnet pack Platforms\Kni.Platform.Cardboard.GL.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
 
 @pause
diff --git a/KNI.sln b/KNI.sln
index a9501493ae3..20e320bfda2 100644
--- a/KNI.sln
+++ b/KNI.sln
@@ -53,7 +53,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.Android.Xamar
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Blazor", "Platforms\Xna.Framework.Blazor.csproj", "{E442B4FA-5F28-40AC-92C2-2979786418D3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Cardboard", "Platforms\Xna.Framework.Cardboard.csproj", "{BF257928-8B5D-4371-BD03-C18DA71918C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.Cardboard.GL", "Platforms\Kni.Platform.Cardboard.GL.csproj", "{BF257928-8B5D-4371-BD03-C18DA71918C3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.SDL2.GL", "Platforms\Kni.Platform.SDL2.GL.csproj", "{6D75E618-19CA-4C51-9546-F10965FBC0B8}"
 EndProject
diff --git a/Kni.Platform.Cardboard.GL.sln b/Kni.Platform.Cardboard.GL.sln
index 62dcf6e6ed4..a13ca567d45 100644
--- a/Kni.Platform.Cardboard.GL.sln
+++ b/Kni.Platform.Cardboard.GL.sln
@@ -26,7 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Storage", "sr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.XR", "src\Xna.Framework.XR\Xna.Framework.XR.csproj", "{6D0D985D-B256-4208-9E78-77897D461698}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Cardboard", "Platforms\Xna.Framework.Cardboard.csproj", "{BF257928-8B5D-4371-BD03-C18DA71918C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.Cardboard.GL", "Platforms\Kni.Platform.Cardboard.GL.csproj", "{BF257928-8B5D-4371-BD03-C18DA71918C3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GoogleCardboard", "Platforms\XR\.CardboardLegacy\GoogleCardboard\GoogleCardboard.csproj", "{4EAA991B-83C7-41AA-B845-8A13E05E0334}"
 EndProject
diff --git a/Platforms/XNA.Framework.Cardboard.csproj b/Platforms/Kni.Platform.Cardboard.GL.csproj
similarity index 100%
rename from Platforms/XNA.Framework.Cardboard.csproj
rename to Platforms/Kni.Platform.Cardboard.GL.csproj
diff --git a/default.build b/default.build
index e793d55b8ae..70e6bf686ac 100644
--- a/default.build
+++ b/default.build
@@ -89,7 +89,7 @@
     <exec program="dotnet" commandline="pack Kni.Platform.Blazor.GL.sln --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
     <exec program="dotnet" commandline="pack Platforms\Kni.Platform.WinForms.DX11.OculusOVR.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
 
-    <exec program="dotnet" commandline="pack Platforms\Xna.Framework.Cardboard.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
+    <exec program="dotnet" commandline="pack Platforms\Kni.Platform.Cardboard.GL.csproj --output ${project::get-base-directory()}\Artifacts\Packages\ /t:Build /p:Configuration=Release" />
 
   </target>
 

From 0d6fa5bad7ca1bcb12453ea566a273b5ac45efab Mon Sep 17 00:00:00 2001
From: Nikos Kastellanos <nkastellanos@gmail.com>
Date: Tue, 24 Dec 2024 19:43:01 +0200
Subject: [PATCH 08/11] Kni.Platform.Blazor.GL

---
 KNI.sln                                                         | 2 +-
 Kni.Platform.Blazor.GL.sln                                      | 2 +-
 ...NA.Framework.Blazor.csproj => Kni.Platform.Blazor.GL.csproj} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename Platforms/{XNA.Framework.Blazor.csproj => Kni.Platform.Blazor.GL.csproj} (100%)

diff --git a/KNI.sln b/KNI.sln
index 20e320bfda2..830a12f8f29 100644
--- a/KNI.sln
+++ b/KNI.sln
@@ -51,7 +51,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Android", "Pl
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.Android.Xamarin", "Platforms\Xna.Framework.Android.Xamarin.csproj", "{BA9476CF-99BA-4D03-92F2-73D2C5E58883}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Blazor", "Platforms\Xna.Framework.Blazor.csproj", "{E442B4FA-5F28-40AC-92C2-2979786418D3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.Blazor.GL", "Platforms\Kni.Platform.Blazor.GL.csproj", "{E442B4FA-5F28-40AC-92C2-2979786418D3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.Cardboard.GL", "Platforms\Kni.Platform.Cardboard.GL.csproj", "{BF257928-8B5D-4371-BD03-C18DA71918C3}"
 EndProject
diff --git a/Kni.Platform.Blazor.GL.sln b/Kni.Platform.Blazor.GL.sln
index f11c49255c8..aaa2ea0f6f3 100644
--- a/Kni.Platform.Blazor.GL.sln
+++ b/Kni.Platform.Blazor.GL.sln
@@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Storage", "sr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.XR", "src\Xna.Framework.XR\Xna.Framework.XR.csproj", "{6D0D985D-B256-4208-9E78-77897D461698}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Blazor", "Platforms\Xna.Framework.Blazor.csproj", "{6FE118A2-6D2B-4652-8C50-79DF113CA22B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.Blazor.GL", "Platforms\Kni.Platform.Blazor.GL.csproj", "{6FE118A2-6D2B-4652-8C50-79DF113CA22B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Platforms/XNA.Framework.Blazor.csproj b/Platforms/Kni.Platform.Blazor.GL.csproj
similarity index 100%
rename from Platforms/XNA.Framework.Blazor.csproj
rename to Platforms/Kni.Platform.Blazor.GL.csproj

From 7c5188b951cf0b0ef8595a5d4821ba9c2cac3543 Mon Sep 17 00:00:00 2001
From: Nikos Kastellanos <nkastellanos@gmail.com>
Date: Tue, 24 Dec 2024 19:46:40 +0200
Subject: [PATCH 09/11] Kni.Platform.Android.GL

---
 KNI.sln                                                       | 4 ++--
 Kni.Platform.Android.GL.Xamarin.sln                           | 2 +-
 Kni.Platform.Android.GL.sln                                   | 2 +-
 ....Xamarin.csproj => Kni.Platform.Android.GL.Xamarin.csproj} | 0
 ...ramework.Android.csproj => Kni.Platform.Android.GL.csproj} | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename Platforms/{XNA.Framework.Android.Xamarin.csproj => Kni.Platform.Android.GL.Xamarin.csproj} (100%)
 rename Platforms/{XNA.Framework.Android.csproj => Kni.Platform.Android.GL.csproj} (100%)

diff --git a/KNI.sln b/KNI.sln
index 830a12f8f29..3ed36098bfc 100644
--- a/KNI.sln
+++ b/KNI.sln
@@ -47,9 +47,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Content.Pipel
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Content.Pipeline.Media", "src\Xna.Framework.Content.Pipeline.Media\Xna.Framework.Content.Pipeline.Media.csproj", "{63486463-8AEE-483E-862A-7720CD62B4DF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Android", "Platforms\Xna.Framework.Android.csproj", "{CF09A088-6F64-4FA3-8FF8-E5B39F8BB0E6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.Android.GL", "Platforms\Kni.Platform.Android.GL.csproj", "{CF09A088-6F64-4FA3-8FF8-E5B39F8BB0E6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.Android.Xamarin", "Platforms\Xna.Framework.Android.Xamarin.csproj", "{BA9476CF-99BA-4D03-92F2-73D2C5E58883}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kni.Platform.Android.GL.Xamarin", "Platforms\Kni.Platform.Android.GL.Xamarin.csproj", "{BA9476CF-99BA-4D03-92F2-73D2C5E58883}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.Blazor.GL", "Platforms\Kni.Platform.Blazor.GL.csproj", "{E442B4FA-5F28-40AC-92C2-2979786418D3}"
 EndProject
diff --git a/Kni.Platform.Android.GL.Xamarin.sln b/Kni.Platform.Android.GL.Xamarin.sln
index 0b384b3d2d1..714526c1d89 100644
--- a/Kni.Platform.Android.GL.Xamarin.sln
+++ b/Kni.Platform.Android.GL.Xamarin.sln
@@ -26,7 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Storage", "sr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.XR", "src\Xna.Framework.XR\Xna.Framework.XR.csproj", "{6D0D985D-B256-4208-9E78-77897D461698}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.Android.Xamarin", "Platforms\Xna.Framework.Android.Xamarin.csproj", "{BA9476CF-99BA-4D03-92F2-73D2C5E58883}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kni.Platform.Android.GL.Xamarin", "Platforms\Kni.Platform.Android.GL.Xamarin.csproj", "{BA9476CF-99BA-4D03-92F2-73D2C5E58883}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Kni.Platform.Android.GL.sln b/Kni.Platform.Android.GL.sln
index c1372a07411..22a7e484f27 100644
--- a/Kni.Platform.Android.GL.sln
+++ b/Kni.Platform.Android.GL.sln
@@ -26,7 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Storage", "sr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xna.Framework.XR", "src\Xna.Framework.XR\Xna.Framework.XR.csproj", "{6D0D985D-B256-4208-9E78-77897D461698}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Android", "Platforms\Xna.Framework.Android.csproj", "{CF09A088-6F64-4FA3-8FF8-E5B39F8BB0E6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.Android.GL", "Platforms\Kni.Platform.Android.GL.csproj", "{CF09A088-6F64-4FA3-8FF8-E5B39F8BB0E6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Platforms/XNA.Framework.Android.Xamarin.csproj b/Platforms/Kni.Platform.Android.GL.Xamarin.csproj
similarity index 100%
rename from Platforms/XNA.Framework.Android.Xamarin.csproj
rename to Platforms/Kni.Platform.Android.GL.Xamarin.csproj
diff --git a/Platforms/XNA.Framework.Android.csproj b/Platforms/Kni.Platform.Android.GL.csproj
similarity index 100%
rename from Platforms/XNA.Framework.Android.csproj
rename to Platforms/Kni.Platform.Android.GL.csproj

From 9a7fa363458294bc5e5087cdd21b4f74aaf20c00 Mon Sep 17 00:00:00 2001
From: Nikos Kastellanos <nkastellanos@gmail.com>
Date: Tue, 24 Dec 2024 19:49:51 +0200
Subject: [PATCH 10/11] Kni.Tests.SDL2.GL

---
 KNI.sln                                                        | 2 +-
 Kni.Platform.SDL2.GL.sln                                       | 2 +-
 Tests/{Kni.Tests.DesktopGL.csproj => Kni.Tests.SDL2.GL.csproj} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename Tests/{Kni.Tests.DesktopGL.csproj => Kni.Tests.SDL2.GL.csproj} (100%)

diff --git a/KNI.sln b/KNI.sln
index 3ed36098bfc..83cc9f28637 100644
--- a/KNI.sln
+++ b/KNI.sln
@@ -75,7 +75,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MGCB", "Tools\MonoGame.Cont
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Pipeline.Editor.net8", "Tools\Content.Pipeline.Editor.WinForms\Content.Pipeline.Editor.net8.csproj", "{5212C44E-1573-43C2-85E8-5751A12FBBFD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Tests.DesktopGL", "Tests\Kni.Tests.DesktopGL.csproj", "{DED2DDB6-D4BE-B1B4-2E54-657374732E57}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Tests.SDL2.GL", "Tests\Kni.Tests.SDL2.GL.csproj", "{DED2DDB6-D4BE-B1B4-2E54-657374732E57}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Tests.WindowsDX11", "Tests\Kni.Tests.WindowsDX11.csproj", "{DED2DDB6-D4BE-656D-2E54-657374732E57}"
 EndProject
diff --git a/Kni.Platform.SDL2.GL.sln b/Kni.Platform.SDL2.GL.sln
index 495925639f4..e107bf49247 100644
--- a/Kni.Platform.SDL2.GL.sln
+++ b/Kni.Platform.SDL2.GL.sln
@@ -32,7 +32,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xna.Framework.Design", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Platform.SDL2.GL", "Platforms\Kni.Platform.SDL2.GL.csproj", "{6D75E618-19CA-4C51-9546-F10965FBC0B8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Tests.DesktopGL", "Tests\Kni.Tests.DesktopGL.csproj", "{DED2DDB6-D4BE-B1B4-2E54-657374732E57}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Tests.SDL2.GL", "Tests\Kni.Tests.SDL2.GL.csproj", "{DED2DDB6-D4BE-B1B4-2E54-657374732E57}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Content.Pipeline", "Content.Pipeline", "{28AEF6DE-B48A-4EA8-9262-B91E48544888}"
 EndProject
diff --git a/Tests/Kni.Tests.DesktopGL.csproj b/Tests/Kni.Tests.SDL2.GL.csproj
similarity index 100%
rename from Tests/Kni.Tests.DesktopGL.csproj
rename to Tests/Kni.Tests.SDL2.GL.csproj

From ad406b302ac9bf4b3be63c09126ac62e8ede4ae6 Mon Sep 17 00:00:00 2001
From: Nikos Kastellanos <nkastellanos@gmail.com>
Date: Tue, 24 Dec 2024 19:52:49 +0200
Subject: [PATCH 11/11] Kni.Tests.WinForms.DX11

---
 KNI.sln                                                         | 2 +-
 Kni.Platform.WinForms.DX11.sln                                  | 2 +-
 ....Tests.WindowsDX11.csproj => Kni.Tests.WinForms.DX11.csproj} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename Tests/{Kni.Tests.WindowsDX11.csproj => Kni.Tests.WinForms.DX11.csproj} (100%)

diff --git a/KNI.sln b/KNI.sln
index 83cc9f28637..b0aedba33fd 100644
--- a/KNI.sln
+++ b/KNI.sln
@@ -77,7 +77,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Pipeline.Editor.net
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Tests.SDL2.GL", "Tests\Kni.Tests.SDL2.GL.csproj", "{DED2DDB6-D4BE-B1B4-2E54-657374732E57}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Tests.WindowsDX11", "Tests\Kni.Tests.WindowsDX11.csproj", "{DED2DDB6-D4BE-656D-2E54-657374732E57}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Tests.WinForms.DX11", "Tests\Kni.Tests.WinForms.DX11.csproj", "{DED2DDB6-D4BE-656D-2E54-657374732E57}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Kni.Platform.WinForms.DX11.sln b/Kni.Platform.WinForms.DX11.sln
index 02a40fbe653..39236537604 100644
--- a/Kni.Platform.WinForms.DX11.sln
+++ b/Kni.Platform.WinForms.DX11.sln
@@ -54,7 +54,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MGCB", "Tools\MonoGame.Cont
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Pipeline.Editor.net8", "Tools\Content.Pipeline.Editor.WinForms\Content.Pipeline.Editor.net8.csproj", "{5212C44E-1573-43C2-85E8-5751A12FBBFD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Tests.WindowsDX11", "Tests\Kni.Tests.WindowsDX11.csproj", "{DED2DDB6-D4BE-656D-2E54-657374732E57}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kni.Tests.WinForms.DX11", "Tests\Kni.Tests.WinForms.DX11.csproj", "{DED2DDB6-D4BE-656D-2E54-657374732E57}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Tests/Kni.Tests.WindowsDX11.csproj b/Tests/Kni.Tests.WinForms.DX11.csproj
similarity index 100%
rename from Tests/Kni.Tests.WindowsDX11.csproj
rename to Tests/Kni.Tests.WinForms.DX11.csproj