Skip to content

Bump csproj to net10. #123

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

Merged
CartBlanche merged 15 commits into from
Oct 28, 2026
Merged

Bump csproj to net10. #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d6957dd
Bump csproj to net10.
CartBlanche Sep 8, 2026
5e53886
Bump to latest stable GUM and 3.8.5.1
CartBlanche Oct 19, 2026
f5671db
Re-add Android project and files.
CartBlanche Oct 19, 2026
b8b93af
Merged all of Vic's multi-platform changes.
CartBlanche Oct 19, 2026
3e4f152
Update CI build.
CartBlanche Oct 19, 2026
c371dbf
Update all Android targets to 36.
CartBlanche Oct 19, 2026
4110034
Fix ShipGame build and bump dotnet tools to 3.8.5.1 too
CartBlanche Oct 19, 2026
6552561
Add missing DungeonSlime assets files.
CartBlanche Oct 19, 2026
cb17978
Add missing Program.cs
CartBlanche Oct 19, 2026
bec0b6e
Fix GUM Warnings.
CartBlanche Oct 19, 2026
9e91e87
Fixing more GUM obselete thingies
CartBlanche Oct 19, 2026
7714c85
Removed uncessary Content sub-directories.
CartBlanche Oct 19, 2026
1c9186d
Rename MonoGameGum.GueDeriving to Gum.GueDeriving
CartBlanche Oct 20, 2026
e3823a3
Fix ship, pad and powerup model orientation (Z-up FBX)
CartBlanche Oct 28, 2026
eb60b51
Add .DS_Store to gitignore
CartBlanche Oct 28, 2026
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
645 changes: 334 additions & 311 deletions .github/workflows/dotnet.yml
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,7 @@ Backup*/
UpgradeLog*.XML
.vs/
.user
.vscode/
.vscode/

