csproj Naming Refactor...

.github/workflows/dotnet.yml

@@ -36,7 +36,7 @@ jobs:
         path: artifacts/BasicCameraExample-Windows/**
 
     - name: Build Windows Binary for AutoPong
-      run: dotnet publish AutoPong/AutoPong.WindowsDX/AutoPong.WindowsDX.csproj -c Release -r win-x64 --self-contained true -o ./artifacts/AutoPong-Windows
+      run: dotnet publish AutoPong/Windows/AutoPong.csproj -c Release -r win-x64 --self-contained true -o ./artifacts/AutoPong-Windows
 
     - name: Archive AutoPong
       uses: actions/upload-artifact@v6
@@ -45,7 +45,7 @@ jobs:
         path: artifacts/AutoPong-Windows/**
 
     - name: Build Windows Binary for FuelCell
-      run: dotnet publish FuelCell/FuelCell.WindowsDX/FuelCell.WindowsDX.csproj -c Release -r win-x64 --self-contained true -o ./artifacts/FuelCell-Windows
+      run: dotnet publish FuelCell/Windows/FuelCell.csproj -c Release -r win-x64 --self-contained true -o ./artifacts/FuelCell-Windows
 
     - name: Archive FuelCell
       uses: actions/upload-artifact@v6
@@ -54,7 +54,7 @@ jobs:
         path: artifacts/FuelCell-Windows/**
 
     - name: Build Windows Binary for NeonShooter
-      run: dotnet publish NeonShooter/NeonShooter.WindowsDX/NeonShooter.WindowsDX.csproj -c Release -r win-x64 --self-contained true -o ./artifacts/NeonShooter-Windows
+      run: dotnet publish NeonShooter/Windows/NeonShooter.csproj -c Release -r win-x64 --self-contained true -o ./artifacts/NeonShooter-Windows
 
     - name: Archive NeonShooter
       uses: actions/upload-artifact@v6
@@ -72,10 +72,10 @@ jobs:
         path: artifacts/Platformer2D-Windows/**
 
     - name: Build ShipGame Content Processor in Release mode
-      run: dotnet build ShipGame/ShipGame.Dependencies/NormalMappingModelProcessor/NormalMappingModelProcessor.csproj --configuration Release
+      run: dotnet build ShipGame/Dependencies/NormalMappingModelProcessor/NormalMappingModelProcessor.csproj --configuration Release
 
     - name: Build Windows Binary for ShipGame
-      run: dotnet publish ShipGame/ShipGame.WindowsDX/ShipGame.WindowsDX.csproj -c Release -r win-x64 --self-contained true -o ./artifacts/ShipGame-Windows
+      run: dotnet publish ShipGame/Windows/ShipGame.csproj -c Release -r win-x64 --self-contained true -o ./artifacts/ShipGame-Windows
 
     - name: Archive ShipGame
       uses: actions/upload-artifact@v6
@@ -84,7 +84,7 @@ jobs:
         path: artifacts/ShipGame-Windows/**
 
     - name: Build Windows Binary for DungeonSlime
-      run: dotnet publish Tutorials/learn-monogame-2d/src/27-Conclusion/DungeonSlime/Platforms/Windows/DungeonSlime.WindowsDX.csproj -c Release -r win-x64 --self-contained true -o ./artifacts/DungeonSlime-Windows
+      run: dotnet publish Tutorials/learn-monogame-2d/src/27-Conclusion/DungeonSlime/Platforms/Windows/DungeonSlime.csproj -c Release -r win-x64 --self-contained true -o ./artifacts/DungeonSlime-Windows
 
     - name: Archive DungeonSlime
       uses: actions/upload-artifact@v6
@@ -117,7 +117,7 @@ jobs:
 
     # AutoPong Desktop build is currently disabled due to issues with packaging process
     - name: Build and Package AutoPong
-      run: monopack -p AutoPong/AutoPong.DesktopGL/AutoPong.DesktopGL.csproj -o ./artifacts/AutoPong -rids win-x64,linux-x64,osx-x64,osx-arm64 -i AutoPong/AutoPong.DesktopGL/Info.plist -c AutoPong/AutoPong.DesktopGL/AutoPong.DesktopGL.icns -v --macos-universal --publish-args "-p:PublishSingleFile=true"
+      run: monopack -p AutoPong/Desktop/AutoPong.csproj -o ./artifacts/AutoPong -rids win-x64,linux-x64,osx-x64,osx-arm64 -i AutoPong/Desktop/Info.plist -c AutoPong/Desktop/AutoPong.icns -v --macos-universal
 
     - name: Archive AutoPong Windows
       uses: actions/upload-artifact@v6
@@ -138,7 +138,7 @@ jobs:
         path: artifacts/AutoPong/*-universal.tar.gz
 
     - name: Build and Package FuelCell
-      run: monopack -p FuelCell/FuelCell.DesktopGL/FuelCell.DesktopGL.csproj -o ./artifacts/FuelCell -rids win-x64,linux-x64,osx-x64,osx-arm64 -i FuelCell/FuelCell.DesktopGL/Info.plist -c FuelCell/FuelCell.DesktopGL/FuelCell.DesktopGL.icns -v --macos-universal --publish-args "-p:PublishSingleFile=true"
+      run: monopack -p FuelCell/Desktop/FuelCell.csproj -o ./artifacts/FuelCell -rids win-x64,linux-x64,osx-x64,osx-arm64 -i FuelCell/Desktop/Info.plist -c FuelCell/Desktop/FuelCell.icns -v --macos-universal
 
     - name: Archive FuelCell Windows
       uses: actions/upload-artifact@v6
@@ -159,7 +159,7 @@ jobs:
         path: artifacts/FuelCell/*-universal.tar.gz
 
     - name: Build and Package NeonShooter
-      run: monopack -p NeonShooter/NeonShooter.DesktopGL/NeonShooter.DesktopGL.csproj -o ./artifacts/NeonShooter -rids win-x64,linux-x64,osx-x64,osx-arm64 -i NeonShooter/NeonShooter.DesktopGL/Info.plist -c NeonShooter/NeonShooter.DesktopGL/NeonShooter.DesktopGL.icns -v --macos-universal --publish-args "-p:PublishSingleFile=true"
+      run: monopack -p NeonShooter/Desktop/NeonShooter.csproj -o ./artifacts/NeonShooter -rids win-x64,linux-x64,osx-x64,osx-arm64 -i NeonShooter/Desktop/Info.plist -c NeonShooter/Desktop/NeonShooter.icns -v --macos-universal
 
     - name: Archive NeonShooter Windows
       uses: actions/upload-artifact@v6
@@ -222,10 +222,10 @@ jobs:
         path: artifacts/learn-monogame-2d/*-universal.tar.gz
 
     - name: Build ShipGame Content Processor
-      run: dotnet build ShipGame/ShipGame.Dependencies/NormalMappingModelProcessor/NormalMappingModelProcessor.csproj --configuration Release
+      run: dotnet build ShipGame/Dependencies/NormalMappingModelProcessor/NormalMappingModelProcessor.csproj --configuration Release
 
     - name: Build and Package ShipGame
-      run: monopack -p ShipGame/ShipGame.DesktopGL/ShipGame.DesktopGL.csproj -o ./artifacts/ShipGame -rids win-x64,linux-x64,osx-x64,osx-arm64 -i ShipGame/ShipGame.DesktopGL/Info.plist -c ShipGame/ShipGame.DesktopGL/ShipGame.DesktopGL.icns -v --macos-universal --publish-args "-p:PublishSingleFile=true"
+      run: monopack -p ShipGame/Desktop/ShipGame.csproj -o ./artifacts/ShipGame -rids win-x64,linux-x64,osx-x64,osx-arm64 -i ShipGame/Desktop/Info.plist -c ShipGame/Desktop/ShipGame.icns -v --macos-universal
 
     - name: Archive ShipGame Windows
       uses: actions/upload-artifact@v6
@@ -266,31 +266,31 @@ jobs:
 
     # Android builds for all projects
     - name: Build Android Binary for AutoPong
-      run: dotnet build AutoPong/AutoPong.Android/AutoPong.Android.csproj -c Release
+      run: dotnet build AutoPong/Android/AutoPong.csproj -c Release
 
     - name: Archive AutoPong Android
       uses: actions/upload-artifact@v6
       with:
         name: Android-AutoPong
-        path: AutoPong/AutoPong.Android/bin/Release/net9.0-android/**/*-Signed.apk
+        path: AutoPong/Android/bin/Release/net9.0-android/**/*-Signed.apk
 
     - name: Build Android Binary for FuelCell
