[CatapultNetWars] Add ContentPipeline and remove xnbs. Fix build on Android.

CatapultNetWars/.vscode/launch.json

@@ -22,6 +22,28 @@
             "cwd": "${workspaceFolder}",
             "console": "internalConsole",
             "stopAtEntry": false
+        },
+        {
+            "name": "Launch Android",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-android",
+            "program": "${workspaceFolder}/Platforms/Android/bin/Debug/net8.0-android/CatapultNetWars.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+        {
+            "name": "Launch iOS",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-ios",
+            "program": "${workspaceFolder}/Platforms/iOS/bin/Debug/net8.0-ios/CatapultNetWars.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "console": "internalConsole",
+            "stopAtEntry": false
         }
     ]
 }

CatapultNetWars/.vscode/tasks.json

@@ -42,6 +42,48 @@
                 "clear": false
             },
             "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "build-android",
+            "command": "dotnet",
+            "type": "shell",
+            "args": [
+                "build",
+                "${workspaceFolder}/Platforms/Android/CatapultNetWars.Android.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "group": "build",
+            "presentation": {
+                "echo": true,
+                "reveal": "silent",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
+            },
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "build-ios",
+            "command": "dotnet",
+            "type": "shell",
+            "args": [
+                "build",
+                "${workspaceFolder}/Platforms/iOS/CatapultNetWars.iOS.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "group": "build",
+            "presentation": {
+                "echo": true,
+                "reveal": "silent",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
+            },
+            "problemMatcher": "$msCompile"
         }
     ]
 }

CatapultNetWars/Core/Content/Content.mgcb

@@ -0,0 +1,188 @@
+#----------------------------- Global Properties ----------------------------#
+
+/outputDir:bin/$(Platform)
+/intermediateDir:obj/$(Platform)
+/platform:DesktopGL
+/config:$(Configuration)
+/profile:HiDef
+/compress:False
+
+#-------------------------------- References --------------------------------#
+
+
+
+#---------------------------------- Content ---------------------------------#
+
+#begin Fonts/HUDFont.spritefont
+/importer:FontDescriptionImporter
+/processor:FontDescriptionProcessor
+/build:Fonts/HUDFont.spritefont
+
+#begin Fonts/MenuFont.spritefont
+/importer:FontDescriptionImporter
+/processor:FontDescriptionProcessor
+/build:Fonts/MenuFont.spritefont
+
+#begin Sounds/BoulderHit.wav
+/importer:WavImporter
+/processor:SoundEffectProcessor
+/processorParam:Quality=Best
+/build:Sounds/BoulderHit.wav
+
+#begin Sounds/CatapultExplosion.wav
+/importer:WavImporter
+/processor:SoundEffectProcessor
+/processorParam:Quality=Best
+/build:Sounds/CatapultExplosion.wav
+
+#begin Sounds/CatapultFire.wav
+/importer:WavImporter
+/processor:SoundEffectProcessor
+/processorParam:Quality=Best
+/build:Sounds/CatapultFire.wav
+
+#begin Sounds/Lose.wav
+/importer:WavImporter
+/processor:SoundEffectProcessor
+/processorParam:Quality=Best
+/build:Sounds/Lose.wav
+
+#begin Sounds/RopeStretch.wav
+/importer:WavImporter
+/processor:SoundEffectProcessor
+/processorParam:Quality=Best
+/build:Sounds/RopeStretch.wav
+
+#begin Sounds/Win.wav
+/importer:WavImporter
+/processor:SoundEffectProcessor
+/processorParam:Quality=Best
+/build:Sounds/Win.wav
+
+#begin Textures/Ammo/rock_ammo.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Ammo/rock_ammo.png
+
+#begin Textures/Backgrounds/blank.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Backgrounds/blank.png
+
+#begin Textures/Backgrounds/cloud1.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Backgrounds/cloud1.png
+
+#begin Textures/Backgrounds/cloud2.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Backgrounds/cloud2.png
+
+#begin Textures/Backgrounds/defeat.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Backgrounds/defeat.png
+
+#begin Textures/Backgrounds/gameplay_screen.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Backgrounds/gameplay_screen.png
+
+#begin Textures/Backgrounds/instructions.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Backgrounds/instructions.png
+
+#begin Textures/Backgrounds/mountain.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Backgrounds/mountain.png
+
+#begin Textures/Backgrounds/sky.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Backgrounds/sky.png
+
+#begin Textures/Backgrounds/title_screen.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Backgrounds/title_screen.png
+
+#begin Textures/Backgrounds/victory.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Backgrounds/victory.png
+
+#begin Textures/HUD/Arrow.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/HUD/Arrow.png
+
+#begin Textures/HUD/ammoType.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/HUD/ammoType.png
+
+#begin Textures/HUD/hudBackground.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/HUD/hudBackground.png
+
+#begin Textures/HUD/windArrow.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/HUD/windArrow.png
+
+#begin Textures/Catapults/Fire_Miss/fire_miss.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Catapults/Fire_Miss/fire_miss.png
+
+#begin Textures/Catapults/Hit_Smoke/smoke.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Catapults/Hit_Smoke/smoke.png
+
+#begin Textures/Catapults/Blue/blueDestroyed/blueCatapult_destroyed.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Catapults/Blue/blueDestroyed/blueCatapult_destroyed.png
+
+#begin Textures/Catapults/Blue/blueFire/blueCatapult_fire.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Catapults/Blue/blueFire/blueCatapult_fire.png
+
+#begin Textures/Catapults/Blue/blueIdle/blueIdle.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Catapults/Blue/blueIdle/blueIdle.png
+
+#begin Textures/Catapults/Blue/bluePullback/blueCatapult_Pullback.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Catapults/Blue/bluePullback/blueCatapult_Pullback.png
+
+#begin Textures/Catapults/Red/redDestroyed/redCatapult_destroyed.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Catapults/Red/redDestroyed/redCatapult_destroyed.png
+
+#begin Textures/Catapults/Red/redFire/redCatapult_fire.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Catapults/Red/redFire/redCatapult_fire.png
+
+#begin Textures/Catapults/Red/redIdle/redIdle.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Catapults/Red/redIdle/redIdle.png
+
+#begin Textures/Catapults/Red/redPullback/redCatapult_Pullback.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Catapults/Red/redPullback/redCatapult_Pullback.png
+
+#begin Textures/Catapults/AnimationsDef.xml
+/copy:Textures/Catapults/AnimationsDef.xml

