Migration all projects to not use shared project but kni instead

devedse · devedse · commit e816857cc28b · 2025-11-30T20:49:12.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -37,6 +37,9 @@ bld/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 
+# KNI/MonoGame generated content
+*/wwwroot/Content/
+
 # Visual Studio 2017 auto generated files
 Generated\ Files/
 
diff --git a/DeveMazeGeneratorCore.MonoGame.Android/DeveMazeGeneratorCore.MonoGame.Android.csproj b/DeveMazeGeneratorCore.MonoGame.Android/DeveMazeGeneratorCore.MonoGame.Android.csproj
@@ -18,24 +18,16 @@
     <DefineConstants>$(DefineConstants)TRACE;OPENGL;BLAZOR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="4.2.9001" />
-    <PackageReference Include="nkast.Xna.Framework" Version="4.2.9001" />
-    <PackageReference Include="nkast.Xna.Framework.Content" Version="4.2.9001" />
-    <PackageReference Include="nkast.Xna.Framework.Devices" Version="4.2.9001" />
-    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.2.9001" />
-    <PackageReference Include="nkast.Xna.Framework.Audio" Version="4.2.9001" />
-    <PackageReference Include="nkast.Xna.Framework.Media" Version="4.2.9001" />
-    <PackageReference Include="nkast.Xna.Framework.Input" Version="4.2.9001" />
-    <PackageReference Include="nkast.Xna.Framework.Game" Version="4.2.9001" />
-    <PackageReference Include="nkast.Xna.Framework.Storage" Version="4.2.9001" />
-    <PackageReference Include="nkast.Xna.Framework.XR" Version="4.2.9001" />
     <PackageReference Include="nkast.Kni.Platform.Android.GL" Version="4.2.9001.1" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="4.2.9001" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Content\" />
   </ItemGroup>
   <ItemGroup>
     <KniContentReference Include="..\DeveMazeGeneratorCore.MonoGame.Content\Content\Content.mgcb" Link="Content\Content.mgcb" />
   </ItemGroup>
-  <Import Project="..\DeveMazeGeneratorCore.MonoGame.Shared\DeveMazeGeneratorCore.MonoGame.Shared.projitems" Label="Shared" />
+  <ItemGroup>
+    <ProjectReference Include="..\DeveMazeGeneratorCore.MonoGame.Core\DeveMazeGeneratorCore.MonoGame.Core.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/DeveMazeGeneratorCore.MonoGame.Blazor/CustomEmbeddedResourceLoader.cs b/DeveMazeGeneratorCore.MonoGame.Blazor/CustomEmbeddedResourceLoader.cs
diff --git a/DeveMazeGeneratorCore.MonoGame.Blazor/DeveMazeGeneratorCore.MonoGame.Blazor.csproj b/DeveMazeGeneratorCore.MonoGame.Blazor/DeveMazeGeneratorCore.MonoGame.Blazor.csproj
@@ -5,6 +5,7 @@
 		<Nullable>disable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+		<KniPlatform>BlazorGL</KniPlatform>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -20,41 +21,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<None Remove="Content\devedse.xnb" />
-		<None Remove="Content\end.xnb" />
-		<None Remove="Content\floor.xnb" />
-		<None Remove="Content\gras.xnb" />
-		<None Remove="Content\lego.xnb" />
-		<None Remove="Content\roof.xnb" />
-		<None Remove="Content\SecularOne20.xnb" />
-		<None Remove="Content\SecularOne20_Compressed.xnb" />
-		<None Remove="Content\SecularOne72.xnb" />
-		<None Remove="Content\SecularOne72_Compressed.xnb" />
-		<None Remove="Content\sky.xnb" />
-		<None Remove="Content\sky2.xnb" />
-		<None Remove="Content\Square.xnb" />
-		<None Remove="Content\start.xnb" />
-		<None Remove="Content\wall.xnb" />
-		<None Remove="Content\wallcustom.xnb" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<EmbeddedResource Include="Content\devedse.xnb" />
-		<EmbeddedResource Include="Content\end.xnb" />
-		<EmbeddedResource Include="Content\floor.xnb" />
-		<EmbeddedResource Include="Content\gras.xnb" />
-		<EmbeddedResource Include="Content\lego.xnb" />
-		<EmbeddedResource Include="Content\roof.xnb" />
-		<EmbeddedResource Include="Content\SecularOne20.xnb" />
-		<EmbeddedResource Include="Content\SecularOne20_Compressed.xnb" />
-		<EmbeddedResource Include="Content\SecularOne72.xnb" />
-		<EmbeddedResource Include="Content\SecularOne72_Compressed.xnb" />
-		<EmbeddedResource Include="Content\sky.xnb" />
-		<EmbeddedResource Include="Content\sky2.xnb" />
-		<EmbeddedResource Include="Content\Square.xnb" />
-		<EmbeddedResource Include="Content\start.xnb" />
-		<EmbeddedResource Include="Content\wall.xnb" />
-		<EmbeddedResource Include="Content\wallcustom.xnb" />
+		<KniContentReference Include="..\DeveMazeGeneratorCore.MonoGame.Content\Content\Content.mgcb">
+			<Link>Content\Content.mgcb</Link>
+		</KniContentReference>
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
@@ -68,22 +37,11 @@
 
 	<ItemGroup>
 		<PackageReference Include="nkast.Kni.Platform.Blazor.GL" Version="4.2.9001.2" />