-      run: dotnet build FuelCell/FuelCell.Android/FuelCell.Android.csproj -c Release
+      run: dotnet build FuelCell/Android/FuelCell.csproj -c Release
 
     - name: Archive FuelCell Android
       uses: actions/upload-artifact@v6
       with:
         name: Android-FuelCell
-        path: FuelCell/FuelCell.Android/bin/Release/net9.0-android/**/*-Signed.apk
+        path: FuelCell/Android/bin/Release/net9.0-android/**/*-Signed.apk
 
     - name: Build Android Binary for NeonShooter
-      run: dotnet build NeonShooter/NeonShooter.Android/NeonShooter.Android.csproj -c Release
+      run: dotnet build NeonShooter/Android/NeonShooter.csproj -c Release
 
     - name: Archive NeonShooter Android
       uses: actions/upload-artifact@v6
       with:
         name: Android-NeonShooter
-        path: NeonShooter/NeonShooter.Android/bin/Release/net9.0-android/**/*-Signed.apk
+        path: NeonShooter/Android/bin/Release/net9.0-android/**/*-Signed.apk
 
     - name: Build Android Binary for Platformer2D
       run: dotnet build Platformer2D/Android/Platformer2D.csproj -c Release
@@ -311,16 +311,16 @@ jobs:
         path: Tutorials/learn-monogame-2d/src/27-Conclusion/DungeonSlime/Platforms/Android/bin/Release/net9.0-android/**/*-Signed.apk
 
     - name: Build ShipGame Content Processor in Release mode