CatapultNetWars/Core/Content/Fonts/HUDFont.spritefont

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file contains an xml description of a font, and will be read by the XNA
+Framework Content Pipeline. Follow the comments to customize the appearance
+of the font in your game, and to change the characters which are available to draw
+with.
+-->
+<XnaContent xmlns:Graphics="Microsoft.Xna.Framework.Content.Pipeline.Graphics">
+  <Asset Type="Graphics:FontDescription">
+
+    <!--
+    Modify this string to change the font that will be imported.
+    -->
+    <FontName>Tahoma</FontName>
+
+    <!--
+    Size is a float value, measured in points. Modify this value to change
+    the size of the font.
+    -->
+    <Size>18</Size>
+
+    <!--
+    Spacing is a float value, measured in pixels. Modify this value to change
+    the amount of spacing in between characters.
+    -->
+    <Spacing>0</Spacing>
+
+    <!--
+    UseKerning controls the layout of the font. If this value is true, kerning information
+    will be used when placing characters.
+    -->
+    <UseKerning>true</UseKerning>
+
+    <!--
+    Style controls the style of the font. Valid entries are "Regular", "Bold", "Italic",
+    and "Bold, Italic", and are case sensitive.
+    -->
+    <Style>Regular</Style>
+
+    <!--
+    If you uncomment this line, the default character will be substituted if you draw
+    or measure text that contains characters which were not included in the font.
+    -->
+    <!-- <DefaultCharacter>*</DefaultCharacter> -->
+
+    <!--
+    CharacterRegions control what letters are available in the font. Every
+    character from Start to End will be built and made available for drawing. The
+    default range is from 32, (ASCII space), to 126, ('~'), covering the basic Latin
+    character set. The characters are ordered according to the Unicode standard.
+    See the documentation for more information.
+    -->
+    <CharacterRegions>
+      <CharacterRegion>
+        <Start>&#32;</Start>
+        <End>&#126;</End>
+      </CharacterRegion>
+    </CharacterRegions>
+  </Asset>
+</XnaContent>

