Skip to content

Migrate Android project to use KNI framework #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Migrate Android project to use KNI framework #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
82d611b
Initial plan
Copilot Nov 30, 2025
32099f6
Migrate Android project from MonoGame to KNI framework
Copilot Nov 30, 2025
e816857
Migration all projects to not use shared project but kni instead
devedse Nov 30, 2025
bd2a6bb
Migrate to SLNX
devedse Nov 30, 2025
53ee47b
Completed the whole migration to kni
devedse Nov 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions .github/workflows/githubactionsbuilds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ jobs:
with:
dotnet-version: 8.0.x
- name: Install dependencies
run: dotnet restore DeveMazeGeneratorCore.sln
run: dotnet restore DeveMazeGeneratorCore.slnx
- name: Build
run: dotnet build DeveMazeGeneratorCore.sln -c Release --no-restore /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
run: dotnet build DeveMazeGeneratorCore.slnx -c Release --no-restore /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
- name: Test
run: dotnet test DeveMazeGeneratorCore.sln -c Release --no-restore --verbosity normal
run: dotnet test DeveMazeGeneratorCore.slnx -c Release --no-restore --verbosity normal

build_linux_consoleapp:
needs: generate_version_number
Expand Down Expand Up @@ -208,14 +208,14 @@ jobs:
dotnet tool install --global dotnet-sonarscanner
dotnet tool install --global dotnet-reportgenerator-globaltool
- name: Install dependencies
run: dotnet restore DeveMazeGeneratorCore.sln
run: dotnet restore DeveMazeGeneratorCore.slnx
- name: SonarQube begin
if: github.actor != 'dependabot[bot]'
run: dotnet-sonarscanner begin /k:"DeveMazeGeneratorCore" /o:"devedse-github" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login=${{secrets.SONARQUBETOKEN}} /d:sonar.cs.opencover.reportsPaths=".\DeveMazeGeneratorCore.Tests\TestResults\Coverage\coverage.opencover.xml" /d:sonar.coverage.exclusions="DeveMazeGeneratorCore.ConsoleApp/**/*.cs,DeveMazeGeneratorCore.Tests/**/*.cs,DeveMazeGeneratorCore.Web/wwwroot/divisionmaze/**/*.js"
- name: Build
run: dotnet build DeveMazeGeneratorCore.sln -c Release --no-restore /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
run: dotnet build DeveMazeGeneratorCore.slnx -c Release --no-restore /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
- name: Test
run: dotnet test DeveMazeGeneratorCore.sln --verbosity normal --no-build -c Release --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=cobertura,opencover
run: dotnet test DeveMazeGeneratorCore.slnx --verbosity normal --no-build -c Release --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=cobertura,opencover
- name: SonarQube end
if: github.actor != 'dependabot[bot]'
env:
Expand Down Expand Up @@ -277,11 +277,11 @@ jobs:
with:
dotnet-version: 8.0.x
- name: Install dependencies
run: dotnet restore DeveMazeGeneratorCore.sln
run: dotnet restore DeveMazeGeneratorCore.slnx
- name: Build
run: dotnet build DeveMazeGeneratorCore.sln -c Release --no-restore /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
run: dotnet build DeveMazeGeneratorCore.slnx -c Release --no-restore /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
- name: Test
run: dotnet test DeveMazeGeneratorCore.sln --no-restore --verbosity normal
run: dotnet test DeveMazeGeneratorCore.slnx --no-restore --verbosity normal
- name: Publish
run: dotnet publish ./DeveMazeGeneratorCore.MonoGame.DesktopGL/DeveMazeGeneratorCore.MonoGame.DesktopGL.csproj -r linux-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=true /p:IncludeNativeLibrariesForSelfExtract=true /p:PublishTrimmed=false /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
- name: Copy files that are missing for some reason
Expand Down Expand Up @@ -315,11 +315,11 @@ jobs:
with:
dotnet-version: 8.0.x
- name: Install dependencies
run: dotnet restore DeveMazeGeneratorCore.sln
run: dotnet restore DeveMazeGeneratorCore.slnx
- name: Build
run: dotnet build DeveMazeGeneratorCore.sln -c Release --no-restore /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
run: dotnet build DeveMazeGeneratorCore.slnx -c Release --no-restore /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
- name: Test
run: dotnet test DeveMazeGeneratorCore.sln --no-restore --verbosity normal
run: dotnet test DeveMazeGeneratorCore.slnx --no-restore --verbosity normal
- name: Publish
run: dotnet publish ./DeveMazeGeneratorCore.MonoGame.DesktopGL/DeveMazeGeneratorCore.MonoGame.DesktopGL.csproj -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=true /p:IncludeNativeLibrariesForSelfExtract=true /p:PublishTrimmed=false /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
- name: Copy files that are missing for some reason
Expand Down Expand Up @@ -356,11 +356,11 @@ jobs:
with:
dotnet-version: 8.0.x
- name: Install dependencies
run: dotnet restore DeveMazeGeneratorCore.sln
run: dotnet restore DeveMazeGeneratorCore.slnx
- name: Build
run: dotnet build DeveMazeGeneratorCore.sln -c Release --no-restore /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
run: dotnet build DeveMazeGeneratorCore.slnx -c Release --no-restore /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
- name: Test
run: dotnet test DeveMazeGeneratorCore.sln --no-restore --verbosity normal
run: dotnet test DeveMazeGeneratorCore.slnx --no-restore --verbosity normal
- name: Publish
run: dotnet publish ./DeveMazeGeneratorCore.MonoGame.DesktopGL/DeveMazeGeneratorCore.MonoGame.DesktopGL.csproj -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=true /p:IncludeNativeLibrariesForSelfExtract=true /p:PublishTrimmed=false /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
- name: Copy files that are missing for some reason
Expand Down Expand Up @@ -388,11 +388,11 @@ jobs:
with:
dotnet-version: 8.0.x
- name: Install dependencies
run: dotnet restore DeveMazeGeneratorCore.sln
run: dotnet restore DeveMazeGeneratorCore.slnx
- name: Build
run: dotnet build DeveMazeGeneratorCore.sln -c Release --no-restore /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
run: dotnet build DeveMazeGeneratorCore.slnx -c Release --no-restore /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
- name: Test
run: dotnet test DeveMazeGeneratorCore.sln --no-restore --verbosity normal
run: dotnet test DeveMazeGeneratorCore.slnx --no-restore --verbosity normal
- name: Publish
run: dotnet publish ./DeveMazeGeneratorCore.MonoGame.WindowsDX\DeveMazeGeneratorCore.MonoGame.WindowsDX.csproj -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=true /p:IncludeNativeLibrariesForSelfExtract=true /p:PublishTrimmed=false /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
- name: Copy files that are missing for some reason
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
13 changes: 9 additions & 4 deletions DeveMazeGeneratorCore.MonoGame.Android/DeveMazeGeneratorCore.MonoGame.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-android</TargetFramework>
<TargetFramework>net10.0-android</TargetFramework>
<SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
<OutputType>Exe</OutputType>
<Nullable>enable</Nullable>
<ApplicationId>devemazegeneratorcoremonogame_android.devemazegeneratorcoremonogame_android</ApplicationId>
<ApplicationVersion>1</ApplicationVersion>
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<KniPlatform>Android</KniPlatform>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>$(DefineConstants)TRACE;OPENGL;BLAZOR</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<PublishTrimmed>False</PublishTrimmed>
<RunAOTCompilation>False</RunAOTCompilation>
<DefineConstants>$(DefineConstants)TRACE;OPENGL;BLAZOR</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.4.1" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.4.1" />
<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>
<MonoGameContentReference Include="..\DeveMazeGeneratorCore.MonoGame.Content\Content\Content.mgcb" Link="Content\Content.mgcb" />
<KniContentReference Include="..\DeveMazeGeneratorCore.MonoGame.Content\Content\Content.mgcb" Link="Content\Content.mgcb" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DeveMazeGeneratorCore.MonoGame.Core\DeveMazeGeneratorCore.MonoGame.Core.csproj" />
Expand Down
22 changes: 0 additions & 22 deletions DeveMazeGeneratorCore.MonoGame.Blazor/CustomEmbeddedResourceLoader.cs
View file
Open in desktop

This file was deleted.

58 changes: 8 additions & 50 deletions DeveMazeGeneratorCore.MonoGame.Blazor/DeveMazeGeneratorCore.MonoGame.Blazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<Nullable>disable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<KniPlatform>BlazorGL</KniPlatform>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -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'">
Expand All @@ -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>
2 changes: 1 addition & 1 deletion DeveMazeGeneratorCore.MonoGame.Blazor/Pages/Index.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
13 changes: 10 additions & 3 deletions DeveMazeGeneratorCore.MonoGame.Core/DeveMazeGeneratorCore.MonoGame.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
10 changes: 6 additions & 4 deletions DeveMazeGeneratorCore.MonoGame.DesktopGL/DeveMazeGeneratorCore.MonoGame.DesktopGL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -30,4 +29,7 @@
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="nkast.Kni.Platform.SDL2.GL" Version="4.2.9001.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion DeveMazeGeneratorCore.MonoGame.DesktopGL/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
Loading
Loading