-      run: dotnet build ShipGame/ShipGame.Dependencies/NormalMappingModelProcessor/NormalMappingModelProcessor.csproj --configuration Release
+      run: dotnet build ShipGame/Dependencies/NormalMappingModelProcessor/NormalMappingModelProcessor.csproj --configuration Release
 
     - name: Build Android Binary for ShipGame
-      run: dotnet build ShipGame/ShipGame.Android/ShipGame.Android.csproj -c Release
+      run: dotnet build ShipGame/Android/ShipGame.csproj -c Release
 
     - name: Archive ShipGame Android
       uses: actions/upload-artifact@v6
       with:
         name: Android-ShipGame
-        path: ShipGame/ShipGame.Android/bin/Release/net9.0-android/**/*-Signed.apk
+        path: ShipGame/Android/bin/Release/net9.0-android/**/*-Signed.apk
 
   deploy:
       name: Deploy

AutoPong/.config/dotnet-tools.json

@@ -3,31 +3,31 @@
   "isRoot": true,
   "tools": {
     "dotnet-mgcb": {
-      "version": "3.8.5-preview.2",
+      "version": "3.8.5-preview.3",
       "commands": [
         "mgcb"
       ]
     },
     "dotnet-mgcb-editor": {
-      "version": "3.8.5-preview.2",
+      "version": "3.8.5-preview.3",
       "commands": [
         "mgcb-editor"
       ]
     },
     "dotnet-mgcb-editor-linux": {
-      "version": "3.8.5-preview.2",
+      "version": "3.8.5-preview.3",
       "commands": [
         "mgcb-editor-linux"
       ]
     },
     "dotnet-mgcb-editor-windows": {
-      "version": "3.8.5-preview.2",
+      "version": "3.8.5-preview.3",
       "commands": [
         "mgcb-editor-windows"
       ]
     },
     "dotnet-mgcb-editor-mac": {
-      "version": "3.8.5-preview.2",
+      "version": "3.8.5-preview.3",
       "commands": [
         "mgcb-editor-mac"
       ]

AutoPong/.vscode/launch.json

@@ -13,11 +13,11 @@
 			"preLaunchTask": "Debug Android Build",
         },
         {
-            "name": "DesktopGL Debug",
+            "name": "Desktop Debug",
             "type": "coreclr",
 			"request": "launch",
-			"preLaunchTask": "Debug DesktopGL Build",
-			"program": "${workspaceFolder}/AutoPong.DesktopGL/bin/Debug/net8.0/AutoPong.DesktopGL.exe",
+			"preLaunchTask": "Debug Desktop Build",
+			"program": "${workspaceFolder}/Desktop/bin/Debug/net9.0/AutoPong",
         },
         {
             "name": "iOS Debug",
@@ -26,11 +26,11 @@
             "preLaunchTask": "maui: Build",
         },
         {
-            "name": "WindowsDX Debug",
+            "name": "Windows Debug",
             "type": "coreclr",
 			"request": "launch",
-			"preLaunchTask": "Debug WindowsDX Build",
-			"program": "${workspaceFolder}/AutoPong.WindowsDX/bin/Debug/net8.0-windows/AutoPong.WindowsDX.exe",
+			"preLaunchTask": "Debug Windows Build",
+			"program": "${workspaceFolder}/Windows/bin/Debug/net9.0-windows/AutoPong.exe",
         }
     ]
 }

AutoPong/.vscode/tasks.json