CatapultNetWars/Core/Content/Fonts/MenuFont.spritefont

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file contains an xml description of a font, and will be read by the XNA
+Framework Content Pipeline. Follow the comments to customize the appearance
+of the font in your game, and to change the characters which are available to draw
+with.
+-->
+<XnaContent xmlns:Graphics="Microsoft.Xna.Framework.Content.Pipeline.Graphics">
+  <Asset Type="Graphics:FontDescription">
+
+    <!--
+    Modify this string to change the font that will be imported.
+    -->
+    <FontName>Tahoma</FontName>
+
+    <!--
+    Size is a float value, measured in points. Modify this value to change
+    the size of the font.
+    -->
+    <Size>24</Size>
+
+    <!--
+    Spacing is a float value, measured in pixels. Modify this value to change
+    the amount of spacing in between characters.
+    -->
+    <Spacing>0</Spacing>
+
+    <!--
+    UseKerning controls the layout of the font. If this value is true, kerning information
+    will be used when placing characters.
+    -->
+    <UseKerning>true</UseKerning>
+
+    <!--
+    Style controls the style of the font. Valid entries are "Regular", "Bold", "Italic",
+    and "Bold, Italic", and are case sensitive.
+    -->
+    <Style>Regular</Style>
+
+    <!--
+    If you uncomment this line, the default character will be substituted if you draw
+    or measure text that contains characters which were not included in the font.
+    -->
+    <!-- <DefaultCharacter>*</DefaultCharacter> -->
+
+    <!--
+    CharacterRegions control what letters are available in the font. Every
+    character from Start to End will be built and made available for drawing. The
+    default range is from 32, (ASCII space), to 126, ('~'), covering the basic Latin
+    character set. The characters are ordered according to the Unicode standard.
+    See the documentation for more information.
+    -->
+    <CharacterRegions>
+      <CharacterRegion>
+        <Start>&#32;</Start>
+        <End>&#126;</End>
+      </CharacterRegion>
+    </CharacterRegions>
+  </Asset>
+</XnaContent>

CatapultNetWars/Core/Content/Textures/Catapults/AnimationsDef.xml