-		<PackageReference Include="nkast.Xna.Framework" Version="4.2.9001" />
-		<PackageReference Include="nkast.Xna.Framework.Content" Version="4.2.9001" />
-		<PackageReference Include="nkast.Xna.Framework.Devices" Version="4.2.9001" />
-		<PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.2.9001" />
-		<PackageReference Include="nkast.Xna.Framework.Audio" Version="4.2.9001" />
-		<PackageReference Include="nkast.Xna.Framework.Media" Version="4.2.9001" />
-		<PackageReference Include="nkast.Xna.Framework.Input" Version="4.2.9001" />
-		<PackageReference Include="nkast.Xna.Framework.Game" Version="4.2.9001" />
-		<PackageReference Include="nkast.Xna.Framework.Storage" Version="4.2.9001" />
-		<PackageReference Include="nkast.Xna.Framework.XR" Version="4.2.9001" />
-		<!-- <PackageReference Include="tainicom.Wasm.Canvas" Version="3.2.10" />
-	  <PackageReference Include="tainicom.Wasm.XHR" Version="3.2.10" />
-	  <PackageReference Include="tainicom.Wasm.Dom" Version="3.2.10" />
-	  <PackageReference Include="tainicom.Xna.Framework" Version="3.8.9012" /> -->
+		<PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="4.2.9001" />
 	</ItemGroup>
 
-	<Import Project="..\DeveMazeGeneratorCore.MonoGame.Shared\DeveMazeGeneratorCore.MonoGame.Shared.projitems" Label="Shared" />
+	<ItemGroup>
+		<ProjectReference Include="..\DeveMazeGeneratorCore.MonoGame.Core\DeveMazeGeneratorCore.MonoGame.Core.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/DeveMazeGeneratorCore.MonoGame.Blazor/Pages/Index.razor.cs b/DeveMazeGeneratorCore.MonoGame.Blazor/Pages/Index.razor.cs
@@ -34,7 +34,7 @@ public void TickDotNet()
                     BindingFlags.NonPublic);
                 field.SetValue(null, true);
 
-                _game = new TheGame(new CustomEmbeddedResourceLoader(), new IntSize(400, 800), Platform.Blazor);
+                _game = new TheGame(Platform.Blazor);
                 _game.Run();
             }
 
diff --git a/DeveMazeGeneratorCore.MonoGame.Core/DeveMazeGeneratorCore.MonoGame.Core.csproj b/DeveMazeGeneratorCore.MonoGame.Core/DeveMazeGeneratorCore.MonoGame.Core.csproj
@@ -4,10 +4,17 @@
 		<Platforms>AnyCPU;x64</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.4.1">
-			<PrivateAssets>All</PrivateAssets>
-		</PackageReference>
 		<PackageReference Include="System.Text.Json" Version="10.0.0" />
+		<PackageReference Include="nkast.Xna.Framework" Version="4.2.9001" />
+		<PackageReference Include="nkast.Xna.Framework.Content" Version="4.2.9001" />
+		<PackageReference Include="nkast.Xna.Framework.Devices" Version="4.2.9001" />
+		<PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.2.9001" />
+		<PackageReference Include="nkast.Xna.Framework.Audio" Version="4.2.9001" />
+		<PackageReference Include="nkast.Xna.Framework.Media" Version="4.2.9001" />
+		<PackageReference Include="nkast.Xna.Framework.Input" Version="4.2.9001" />
+		<PackageReference Include="nkast.Xna.Framework.Game" Version="4.2.9001" />
+		<PackageReference Include="nkast.Xna.Framework.Storage" Version="4.2.9001" />
+		<PackageReference Include="nkast.Xna.Framework.XR" Version="4.2.9001" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\DeveMazeGeneratorCore\DeveMazeGeneratorCore.csproj" />
diff --git a/DeveMazeGeneratorCore.MonoGame.DesktopGL/DeveMazeGeneratorCore.MonoGame.DesktopGL.csproj b/DeveMazeGeneratorCore.MonoGame.DesktopGL/DeveMazeGeneratorCore.MonoGame.DesktopGL.csproj
@@ -13,13 +13,12 @@
 		<EmbeddedResource Include="Icon.ico" />
 	</ItemGroup>
 	<ItemGroup>