@@ -4,22 +4,22 @@
         {
 			"label": "Debug Android Build",
 			"type": "shell",
-			"command": "dotnet build -p:Configuration=Debug ${workspaceFolder}/AutoPong.Android/AutoPong.Android.csproj \"/t:Install;_Run\" /p:AndroidAttachDebugger=true /p:AndroidSdbHostPort=10000",
+			"command": "dotnet build -p:Configuration=Debug ${workspaceFolder}/Android/AutoPong.csproj \"/t:Install;_Run\" /p:AndroidAttachDebugger=true /p:AndroidSdbHostPort=10000",
 		},
 		{
-			"label": "Debug DesktopGL Build",
+			"label": "Debug Desktop Build",
 			"type": "shell",
-			"command": "dotnet build -p:Configuration=Debug ${workspaceFolder}/AutoPong.DesktopGL/AutoPong.DesktopGL.csproj"
+			"command": "dotnet build -p:Configuration=Debug ${workspaceFolder}/Desktop/AutoPong.csproj"
 		},
         {
 			"label": "Debug iOS Build",
 			"type": "shell",
-			"command": "dotnet build -p:Configuration=Debug ${workspaceFolder}/AutoPong.iOS/AutoPong.iOS.csproj"
+			"command": "dotnet build -p:Configuration=Debug ${workspaceFolder}/iOS/AutoPong.csproj"
 		},
         {
-			"label": "Debug WindowsDX Build",
+			"label": "Debug Windows Build",
 			"type": "shell",
-			"command": "dotnet build -p:Configuration=Debug ${workspaceFolder}/AutoPong.WindowsDX/AutoPong.WindowsDX.csproj"
+			"command": "dotnet build -p:Configuration=Debug ${workspaceFolder}/Windows/AutoPong.csproj"
 		},
 	]
 }

AutoPong/AutoPong.Android/AutoPong.Android.csproj → AutoPong/Android/AutoPong.csproj

@@ -8,11 +8,11 @@
     <SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
+    <ProjectReference Include="..\Core\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.3" />
+    <PackageReference Include="MonoGame.Framework.Android" Version="3.8.5-preview.3" />
   </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" />

AutoPong/AutoPong.slnx

@@ -0,0 +1,19 @@
+<Solution>
+  <Folder Name="/Android/">
+    <Project Path="Android/AutoPong.csproj">
+      <Deploy />
+    </Project>
+  </Folder>
+  <Folder Name="/Desktop/">
+    <Project Path="Desktop/AutoPong.csproj" />
+  </Folder>
+  <Folder Name="/iOS/">
+    <Project Path="iOS/AutoPong.csproj">
+      <Deploy />
+    </Project>
+  </Folder>
+  <Folder Name="/Windows/">
+    <Project Path="Windows/AutoPong.csproj" />
+  </Folder>
+  <Project Path="Core/Core.csproj" />
+</Solution>

AutoPong/AutoPong.Core/AutoPong.Core.csproj → AutoPong/Core/Core.csproj

@@ -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.3">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>

AutoPong/AutoPong.DesktopGL/AutoPong.DesktopGL.csproj → AutoPong/Desktop/AutoPong.csproj

@@ -19,11 +19,11 @@
     <EmbeddedResource Include="Icon.bmp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\AutoPong.Core\AutoPong.Core.csproj" />
+    <ProjectReference Include="..\Core\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.3" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-preview.3" />
   </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" />

AutoPong/AutoPong.DesktopGL/Info.plist → AutoPong/Desktop/Info.plist

@@ -3,19 +3,19 @@
 <plist version="1.0">
 <dict>
     <key>CFBundleName</key>
-    <string>AutoPong.DesktopGL</string>
+    <string>AutoPong</string>
     <key>CFBundleDisplayName</key>
-    <string>AutoPong.DesktopGL</string>
+    <string>AutoPong</string>
     <key>CFBundleIdentifier</key>
     <string>com.monogame.AutoPong</string>
     <key>CFBundleVersion</key>
     <string>1.0</string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleExecutable</key>
-    <string>AutoPong.DesktopGL</string>
+    <string>AutoPong</string>
     <key>CFBundleIconFile</key>
-    <string>AutoPong.DesktopGL.icns</string>
+    <string>AutoPong.icns</string>
     <key>NSHighResolutionCapable</key>
     <true/>
 </dict>

AutoPong/AutoPong.DesktopGL/app.manifest → AutoPong/Desktop/app.manifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="AutoPong.DesktopGL"/>
+  <assemblyIdentity version="1.0.0.0" name="AutoPong"/>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">