Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
path: artifacts/NeonShooter-Windows/**

- name: Build Windows Binary for Platformer2D
run: dotnet publish Platformer2D/Windows/Platformer2D.csproj -c Release -r win-x64 --self-contained true -o ./artifacts/Platformer2D-Windows
run: dotnet publish Platformer2D/Windows/Windows.csproj -c Release -r win-x64 --self-contained true -o ./artifacts/Platformer2D-Windows
Copy link
Contributor

@CartBlanche CartBlanche Jan 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The other reason why this format is annoying:
Platformer2D/Windows/Windows.csproj
which the previous format also had the issues with, before I changed it to:
Platformer2D/Windows/Platformer2D.csproj
was that when building from VSCode and in particular when running builds from the command line:
dotnet build or dotnet run --project commands
with
dotnet build Platformer2D/Windows/Windows.csproj`

if I want to now build for another platform I have to change the same place twice. eg.

dotnet build Platformer2D/Android/Android.csproj

While if the structure was

dotnet build Platformer2D/Windows/Platformer2D.csproj

you literally have to change 1 thing:

dotnet build Platformer2D/Android/Platformer2D.csproj

It literally halved the amount of typing you had to do when building for a different platform.
The less typing format could have been kept and just the slnx updated and things would have just worked for everyone rather than change sln as well as the build scripts and the command lines builds wouldn't be annoying again.

I can create a new branch with those changes and I'll remember to test the slnx builds this time :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you can test from this PR with an updated layout @CartBlanche , I'm all ears. Just make sure the final solution is readable by VSCode or Visual Studio, as both complained about being able to open the solution.

Should we merge this PR to restore the Platformer, or wait for your update?


- name: Archive Platformer2D
uses: actions/upload-artifact@v6
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
dotnet-version: 9.0.x

- name: Setup for MonoGame
uses: infinitespace-studios/monogame-actions/install-wine@v1.0
uses: monogame/monogame-actions/install-wine@v1

- name: Install MonoPack
run: dotnet tool install --global MonoPack
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
path: artifacts/NeonShooter/*-universal.tar.gz

- name: Build and Package Platformer2D
run: monopack -p Platformer2D/Desktop/Platformer2D.csproj -o ./artifacts/Platformer2D -rids win-x64,linux-x64,osx-x64,osx-arm64 -i Platformer2D/Desktop/Info.plist -c Platformer2D/Desktop/Platformer2D.icns -v --macos-universal --publish-args "-p:PublishSingleFile=true"
run: monopack -p Platformer2D/Desktop/Desktop.csproj -o ./artifacts/Platformer2D -rids win-x64,linux-x64,osx-x64,osx-arm64 -i Platformer2D/Desktop/Info.plist -c Platformer2D/Desktop/Platformer2D.icns -v --macos-universal --publish-args "-p:PublishSingleFile=true"

- name: Archive Platformer2D Windows
uses: actions/upload-artifact@v6
Expand Down Expand Up @@ -293,7 +293,7 @@ jobs:
path: NeonShooter/NeonShooter.Android/bin/Release/net9.0-android/**/*-Signed.apk

- name: Build Android Binary for Platformer2D
run: dotnet build Platformer2D/Android/Platformer2D.csproj -c Release
run: dotnet build Platformer2D/Android/Android.csproj -c Release

- name: Archive Platformer2D Android
uses: actions/upload-artifact@v6
Expand Down
4 changes: 2 additions & 2 deletions AutoPong/AutoPong.Android/AutoPong.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.5-preview.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />
Expand Down
2 changes: 1 addition & 1 deletion AutoPong/AutoPong.Core/AutoPong.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5-preview.2">
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5-preview.*">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions AutoPong/AutoPong.DesktopGL/AutoPong.DesktopGL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />
Expand Down
4 changes: 2 additions & 2 deletions AutoPong/AutoPong.WindowsDX/AutoPong.WindowsDX.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />
Expand Down
4 changes: 2 additions & 2 deletions AutoPong/AutoPong.iOS/AutoPong.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.5-preview.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />
Expand Down
4 changes: 2 additions & 2 deletions FuelCell/FuelCell.Android/FuelCell.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<ProjectReference Include="..\FuelCell.Core\FuelCell.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.5-preview.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />
Expand Down
2 changes: 1 addition & 1 deletion FuelCell/FuelCell.Core/FuelCell.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5-preview.2">
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5-preview.*">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions FuelCell/FuelCell.DesktopGL/FuelCell.DesktopGL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<ProjectReference Include="..\FuelCell.Core\FuelCell.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />
Expand Down
4 changes: 2 additions & 2 deletions FuelCell/FuelCell.WindowsDX/FuelCell.WindowsDX.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<ProjectReference Include="..\FuelCell.Core\FuelCell.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />
Expand Down
4 changes: 2 additions & 2 deletions FuelCell/FuelCell.iOS/FuelCell.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<ProjectReference Include="..\FuelCell.Core\FuelCell.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.5-preview.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />
Expand Down
4 changes: 2 additions & 2 deletions NeonShooter/NeonShooter.Android/NeonShooter.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<ProjectReference Include="..\NeonShooter.Core\NeonShooter.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.5-preview.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />
Expand Down
2 changes: 1 addition & 1 deletion NeonShooter/NeonShooter.Core/NeonShooter.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<None Remove="Content\NeonShooter.mgcb" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5-preview.2">
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5-preview.*">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<ProjectReference Include="..\NeonShooter.Core\NeonShooter.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<ProjectReference Include="..\NeonShooter.Core\NeonShooter.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />
Expand Down
4 changes: 2 additions & 2 deletions NeonShooter/NeonShooter.iOS/NeonShooter.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<MonoGameContentReference Include="..\NeonShooter.Core\Content\NeonShooter.mgcb" Link="Content\NeonShooter.mgcb" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.5-preview.2" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.5-preview.*" />
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
<Message Text="Restoring dotnet tools (this might take a while depending on your internet speed and should only happen upon building your project for the first time, or after upgrading MonoGame, or clearing your nuget cache)" Importance="High" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ProjectReference Include="..\Core\Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.5-preview.*" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Platformer2D/Core/Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<RootNamespace>Platformer2D.Core</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.Native" Version="3.8.*">
<PackageReference Include="MonoGame.Framework.Native" Version="3.8.5-preview.*">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<ProjectReference Include="..\Core\Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
</ItemGroup>
</Project>
63 changes: 0 additions & 63 deletions Platformer2D/Platformer2D.sln

This file was deleted.

17 changes: 17 additions & 0 deletions Platformer2D/Platformer2D.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Solution>
<Configurations>
<Platform Name="Any CPU" />
<Platform Name="x64" />
</Configurations>
<Folder Name="/Platforms/">
<Project Path="Android/Android.csproj">
<Deploy />
</Project>
<Project Path="Desktop/Desktop.csproj" />
<Project Path="iOS/iOS.csproj">
<Deploy />
</Project>
<Project Path="Windows/Windows.csproj" />
</Folder>
<Project Path="Core/Core.csproj" />
</Solution>
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<ProjectReference Include="..\Core\Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ProjectReference Include="..\Core\Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.*" />
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.5-preview.*" />
</ItemGroup>
</Project>
Loading
Loading