@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Animations>
-  <!--Player animation definitions-->
-  <Definition FrameWidth="75" FrameHeight="60"
-              SheetRows="2" SheetColumns="15"
-              Speed="30" SplitFrame="20"
-              SheetName="Textures/Catapults/Blue/blueFire/blueCatapult_fire"
-              Alias="Fire" IsAI="false"/>
-  <Definition FrameWidth="75" FrameHeight="60"
-              SheetRows="1" SheetColumns="18"
-              Speed="30"
-              SheetName="Textures/Catapults/Blue/bluePullback/blueCatapult_Pullback"
-              Alias="Aim" IsAI="false"/>
-
-  <Definition FrameWidth="122" FrameHeight="62"
-              SheetRows="2" SheetColumns="15"
-              Speed="30" OffsetX="-40" OffsetY="0"
-              SheetName="Textures/Catapults/Blue/blueDestroyed/blueCatapult_destroyed"
-              Alias="Destroyed" IsAI="false"/>
-
-    <Definition FrameWidth="90" FrameHeight="80"
-           SheetRows="2" SheetColumns="15"
-           Speed="30" OffsetX="-50" OffsetY="0"
-           SheetName="Textures/Catapults/Fire_Miss/fire_miss"
-           Alias="fireMiss" IsAI="false"/>
-
-    <Definition FrameWidth="128" FrameHeight="128"
-           SheetRows="2" SheetColumns="15"
-           Speed="30" OffsetX="0" OffsetY="-64"
-           SheetName="Textures/Catapults/Hit_Smoke/smoke"
-           Alias="hitSmoke" IsAI="false"/>
-
-    <!--AI animation definitions-->
-  <Definition FrameWidth="75" FrameHeight="60"
-            SheetRows="2" SheetColumns="15"
-            Speed="30" SplitFrame="20"
-            SheetName="Textures/Catapults/Red/redFire/redCatapult_fire"
-            Alias="Fire" IsAI="true"/>
-  <Definition FrameWidth="122" FrameHeight="62"
-              SheetRows="2" SheetColumns="15"
-              Speed="30" OffsetX="-11" OffsetY="0"
-              SheetName="Textures/Catapults/Red/redDestroyed/redCatapult_destroyed"
-              Alias="Destroyed" IsAI="true"/>
-
-  <Definition FrameWidth="75" FrameHeight="60"
-            SheetRows="1" SheetColumns="18"
-            Speed="30"
-            SheetName="Textures/Catapults/Red/redPullback/redCatapult_Pullback"
-            Alias="Aim" IsAI="true"/>
-
-    <Definition FrameWidth="90" FrameHeight="80"
-           SheetRows="2" SheetColumns="15"
-           Speed="30" OffsetX="-50" OffsetY="0"
-           SheetName="Textures/Catapults/Fire_Miss/fire_miss"
-           Alias="fireMiss" IsAI="true"/>
-
-    <Definition FrameWidth="128" FrameHeight="128"
-           SheetRows="2" SheetColumns="15"
-           Speed="30" OffsetX="-30" OffsetY="-64"
-           SheetName="Textures/Catapults/Hit_Smoke/smoke"
-           Alias="hitSmoke" IsAI="true"/> 
-</Animations>
-
+<?xml version="1.0" encoding="utf-8" ?>
+<Animations>
+  <!--Player animation definitions-->
+  <Definition FrameWidth="75" FrameHeight="60"
+              SheetRows="2" SheetColumns="15"
+              Speed="30" SplitFrame="20"
+              SheetName="Textures/Catapults/Blue/blueFire/blueCatapult_fire"
+              Alias="Fire" IsAI="false"/>
+  <Definition FrameWidth="75" FrameHeight="60"
+              SheetRows="1" SheetColumns="18"
+              Speed="30"
+              SheetName="Textures/Catapults/Blue/bluePullback/blueCatapult_Pullback"
+              Alias="Aim" IsAI="false"/>
+
+  <Definition FrameWidth="122" FrameHeight="62"
+              SheetRows="2" SheetColumns="15"
+              Speed="30" OffsetX="-40" OffsetY="0"
+              SheetName="Textures/Catapults/Blue/blueDestroyed/blueCatapult_destroyed"
+              Alias="Destroyed" IsAI="false"/>
+
+    <Definition FrameWidth="90" FrameHeight="80"
+           SheetRows="2" SheetColumns="15"
+           Speed="30" OffsetX="-50" OffsetY="0"
+           SheetName="Textures/Catapults/Fire_Miss/fire_miss"
+           Alias="fireMiss" IsAI="false"/>
+
+    <Definition FrameWidth="128" FrameHeight="128"
+           SheetRows="2" SheetColumns="15"
+           Speed="30" OffsetX="0" OffsetY="-64"
+           SheetName="Textures/Catapults/Hit_Smoke/smoke"
+           Alias="hitSmoke" IsAI="false"/>
+
+    <!--AI animation definitions-->
+  <Definition FrameWidth="75" FrameHeight="60"
+            SheetRows="2" SheetColumns="15"
+            Speed="30" SplitFrame="20"
+            SheetName="Textures/Catapults/Red/redFire/redCatapult_fire"
+            Alias="Fire" IsAI="true"/>
+  <Definition FrameWidth="122" FrameHeight="62"
+              SheetRows="2" SheetColumns="15"
+              Speed="30" OffsetX="-11" OffsetY="0"
+              SheetName="Textures/Catapults/Red/redDestroyed/redCatapult_destroyed"
+              Alias="Destroyed" IsAI="true"/>
+
+  <Definition FrameWidth="75" FrameHeight="60"
+            SheetRows="1" SheetColumns="18"
+            Speed="30"
+            SheetName="Textures/Catapults/Red/redPullback/redCatapult_Pullback"
+            Alias="Aim" IsAI="true"/>
+
+    <Definition FrameWidth="90" FrameHeight="80"
+           SheetRows="2" SheetColumns="15"
+           Speed="30" OffsetX="-50" OffsetY="0"
+           SheetName="Textures/Catapults/Fire_Miss/fire_miss"
+           Alias="fireMiss" IsAI="true"/>
+
+    <Definition FrameWidth="128" FrameHeight="128"
+           SheetRows="2" SheetColumns="15"
+           Speed="30" OffsetX="-30" OffsetY="-64"
+           SheetName="Textures/Catapults/Hit_Smoke/smoke"
+           Alias="hitSmoke" IsAI="true"/> 
+</Animations>
+