# macOS
.DS_Store
2 changes: 1 addition & 1 deletion AutoPong/AutoPong.Android/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="AutoPong.Android" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="34" />
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="36" />
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
<application android:label="AutoPong"></application>
</manifest>
3 changes: 2 additions & 1 deletion AutoPong/AutoPong.Android/AutoPong.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.5" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5.1" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.5.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion AutoPong/AutoPong.Core/AutoPong.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5">
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5.1">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion AutoPong/AutoPong.DesktopGL/AutoPong.DesktopGL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5.1" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5.1" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions AutoPong/AutoPong.DesktopVK/AutoPong.DesktopVK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.Native" Version="3.8.5" />
<PackageReference Include="MonoGame.Runtime.Windows.Vulkan" Version="3.8.5" />
<PackageReference Include="MonoGame.Framework.Native" Version="3.8.5.1" />
<PackageReference Include="MonoGame.Runtime.Windows.Vulkan" Version="3.8.5.1" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion AutoPong/AutoPong.WindowsDX/AutoPong.WindowsDX.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.5" />
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.5.1" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5.1" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions AutoPong/AutoPong.WindowsDX12/AutoPong.WindowsDX12.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.Native" Version="3.8.5" />
<PackageReference Include="MonoGame.Runtime.Windows.DX12" Version="3.8.5" />
<PackageReference Include="MonoGame.Framework.Native" Version="3.8.5.1" />
<PackageReference Include="MonoGame.Runtime.Windows.DX12" Version="3.8.5.1" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion AutoPong/AutoPong.iOS/AutoPong.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.5" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5.1" />
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.5.1" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions FuelCell/.config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@
"isRoot": true,
"tools": {
"dotnet-mgcb": {
"version": "3.8.5",
"version": "3.8.5.1",
"commands": [
"mgcb"
]
},
"dotnet-mgcb-editor": {
"version": "3.8.5",
"version": "3.8.5.1",
"commands": [
"mgcb-editor"
]
},
"dotnet-mgcb-editor-linux": {
"version": "3.8.5",
"version": "3.8.5.1",
"commands": [
"mgcb-editor-linux"
]
},
"dotnet-mgcb-editor-windows": {
"version": "3.8.5",
"version": "3.8.5.1",
"commands": [
"mgcb-editor-windows"
]
},
"dotnet-mgcb-editor-mac": {
"version": "3.8.5",
"version": "3.8.5.1",
"commands": [
"mgcb-editor-mac"
]
Expand Down
2 changes: 1 addition & 1 deletion FuelCell/FuelCell.Android/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="FuelCell.Android" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="34" />
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="36" />
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
<application android:label="FuelCell"></application>
</manifest>
6 changes: 3 additions & 3 deletions FuelCell/FuelCell.Android/FuelCell.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-android</TargetFramework>
<TargetFramework>net10.0-android</TargetFramework>
<SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
<OutputType>Exe</OutputType>
<ApplicationId>com.companyname.FuelCell.Android</ApplicationId>
Expand All @@ -18,8 +18,8 @@
<ProjectReference Include="..\FuelCell.Core\FuelCell.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.5" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5.1" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.5.1" />
</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.Core/FuelCell.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5">
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5.1">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions FuelCell/FuelCell.DesktopGL/FuelCell.DesktopGL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<PublishReadyToRun>false</PublishReadyToRun>
<TieredCompilation>false</TieredCompilation>
</PropertyGroup>
Expand All @@ -26,8 +26,8 @@
<ProjectReference Include="..\FuelCell.Core\FuelCell.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5.1" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5.1" />
</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
6 changes: 3 additions & 3 deletions FuelCell/FuelCell.WindowsDX/FuelCell.WindowsDX.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<RollForward>Major</RollForward>
<PublishReadyToRun>false</PublishReadyToRun>
<TieredCompilation>false</TieredCompilation>
Expand All @@ -18,8 +18,8 @@
<ProjectReference Include="..\FuelCell.Core\FuelCell.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.5" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5" />
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.5.1" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5.1" />
</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
6 changes: 3 additions & 3 deletions FuelCell/FuelCell.iOS/FuelCell.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-ios</TargetFramework>
<TargetFramework>net10.0-ios</TargetFramework>
<OutputType>Exe</OutputType>
<SupportedOSPlatformVersion>11.2</SupportedOSPlatformVersion>
<CodesignKey>iPhone Developer</CodesignKey>
Expand All @@ -12,8 +12,8 @@
<ProjectReference Include="..\FuelCell.Core\FuelCell.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5" />
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.5" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5.1" />
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.5.1" />
</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
10 changes: 5 additions & 5 deletions NeonShooter/.config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@
"isRoot": true,
"tools": {
"dotnet-mgcb": {
"version": "3.8.5",
"version": "3.8.5.1",
"commands": [
"mgcb"
]
},
"dotnet-mgcb-editor": {
"version": "3.8.5",
"version": "3.8.5.1",
"commands": [
"mgcb-editor"
]
},
"dotnet-mgcb-editor-linux": {
"version": "3.8.5",
"version": "3.8.5.1",
"commands": [
"mgcb-editor-linux"
]
},
"dotnet-mgcb-editor-windows": {
"version": "3.8.5",
"version": "3.8.5.1",
"commands": [
"mgcb-editor-windows"
]
},
"dotnet-mgcb-editor-mac": {
"version": "3.8.5",
"version": "3.8.5.1",
"commands": [
"mgcb-editor-mac"
]
Expand Down
2 changes: 1 addition & 1 deletion NeonShooter/NeonShooter.Android/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="NeonShooter.Android" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="34" />
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="36" />
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
<application android:label="NeonShooter"></application>
</manifest>
6 changes: 3 additions & 3 deletions NeonShooter/NeonShooter.Android/NeonShooter.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-android</TargetFramework>
<TargetFramework>net10.0-android</TargetFramework>
<SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
<OutputType>Exe</OutputType>
<ApplicationId>com.companyname.NeonShooter.Android</ApplicationId>
Expand All @@ -18,8 +18,8 @@
<ProjectReference Include="..\NeonShooter.Core\NeonShooter.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.5" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5.1" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.8.5.1" />
</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.Core/NeonShooter.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Content\bin\**" />
Expand All @@ -14,7 +14,7 @@
<None Remove="Content\NeonShooter.mgcb" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5">
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5.1">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions NeonShooter/NeonShooter.DesktopGL/NeonShooter.DesktopGL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<PublishReadyToRun>false</PublishReadyToRun>
<TieredCompilation>false</TieredCompilation>
</PropertyGroup>
Expand All @@ -26,8 +26,8 @@
<ProjectReference Include="..\NeonShooter.Core\NeonShooter.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5.1" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5.1" />
</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
6 changes: 3 additions & 3 deletions NeonShooter/NeonShooter.WindowsDX/NeonShooter.WindowsDX.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<RollForward>Major</RollForward>
<PublishReadyToRun>false</PublishReadyToRun>
<TieredCompilation>false</TieredCompilation>
Expand All @@ -18,8 +18,8 @@
<ProjectReference Include="..\NeonShooter.Core\NeonShooter.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.5" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5" />
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.5.1" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5.1" />
</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
6 changes: 3 additions & 3 deletions NeonShooter/NeonShooter.iOS/NeonShooter.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-ios</TargetFramework>
<TargetFramework>net10.0-ios</TargetFramework>
<OutputType>Exe</OutputType>
<SupportedOSPlatformVersion>11.2</SupportedOSPlatformVersion>
<CodesignKey>iPhone Developer</CodesignKey>
Expand All @@ -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" />
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.5" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5.1" />
<PackageReference Include="MonoGame.Framework.iOS" Version="3.8.5.1" />
</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
Loading
Loading