-		<MonoGameContentReference Include="..\DeveMazeGeneratorCore.MonoGame.Content\Content\Content.mgcb">
+		<KniContentReference Include="..\DeveMazeGeneratorCore.MonoGame.Content\Content\Content.mgcb">
 			<Link>Content\Content.mgcb</Link>
-		</MonoGameContentReference>
+		</KniContentReference>
 	</ItemGroup>
 	<ItemGroup>
-	  <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.4.1" />
-	  <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.4.1" />
+		<PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="4.2.9001" />
 	</ItemGroup>
 	<ItemGroup>
 		<TrimmerRootAssembly Include="Microsoft.Xna.Framework.Content.ContentTypeReader" Visible="false" />
@@ -30,4 +29,7 @@
 	<ItemGroup>
 	  <Folder Include="Properties\" />
 	</ItemGroup>
+	<ItemGroup>
+	  <PackageReference Include="nkast.Kni.Platform.SDL2.GL" Version="4.2.9001.1" />
+	</ItemGroup>
 </Project>
diff --git a/DeveMazeGeneratorCore.MonoGame.DesktopGL/Program.cs b/DeveMazeGeneratorCore.MonoGame.DesktopGL/Program.cs
@@ -9,7 +9,7 @@ public static class Program
         [STAThread]
         public static void Main()
         {
-            using (var game = new TheGame(new(2460, 1340), Platform.Desktop))
+            using (var game = new TheGame())
             {
                 game.Run();
             }
diff --git a/DeveMazeGeneratorCore.MonoGame.WindowsDX/DeveMazeGeneratorCore.MonoGame.WindowsDX.csproj b/DeveMazeGeneratorCore.MonoGame.WindowsDX/DeveMazeGeneratorCore.MonoGame.WindowsDX.csproj
@@ -10,16 +10,16 @@
     <ApplicationIcon>Icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <MonoGameContentReference Include="..\DeveMazeGeneratorCore.MonoGame.Content\Content\Content.mgcb">
+    <KniContentReference Include="..\DeveMazeGeneratorCore.MonoGame.Content\Content\Content.mgcb">
       <Link>Content\Content.mgcb</Link>
-    </MonoGameContentReference>
+    </KniContentReference>
   </ItemGroup>
   <ItemGroup>
-    <TrimmerRootAssembly Include="Microsoft.Xna.Framework.Content.ContentTypeReader" Visible="false" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="4.2.9001" />
+    <PackageReference Include="nkast.Kni.Platform.WinForms.DX11" Version="4.2.9001" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.4.1" />
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.4.1" />
+    <TrimmerRootAssembly Include="Microsoft.Xna.Framework.Content.ContentTypeReader" Visible="false" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DeveMazeGeneratorCore.MonoGame.Core\DeveMazeGeneratorCore.MonoGame.Core.csproj" />
diff --git a/DeveMazeGeneratorCore.MonoGame.WindowsDX/Program.cs b/DeveMazeGeneratorCore.MonoGame.WindowsDX/Program.cs
@@ -10,7 +10,7 @@ public static class Program
         [STAThread]
         public static void Main()
         {
-            using (var game = new TheGame(new(2460, 1340), Platform.Desktop))
+            using (var game = new TheGame())
             {
                 game.Run();
             }
diff --git a/DeveMazeGeneratorCore.MonoGame.WindowsUWP/DeveMazeGeneratorCore.MonoGame.WindowsUWP.csproj b/DeveMazeGeneratorCore.MonoGame.WindowsUWP/DeveMazeGeneratorCore.MonoGame.WindowsUWP.csproj
@@ -151,13 +151,13 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.14</Version>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.WindowsUniversal" Version="3.8.0.1641" />
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="4.2.9001" />
+    <PackageReference Include="nkast.Kni.Platform.UAP.DX11" Version="4.2.9001" />
   </ItemGroup>
   <ItemGroup>
-    <MonoGameContentReference Include="..\DeveMazeGeneratorCore.MonoGame.Content\Content\Content.mgcb">
+    <KniContentReference Include="..\DeveMazeGeneratorCore.MonoGame.Content\Content\Content.mgcb">
       <Link>Content\Content.mgcb</Link>
-    </MonoGameContentReference>
+    </KniContentReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DeveMazeGeneratorCore.MonoGame.Core\DeveMazeGeneratorCore.MonoGame.Core.csproj">
diff --git a/DeveMazeGeneratorCoreMonoGame.sln b/DeveMazeGeneratorCoreMonoGame.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.2.32505.173
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11222.15
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeveMazeGeneratorCore.ConsoleApp", "DeveMazeGeneratorCore.ConsoleApp\DeveMazeGeneratorCore.ConsoleApp.csproj", "{0DC50FAF-2CF0-4630-B97E-150234794188}"
 EndProject
@@ -21,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeveMazeGeneratorCore.MonoG
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeveMazeGeneratorCore.MonoGame.WindowsDX", "DeveMazeGeneratorCore.MonoGame.WindowsDX\DeveMazeGeneratorCore.MonoGame.WindowsDX.csproj", "{CABCA8E7-DCC3-43CC-8ABD-F9E707F188A8}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "DeveMazeGeneratorCore.MonoGame.Shared", "DeveMazeGeneratorCore.MonoGame.Shared\DeveMazeGeneratorCore.MonoGame.Shared.shproj", "{EB1B33BF-3F31-40B3-8643-83F4285CABD2}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeveMazeGeneratorCore.MonoGame.Android", "DeveMazeGeneratorCore.MonoGame.Android\DeveMazeGeneratorCore.MonoGame.Android.csproj", "{DE5ACA0D-D621-4707-942F-AE67EE7B1CA1}"
 EndProject
 Global
@@ -68,21 +66,12 @@ Global
 		{CABCA8E7-DCC3-43CC-8ABD-F9E707F188A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CABCA8E7-DCC3-43CC-8ABD-F9E707F188A8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DE5ACA0D-D621-4707-942F-AE67EE7B1CA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE5ACA0D-D621-4707-942F-AE67EE7B1CA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE5ACA0D-D621-4707-942F-AE67EE7B1CA1}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{DE5ACA0D-D621-4707-942F-AE67EE7B1CA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE5ACA0D-D621-4707-942F-AE67EE7B1CA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE5ACA0D-D621-4707-942F-AE67EE7B1CA1}.Release|Any CPU.Deploy.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {93CB3796-A1AF-425F-A7FD-D10B94636CC1}
 	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		DeveMazeGeneratorCore.MonoGame.Shared\DeveMazeGeneratorCore.MonoGame.Shared.projitems*{2226201d-6ecd-4593-b4cd-1950e27826b1}*SharedItemsImports = 5
-		DeveMazeGeneratorCore.MonoGame.Shared\DeveMazeGeneratorCore.MonoGame.Shared.projitems*{de5aca0d-d621-4707-942f-ae67ee7b1ca1}*SharedItemsImports = 5
-		DeveMazeGeneratorCore.MonoGame.Shared\DeveMazeGeneratorCore.MonoGame.Shared.projitems*{eb1b33bf-3f31-40b3-8643-83f4285cabd2}*SharedItemsImports = 13
-	EndGlobalSection
 EndGlobal

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void TickDotNet()`
`34`	`34`	`BindingFlags.NonPublic);`
`35`	`35`	`field.SetValue(null, true);`
`36`	`36`
`37`		`- _game = new TheGame(new CustomEmbeddedResourceLoader(), new IntSize(400, 800), Platform.Blazor);`
	`37`	`+ _game = new TheGame(Platform.Blazor);`
`38`	`38`	`_game.Run();`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public static class Program`
`9`	`9`	`[STAThread]`
`10`	`10`	`public static void Main()`
`11`	`11`	`{`
`12`		`- using (var game = new TheGame(new(2460, 1340), Platform.Desktop))`
	`12`	`+ using (var game = new TheGame())`
`13`	`13`	`{`
`14`	`14`	`game.Run();`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public static class Program`
`10`	`10`	`[STAThread]`
`11`	`11`	`public static void Main()`
`12`	`12`	`{`
`13`		`- using (var game = new TheGame(new(2460, 1340), Platform.Desktop))`
	`13`	`+ using (var game = new TheGame())`
`14`	`14`	`{`
`15`	`15`	`game.Run();`
`16`	`16`	`}`