CatapultNetWars/Core/Networking/CatapultNetWars.code-workspace

@@ -5,9 +5,6 @@
 		},
 		{
 			"path": "../../../MonoGame.Xna.Framework.Net"
-		},
-		{
-			"path": "../../../CatapultWars"
 		}
 	],
 	"settings": {}

CatapultNetWars/Platforms/Android/CatapultNetWars.Android.csproj

@@ -13,27 +13,17 @@
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
     <AndroidTargetSdkVersion>33</AndroidTargetSdkVersion>
     <AndroidMinSdkVersion>21</AndroidMinSdkVersion>
+    <MonoGamePlatform>Android</MonoGamePlatform>
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Core\CatapultNetWars.Core.csproj" />
     <PackageReference Include="MonoGame.Framework.Android" Version="3.8.*" />
     <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Core\CatapultNetWars.Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="..\..\Core\Content\**\*.xnb" Link="Content\%(RecursiveDir)%(Filename)%(Extension)">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\Core\Content\**\*.wav" Link="Content\%(RecursiveDir)%(Filename)%(Extension)">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\Core\Content\**\*.xml" Link="Content\%(RecursiveDir)%(Filename)%(Extension)">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <MonoGameContentReference Include="..\..\Core\Content\Content.mgcb" />
   </ItemGroup>
 
 </Project>

CatapultNetWars/Platforms/Desktop/CatapultNetWars.DesktopGL.csproj

@@ -8,27 +8,17 @@
     <PublishReadyToRun>false</PublishReadyToRun>
     <TieredCompilation>false</TieredCompilation>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <MonoGamePlatform>DesktopGL</MonoGamePlatform>
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Core\CatapultNetWars.Core.csproj" />
     <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.*" />
     <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Core\CatapultNetWars.Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="..\..\Core\Content\**\*.xnb" Link="Content\%(RecursiveDir)%(Filename)%(Extension)">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\Core\Content\**\*.wav" Link="Content\%(RecursiveDir)%(Filename)%(Extension)">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\Core\Content\**\*.xml" Link="Content\%(RecursiveDir)%(Filename)%(Extension)">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <MonoGameContentReference Include="..\..\Core\Content\Content.mgcb" />
   </ItemGroup>
 
 </Project>

CatapultNetWars/Platforms/Windows/CatapultNetWars.Windows.csproj

@@ -11,27 +11,17 @@
     <PublishReadyToRun>false</PublishReadyToRun>
     <TieredCompilation>false</TieredCompilation>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <MonoGamePlatform>Windows</MonoGamePlatform>
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Core\CatapultNetWars.Core.csproj" />
     <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.*" />
     <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Core\CatapultNetWars.Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="..\..\Core\Content\**\*.xnb" Link="Content\%(RecursiveDir)%(Filename)%(Extension)">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\Core\Content\**\*.wav" Link="Content\%(RecursiveDir)%(Filename)%(Extension)">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\Core\Content\**\*.xml" Link="Content\%(RecursiveDir)%(Filename)%(Extension)">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <MonoGameContentReference Include="..\..\Core\Content\Content.mgcb" />
   </ItemGroup>
 
 </Project>

CatapultNetWars/Platforms/iOS/CatapultNetWars.iOS.csproj

@@ -6,27 +6,17 @@
     <RootNamespace>CatapultGame</RootNamespace>
     <AssemblyName>CatapultNetWars</AssemblyName>
     <SupportedOSPlatformVersion>11.0</SupportedOSPlatformVersion>
+    <MonoGamePlatform>iOS</MonoGamePlatform>
   </PropertyGroup>
 
   <ItemGroup>
+  <ProjectReference Include="..\..\Core\CatapultNetWars.Core.csproj" />
     <PackageReference Include="MonoGame.Framework.iOS" Version="3.8.*" />
     <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Core\CatapultNetWars.Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="..\..\Core\Content\**\*.xnb" Link="Content\%(RecursiveDir)%(Filename)%(Extension)">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\Core\Content\**\*.wav" Link="Content\%(RecursiveDir)%(Filename)%(Extension)">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\Core\Content\**\*.xml" Link="Content\%(RecursiveDir)%(Filename)%(Extension)">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <MonoGameContentReference Include="..\..\Core\Content\Content.mgcb" />
   </ItemGroup>
 
 </Project>