Browse Source

Merge branch 'master' of git://github.com/CartBlanche/MonoGame-Samples

Conflicts:
	Samples/Android/ChaseAndEvade/Activity1.cs
	Samples/Android/Draw2D/Activity1.cs
	Samples/Android/Peer2Peer/Activity1.cs
	Samples/Android/RenderTarget2D/Activity1.cs
	Samples/Android/Sound/Activity1.cs
	Samples/MacOS/VideoPlayer/Game1.cs
	Samples/MonoGame.Samples.Android.sln
dellis1972 13 years ago
parent
commit
9d63f45c6b
100 changed files with 2162 additions and 859 deletions
  1. 2 2
      Samples/Android/ChaseAndEvade/Activity1.cs
  2. 1 1
      Samples/Android/Draw2D/Activity1.cs
  3. 1 1
      Samples/Android/Peer2Peer/Activity1.cs
  4. 4 4
      Samples/Android/RenderTarget2D/Activity1.cs
  5. 1 1
      Samples/Android/Sound/Activity1.cs
  6. 26 0
      Samples/Android/VideoPlayer/Activity1.cs
  7. 19 0
      Samples/Android/VideoPlayer/Assets/AboutAssets.txt
  8. 81 0
      Samples/Android/VideoPlayer/MonoGame.Samples.VideoPlayer.csproj
  9. 27 0
      Samples/Android/VideoPlayer/Properties/AssemblyInfo.cs
  10. 44 0
      Samples/Android/VideoPlayer/Resources/AboutResources.txt
  11. 73 0
      Samples/Android/VideoPlayer/Resources/Resource.designer.cs
  12. BIN
      Samples/Android/VideoPlayer/Resources/drawable/Icon.png
  13. BIN
      Samples/Android/VideoPlayer/Resources/drawable/Splash.png
  14. 8 0
      Samples/Android/VideoPlayer/Resources/layout/Main.axml
  15. 4 0
      Samples/Android/VideoPlayer/Resources/values/Strings.xml
  16. 7 0
      Samples/Android/VideoPlayer/Resources/values/Styles.xml
  17. 73 74
      Samples/Linux/BookSourceCode/XNAGameDevelopmentbyExampleCode/AsteroidBeltAssault/MonoGame.Samples.AsteroidBeltAssault.Linux.csproj
  18. 45 53
      Samples/Linux/BookSourceCode/XNAGameDevelopmentbyExampleCode/FloodControl/MonoGame.Samples.FloodControl.Linux.csproj
  19. 128 142
      Samples/Linux/BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/GemstoneHunter.csproj
  20. 11 16
      Samples/Linux/BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/TileEngine/Tile Engine.csproj
  21. 18 16
      Samples/Linux/BookSourceCode/XNAGameDevelopmentbyExampleCode/RobotRampage/MonoGame.Samples.RobotRampage.Linux.csproj
  22. 3 3
      Samples/Linux/ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.Linux.csproj
  23. 4 5
      Samples/Linux/Draw2D/MonoGame.Samples.Draw2D.Linux.csproj
  24. 78 0
      Samples/Linux/GooCursor/GooCursor.csproj
  25. 19 0
      Samples/Linux/GooCursor/Program.cs
  26. 263 190
      Samples/Linux/NetRumble/MonoGame.Samples.NetRumble.Linux.csproj
  27. 11 8
      Samples/Linux/NetworkStateManagement/NetworkStateManagement.csproj
  28. BIN
      Samples/Linux/NetworkStateManagement/Resources.resources
  29. 98 0
      Samples/Linux/ParticleSample/ParticleSample.csproj
  30. 19 0
      Samples/Linux/ParticleSample/Program.cs
  31. 7 3
      Samples/Linux/Peer2PeerSample/MonoGame.Samples.Peer2PeerSample.Linux.csproj
  32. 20 0
      Samples/Linux/RenderTarget2DSample/Program.cs
  33. 70 0
      Samples/Linux/RenderTarget2DSample/RenderTarget2DSample.csproj
  34. 3 4
      Samples/Linux/Sound/MonoGame.Samples.Sound.Linux.csproj
  35. 37 35
      Samples/Linux/SpriteEffects/MonoGame.Samples.SpriteEffects.Linux.csproj
  36. 22 16
      Samples/Linux/Tetris/MonoGame.Samples.Tetris.Linux.csproj
  37. 3 3
      Samples/Linux/TiledSprites/MonoGame.Samples.TiledSprites.Linux.csproj
  38. 1 1
      Samples/MacOS/BookSourceCode/XNAGameDevelopmentbyExampleCode/AsteroidBeltAssault/AsteroidBeltAssault.csproj
  39. 1 1
      Samples/MacOS/BookSourceCode/XNAGameDevelopmentbyExampleCode/FloodControl/FloodControl.csproj
  40. 1 1
      Samples/MacOS/BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/GemstoneHunter.csproj
  41. 1 1
      Samples/MacOS/BookSourceCode/XNAGameDevelopmentbyExampleCode/RobotRampage/RobotRampage.csproj
  42. 1 1
      Samples/MacOS/BouncingBox/MonoGame.Samples.BouncingBox.MacOS.csproj
  43. 1 1
      Samples/MacOS/ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.MacOS.csproj
  44. 1 1
      Samples/MacOS/Draw2D/MonoGame.Samples.Draw2D.MacOS.csproj
  45. BIN
      Samples/MacOS/GameStateManagement/Content/menufont.xnb
  46. 1 1
      Samples/MacOS/GameStateManagement/GameStateManagement.csproj
  47. 2 2
      Samples/MacOS/GooCursor/Cursor.cs
  48. 1 1
      Samples/MacOS/GooCursor/GooCursor.csproj
  49. 1 1
      Samples/MacOS/HoneycombRush/HoneycombRush.csproj
  50. 1 1
      Samples/MacOS/NetRumble/NetRumble.csproj
  51. 1 1
      Samples/MacOS/NetworkPrediction/NetworkPrediction.csproj
  52. 1 1
      Samples/MacOS/NetworkStateManagement/NetworkStateManagement.csproj
  53. 1 1
      Samples/MacOS/Particle3DSample/Particle3DSample.csproj
  54. 6 6
      Samples/MacOS/ParticleSample/ParticleSample.csproj
  55. 1 1
      Samples/MacOS/ParticleSettingsMac/ParticleSettingsMac.csproj
  56. 1 1
      Samples/MacOS/Peer2PeerSample/Peer2PeerSample.csproj
  57. 1 1
      Samples/MacOS/PerPixelCollisionSample/PerPixelCollisionSample.csproj
  58. 1 1
      Samples/MacOS/RectangleCollisionSample/RectangleCollisionSample.csproj
  59. 1 1
      Samples/MacOS/RolePlayingGame/RolePlayingGame.csproj
  60. 1 1
      Samples/MacOS/SpriteEffects/SpriteEffects.csproj
  61. 1 1
      Samples/MacOS/Tetris/MonoGame.Samples.Tetris.MacOS.csproj
  62. 1 1
      Samples/MacOS/TiledSprites/MonoGame.Samples.TiledSprites.MacOS.csproj
  63. 1 1
      Samples/MacOS/TransformedCollisionSample/TransformedCollisionSample.csproj
  64. 0 0
      Samples/MacOS/VideoPlayer/Content/monogameicon.png
  65. BIN
      Samples/MacOS/VideoPlayer/Content/sintel_trailer.m4v
  66. 0 0
      Samples/MacOS/VideoPlayer/Content/spriteFont1.xnb
  67. 0 0
      Samples/MacOS/VideoPlayer/Default.png
  68. 41 30
      Samples/MacOS/VideoPlayer/Game1.cs
  69. 16 0
      Samples/MacOS/VideoPlayer/Info.plist
  70. 73 0
      Samples/MacOS/VideoPlayer/MonoGame.Samples.VideoPlayer.MacOS.csproj
  71. 39 0
      Samples/MacOS/VideoPlayer/main.cs
  72. BIN
      Samples/MacOS/VideoPlayer/monogameicon.png
  73. 7 1
      Samples/MonoGame.Samples.Android.sln
  74. 452 0
      Samples/MonoGame.Samples.Linux.sln
  75. 30 0
      Samples/MonoGame.Samples.MacOS.sln
  76. 17 17
      Samples/MonoGame.Samples.iOS.sln
  77. 2 9
      Samples/Windows/Draw2D/MonoGame.Samples.Draw2D.Windows.csproj
  78. 9 11
      Samples/Windows/NetRumble/NetRumble.csproj
  79. 9 14
      Samples/Windows/RenderTarget2D/RenderTarget2D.csproj
  80. 15 4
      Samples/iOS/Aiming/Info.plist
  81. 13 4
      Samples/iOS/BatteryStatus/Info.plist
  82. 1 9
      Samples/iOS/BatteryStatus/MonoGame.Samples.BatteryStatus.csproj
  83. 2 10
      Samples/iOS/BouncingBox/MonoGame.Samples.BouncingBox.csproj
  84. 20 10
      Samples/iOS/ChaseAndEvade/Info.plist
  85. 1 11
      Samples/iOS/ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.csproj
  86. 28 15
      Samples/iOS/Draw2D/Info.plist
  87. 1 11
      Samples/iOS/Draw2D/MonoGame.Samples.Draw2D.csproj
  88. 2 10
      Samples/iOS/GameComponents/MonoGame.Samples.GameComponents.csproj
  89. BIN
      Samples/iOS/GameStateManagement/.DS_Store
  90. BIN
      Samples/iOS/GameStateManagement/Content/gamefont.xnb
  91. BIN
      Samples/iOS/GameStateManagement/Content/menufont.xnb
  92. 6 44
      Samples/iOS/GameStateManagement/MonoGame.Samples.GameStateManagement.csproj
  93. 13 0
      Samples/iOS/MonoGame.Samples.VideoPlayer/Info.plist
  94. 19 0
      Samples/iOS/MonoGame.Samples.VideoPlayer/Main.cs
  95. 80 0
      Samples/iOS/MonoGame.Samples.VideoPlayer/MonoGame.Samples.VideoPlayer.csproj
  96. 5 41
      Samples/iOS/MultiTouch/MonoGame.Samples.MultiTouch.csproj
  97. BIN
      Samples/iOS/ParticleSample/.DS_Store
  98. BIN
      Samples/iOS/ParticleSample/Content/Arial.xnb
  99. BIN
      Samples/iOS/ParticleSample/Content/explosion.xnb
  100. BIN
      Samples/iOS/ParticleSample/Content/font.xnb

+ 2 - 2
Samples/Android/ChaseAndEvade/Activity1.cs

@@ -11,8 +11,8 @@ namespace MonoGame.Samples.ChaseAndEvade.Droid
         protected override void OnCreate(Bundle bundle)
         {
             base.OnCreate(bundle);
-			ChaseAndEvadeGame.Activity = this;			
-            ChaseAndEvadeGame g = new ChaseAndEvadeGame();			
+            ChaseAndEvadeGame.Activity = this;
+            ChaseAndEvadeGame g = new ChaseAndEvadeGame();
             SetContentView(g.Window);
             g.Run();
         }

+ 1 - 1
Samples/Android/Draw2D/Activity1.cs

@@ -9,7 +9,7 @@ namespace Microsoft.Xna.Samples.Draw2D
         protected override void OnCreate(Bundle bundle)
         {
             base.OnCreate(bundle);
-			Game1.Activity = this;
+            Game1.Activity = this;
             var g = new Game1();
             SetContentView(g.Window);
             g.Run();

+ 1 - 1
Samples/Android/Peer2Peer/Activity1.cs

@@ -15,7 +15,7 @@ namespace MonoGame.Samples.PeerToPeerGame.Droid
         protected override void OnCreate(Bundle bundle)
         {
             base.OnCreate(bundle);
-			PeerToPeer.PeerToPeerGame.Activity = this;
+            PeerToPeer.PeerToPeerGame.Activity = this;
             var g = new PeerToPeer.PeerToPeerGame();
             SetContentView(g.Window);
             g.Run();

+ 4 - 4
Samples/Android/RenderTarget2D/Activity1.cs

@@ -14,10 +14,10 @@ namespace RenderTarget2DSample
 	public class Activity1 : Microsoft.Xna.Framework.AndroidGameActivity
 	{
 		protected override void OnCreate (Bundle bundle)
-		{					
-			base.OnCreate (bundle);		
-			Game1.Activity = this;
-			var g = new Game1();			
+		{
+			base.OnCreate (bundle);
+            Game1.Activity = this;
+			var g = new Game1();
             SetContentView(g.Window);
             g.Run();
 		}

+ 1 - 1
Samples/Android/Sound/Activity1.cs

@@ -17,7 +17,7 @@ namespace Microsoft.Xna.Samples.Sound
         protected override void OnCreate(Bundle bundle)
         {
             base.OnCreate(bundle);
-			Game1.Activity = this;
+            Game1.Activity = this;
             var g = new Game1();
             SetContentView(g.Window);
             g.Run();

+ 26 - 0
Samples/Android/VideoPlayer/Activity1.cs

@@ -0,0 +1,26 @@
+using System;
+
+using Android.App;
+using Android.Content;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+using Android.OS;
+
+namespace MonoGame.Samples.VideoPlayer
+{
+	[Activity(Label = "VideoPlayer", MainLauncher = true, Icon = "@drawable/icon", Theme = "@style/Theme.Splash")]
+    public class Activity1 : Microsoft.Xna.Framework.AndroidGameActivity
+    {
+        protected override void OnCreate(Bundle bundle)
+        {
+            base.OnCreate(bundle);
+            Game1.Activity = this;
+            var g = new Game1();
+            SetContentView(g.Window);
+            g.Run();
+        }
+    }
+}
+
+

+ 19 - 0
Samples/Android/VideoPlayer/Assets/AboutAssets.txt

@@ -0,0 +1,19 @@
+Any raw assets you want to be deployed with your application can be placed in
+this directory (and child directories) and given a Build Action of "AndroidAsset".
+
+These files will be deployed with you package and will be accessible using Android's
+AssetManager, like this:
+
+public class ReadAsset : Activity
+{
+	protected override void OnCreate (Bundle bundle)
+	{
+		base.OnCreate (bundle);
+
+		InputStream input = Assets.Open ("my_asset.txt");
+	}
+}
+
+Additionally, some Android functions will automatically load asset files:
+
+Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");

+ 81 - 0
Samples/Android/VideoPlayer/MonoGame.Samples.VideoPlayer.csproj

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{27C3DD7C-5322-4C2D-8EE4-07610390CDAF}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>MonoGame.Samples.VideoPlayer</RootNamespace>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <AndroidResgenClass>Resource</AndroidResgenClass>
+    <AndroidApplication>True</AndroidApplication>
+    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
+    <AssemblyName>MonoGame.Samples.VideoPlayer</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <AndroidLinkMode>None</AndroidLinkMode>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Mono.Android" />
+    <Reference Include="OpenTK" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Activity1.cs" />
+    <Compile Include="Resources\Resource.designer.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\MacOS\VideoPlayer\Game1.cs">
+      <Link>Game1.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\AboutResources.txt" />
+    <None Include="Assets\AboutAssets.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\layout\Main.axml" />
+    <AndroidResource Include="Resources\values\Strings.xml" />
+    <AndroidResource Include="Resources\drawable\Icon.png" />
+    <AndroidResource Include="Resources\drawable\Splash.png" />
+    <AndroidResource Include="Resources\values\Styles.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
+  <ItemGroup>
+    <AndroidAsset Include="..\..\MacOS\VideoPlayer\Content\spriteFont1.xnb">
+      <Link>Assets\Content\spriteFont1.xnb</Link>
+    </AndroidAsset>
+    <AndroidAsset Include="..\..\MacOS\VideoPlayer\Content\sintel_trailer.3gp">
+      <Link>Assets\Content\sintel_trailer.3gp</Link>
+    </AndroidAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+      <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+      <Name>MonoGame.Framework.Android</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>

+ 27 - 0
Samples/Android/VideoPlayer/Properties/AssemblyInfo.cs

@@ -0,0 +1,27 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("MonoGame.Samples.VideoPlayer")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Savage Software Solutions Ltd.")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("Savage Software Solutions Ltd.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes are used to specify the signing key for the assembly, 
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
+

+ 44 - 0
Samples/Android/VideoPlayer/Resources/AboutResources.txt

@@ -0,0 +1,44 @@
+Images, layout descriptions, binary blobs and string dictionaries can be included 
+in your application as resource files.  Various Android APIs are designed to 
+operate on the resource IDs instead of dealing with images, strings or binary blobs 
+directly.
+
+For example, a sample Android app that contains a user interface layout (main.axml),
+an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
+would keep its resources in the "Resources" directory of the application:
+
+Resources/
+    drawable/
+        icon.png
+
+    layout/
+        main.axml
+
+    values/
+        strings.xml
+
+In order to get the build system to recognize Android resources, set the build action to
+"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
+instead operate on resource IDs.  When you compile an Android application that uses resources, 
+the build system will package the resources for distribution and generate a class called "R" 
+(this is an Android convention) that contains the tokens for each one of the resources 
+included. For example, for the above Resources layout, this is what the R class would expose:
+
+public class R {
+    public class drawable {
+        public const int icon = 0x123;
+    }
+
+    public class layout {
+        public const int main = 0x456;
+    }
+
+    public class strings {
+        public const int first_string = 0xabc;
+        public const int second_string = 0xbcd;
+    }
+}
+
+You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main 
+to reference the layout/main.axml file, or R.strings.first_string to reference the first 
+string in the dictionary file values/strings.xml.

+ 73 - 0
Samples/Android/VideoPlayer/Resources/Resource.designer.cs

@@ -0,0 +1,73 @@
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 4.0.30319.1
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+namespace MonoGame.Samples.VideoPlayer
+{
+	
+	
+	public partial class Resource
+	{
+		
+		public partial class Attribute
+		{
+			
+			private Attribute()
+			{
+			}
+		}
+		
+		public partial class Drawable
+		{
+			
+			// aapt resource value: 0x7f020000
+			public const int Icon = 2130837504;
+			
+			// aapt resource value: 0x7f020001
+			public const int Splash = 2130837505;
+			
+			private Drawable()
+			{
+			}
+		}
+		
+		public partial class Layout
+		{
+			
+			// aapt resource value: 0x7f030000
+			public const int Main = 2130903040;
+			
+			private Layout()
+			{
+			}
+		}
+		
+		public partial class String
+		{
+			
+			// aapt resource value: 0x7f040000
+			public const int app_name = 2130968576;
+			
+			private String()
+			{
+			}
+		}
+		
+		public partial class Style
+		{
+			
+			// aapt resource value: 0x7f050000
+			public const int Theme_Splash = 2131034112;
+			
+			private Style()
+			{
+			}
+		}
+	}
+}

BIN
Samples/Android/VideoPlayer/Resources/drawable/Icon.png


BIN
Samples/Android/VideoPlayer/Resources/drawable/Splash.png


+ 8 - 0
Samples/Android/VideoPlayer/Resources/layout/Main.axml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+</LinearLayout>
+

+ 4 - 0
Samples/Android/VideoPlayer/Resources/values/Strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="app_name">MonoGame.Samples.VideoPlayer</string>
+</resources>

+ 7 - 0
Samples/Android/VideoPlayer/Resources/values/Styles.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <style name="Theme.Splash" parent="android:Theme">
+    <item name="android:windowBackground">@drawable/splash</item>
+    <item name="android:windowNoTitle">true</item>
+  </style>
+</resources>

+ 73 - 74
Samples/Linux/BookSourceCode/XNAGameDevelopmentbyExampleCode/AsteroidBeltAssault/MonoGame.Samples.AsteroidBeltAssault.Linux.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>AsteroidBeltAssault</RootNamespace>
     <AssemblyName>FloodControl</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -45,104 +45,103 @@
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\README.md">
-      <Link>README.md</Link>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Info.plist">
-      <Link>Info.plist</Link>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\GameThumbnail.png">
-      <Link>GameThumbnail.png</Link>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Game.ico">
+    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Game.ico">
       <Link>Game.ico</Link>
     </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Fonts\Pericles14.xnb">
-      <Link>Content\Fonts\Pericles14.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Shot2.xnb">
-      <Link>Content\Sounds\Shot2.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Shot1.xnb">
-      <Link>Content\Sounds\Shot1.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Explosion4.xnb">
-      <Link>Content\Sounds\Explosion4.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Explosion3.xnb">
-      <Link>Content\Sounds\Explosion3.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Explosion2.xnb">
-      <Link>Content\Sounds\Explosion2.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Explosion1.xnb">
-      <Link>Content\Sounds\Explosion1.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Textures\TitleScreen.xnb">
-      <Link>Content\Textures\TitleScreen.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\GameThumbnail.png">
+      <Link>GameThumbnail.png</Link>
     </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Textures\SpriteSheet.xnb">
-      <Link>Content\Textures\SpriteSheet.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\README.md">
+      <Link>README.md</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Content\" />
     <Folder Include="Content\Fonts\" />
-    <Folder Include="Content\Sounds\" />
-    <Folder Include="Content\Textures\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\StarField.cs">
-      <Link>StarField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Sprite.cs">
-      <Link>Sprite.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\AsteroidManager.cs">
+      <Link>AsteroidManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\SoundManager.cs">
-      <Link>SoundManager.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\CollisionManager.cs">
+      <Link>CollisionManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\ShotManager.cs">
-      <Link>ShotManager.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Enemy.cs">
+      <Link>Enemy.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\PlayerManager.cs">
-      <Link>PlayerManager.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\EnemyManager.cs">
+      <Link>EnemyManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Particle.cs">
-      <Link>Particle.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\ExplosionManager.cs">
+      <Link>ExplosionManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Game1.cs">
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Game1.cs">
       <Link>Game1.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\ExplosionManager.cs">
-      <Link>ExplosionManager.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Particle.cs">
+      <Link>Particle.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\EnemyManager.cs">
-      <Link>EnemyManager.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\PlayerManager.cs">
+      <Link>PlayerManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Enemy.cs">
-      <Link>Enemy.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\ShotManager.cs">
+      <Link>ShotManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\CollisionManager.cs">
-      <Link>CollisionManager.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\SoundManager.cs">
+      <Link>SoundManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\AsteroidManager.cs">
-      <Link>AsteroidManager.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Sprite.cs">
+      <Link>Sprite.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\StarField.cs">
+      <Link>StarField.cs</Link>
+    </Compile>
+    <Compile Include="Program.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Fonts\Pericles14.xnb">
+      <Link>Content\Fonts\Pericles14.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Explosion1.xnb">
+      <Link>Content\Sounds\Explosion1.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Explosion2.xnb">
+      <Link>Content\Sounds\Explosion2.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Explosion3.xnb">
+      <Link>Content\Sounds\Explosion3.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Explosion4.xnb">
+      <Link>Content\Sounds\Explosion4.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Shot1.xnb">
+      <Link>Content\Sounds\Shot1.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Sounds\Shot2.xnb">
+      <Link>Content\Sounds\Shot2.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Textures\SpriteSheet.xnb">
+      <Link>Content\Textures\SpriteSheet.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\Content\Textures\TitleScreen.xnb">
+      <Link>Content\Textures\TitleScreen.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
+  </ItemGroup>
 </Project>

+ 45 - 53
Samples/Linux/BookSourceCode/XNAGameDevelopmentbyExampleCode/FloodControl/MonoGame.Samples.FloodControl.Linux.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>FloodControl</RootNamespace>
     <AssemblyName>FloodControl</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -39,75 +39,67 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Drawing" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\README.md">
-      <Link>README.md</Link>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Info.plist">
-      <Link>Info.plist</Link>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\GameThumbnail.png">
-      <Link>GameThumbnail.png</Link>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Game.ico">
-      <Link>Game.ico</Link>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\FloodControl.sln">
-      <Link>FloodControl.sln</Link>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\FloodControl.csproj">
-      <Link>FloodControl.csproj</Link>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Content\Fonts\Pericles36.xnb">
-      <Link>Content\Fonts\Pericles36.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Content\Textures\TitleScreen.xnb">
-      <Link>Content\Textures\TitleScreen.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Content\Textures\Tile_Sheet.xnb">
-      <Link>Content\Textures\Tile_Sheet.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Content\Textures\Background.xnb">
-      <Link>Content\Textures\Background.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Content\" />
-    <Folder Include="Content\Textures\" />
     <Folder Include="Content\Fonts\" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\ScoreZooms.cs">
-      <Link>ScoreZooms.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\FadingPiece.cs">
+      <Link>FadingPiece.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\RotatingPiece.cs">
-      <Link>RotatingPiece.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\FallingPiece.cs">
+      <Link>FallingPiece.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\GamePiece.cs">
-      <Link>GamePiece.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Game1.cs">
+      <Link>Game1.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\GameBoard.cs">
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\GameBoard.cs">
       <Link>GameBoard.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Game1.cs">
-      <Link>Game1.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\GamePiece.cs">
+      <Link>GamePiece.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\FallingPiece.cs">
-      <Link>FallingPiece.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\RotatingPiece.cs">
+      <Link>RotatingPiece.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\FadingPiece.cs">
-      <Link>FadingPiece.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\ScoreZooms.cs">
+      <Link>ScoreZooms.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Content\Fonts\Pericles36.xnb">
+      <Link>Content\Fonts\Pericles36.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Content\Textures\Background.xnb">
+      <Link>Content\Textures\Background.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Content\Textures\Tile_Sheet.xnb">
+      <Link>Content\Textures\Tile_Sheet.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Content\Textures\TitleScreen.xnb">
+      <Link>Content\Textures\TitleScreen.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\Game.ico">
+      <Link>Game.ico</Link>
+    </None>
+    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\GameThumbnail.png">
+      <Link>GameThumbnail.png</Link>
+    </None>
+    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\README.md">
+      <Link>README.md</Link>
+    </None>
+  </ItemGroup>
 </Project>

+ 128 - 142
Samples/Linux/BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/GemstoneHunter.csproj

@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>AsteroidBeltAssault</RootNamespace>
     <AssemblyName>FloodControl</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -39,124 +39,10 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Drawing" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\README.md">
-      <Link>README.md</Link>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Info.plist">
-      <Link>Info.plist</Link>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\GameThumbnail.png">
-      <Link>GameThumbnail.png</Link>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Game.ico">
-      <Link>Game.ico</Link>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Fonts\Pericles10Bold.xnb">
-      <Link>Content\Fonts\Pericles10Bold.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Fonts\Pericles8.xnb">
-      <Link>Content\Fonts\Pericles8.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Maps\MAP001.MAP">
-      <Link>Content\Maps\MAP001.MAP</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Maps\MAP000.MAP">
-      <Link>Content\Maps\MAP000.MAP</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Gem.xnb">
-      <Link>Content\Textures\Gem.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\PlatformTiles.xnb">
-      <Link>Content\Textures\PlatformTiles.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\TitleScreen.xnb">
-      <Link>Content\Textures\TitleScreen.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Gem.xnb">
-      <Link>Content\Textures\Sprites\Gem.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterA\Run.xnb">
-      <Link>Content\Textures\Sprites\MonsterA\Run.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterA\Idle.xnb">
-      <Link>Content\Textures\Sprites\MonsterA\Idle.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterA\Die.xnb">
-      <Link>Content\Textures\Sprites\MonsterA\Die.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterB\Run.xnb">
-      <Link>Content\Textures\Sprites\MonsterB\Run.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterB\Idle.xnb">
-      <Link>Content\Textures\Sprites\MonsterB\Idle.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterB\Die.xnb">
-      <Link>Content\Textures\Sprites\MonsterB\Die.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterC\Run.xnb">
-      <Link>Content\Textures\Sprites\MonsterC\Run.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterC\Idle.xnb">
-      <Link>Content\Textures\Sprites\MonsterC\Idle.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterC\Die.xnb">
-      <Link>Content\Textures\Sprites\MonsterC\Die.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterD\Run.xnb">
-      <Link>Content\Textures\Sprites\MonsterD\Run.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterD\Idle.xnb">
-      <Link>Content\Textures\Sprites\MonsterD\Idle.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterD\Die.xnb">
-      <Link>Content\Textures\Sprites\MonsterD\Die.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Player\Run.xnb">
-      <Link>Content\Textures\Sprites\Player\Run.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Player\Jump.xnb">
-      <Link>Content\Textures\Sprites\Player\Jump.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Player\Idle.xnb">
-      <Link>Content\Textures\Sprites\Player\Idle.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Player\Die.xnb">
-      <Link>Content\Textures\Sprites\Player\Die.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Player\Celebrate.xnb">
-      <Link>Content\Textures\Sprites\Player\Celebrate.xnb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>
@@ -165,41 +51,141 @@
       <Name>Tile Engine</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Content\" />
-    <Folder Include="Content\Fonts\" />
-    <Folder Include="Content\Maps\" />
-    <Folder Include="Content\Textures\Sprites\MonsterA\" />
-    <Folder Include="Content\Textures\Sprites\MonsterB\" />
-    <Folder Include="Content\Textures\Sprites\MonsterC\" />
-    <Folder Include="Content\Textures\Sprites\MonsterD\" />
-    <Folder Include="Content\Textures\Sprites\Player\" />
-    <Folder Include="Content\Textures\" />
-    <Folder Include="Content\Textures\" />
-    <Folder Include="Content\Textures\" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Player.cs">
-      <Link>Player.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\AnimationStrip.cs">
+      <Link>AnimationStrip.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\LevelManager.cs">
-      <Link>LevelManager.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Enemy.cs">
+      <Link>Enemy.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Gemstone.cs">
-      <Link>Gemstone.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Game1.cs">
+      <Link>Game1.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\GameObject.cs">
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\GameObject.cs">
       <Link>GameObject.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Game1.cs">
-      <Link>Game1.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Gemstone.cs">
+      <Link>Gemstone.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Enemy.cs">
-      <Link>Enemy.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\LevelManager.cs">
+      <Link>LevelManager.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\AnimationStrip.cs">
-      <Link>AnimationStrip.cs</Link>
+    <Compile Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Player.cs">
+      <Link>Player.cs</Link>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Game.ico">
+      <Link>Game.ico</Link>
+    </None>
+    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\GameThumbnail.png">
+      <Link>GameThumbnail.png</Link>
+    </None>
+    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\README.md">
+      <Link>README.md</Link>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Fonts\Pericles10Bold.xnb">
+      <Link>Content\Fonts\Pericles10Bold.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Fonts\Pericles8.xnb">
+      <Link>Content\Fonts\Pericles8.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Maps\MAP000.MAP">
+      <Link>Content\Maps\MAP000.MAP</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Maps\MAP001.MAP">
+      <Link>Content\Maps\MAP001.MAP</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Gem.xnb">
+      <Link>Content\Textures\Gem.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\PlatformTiles.xnb">
+      <Link>Content\Textures\PlatformTiles.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\TitleScreen.xnb">
+      <Link>Content\Textures\TitleScreen.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Gem.xnb">
+      <Link>Content\Textures\Sprites\Gem.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Player\Celebrate.xnb">
+      <Link>Content\Textures\Sprites\Player\Celebrate.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Player\Die.xnb">
+      <Link>Content\Textures\Sprites\Player\Die.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Player\Idle.xnb">
+      <Link>Content\Textures\Sprites\Player\Idle.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Player\Jump.xnb">
+      <Link>Content\Textures\Sprites\Player\Jump.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\Player\Run.xnb">
+      <Link>Content\Textures\Sprites\Player\Run.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterA\Die.xnb">
+      <Link>Content\Textures\Sprites\MonsterA\Die.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterA\Idle.xnb">
+      <Link>Content\Textures\Sprites\MonsterA\Idle.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterA\Run.xnb">
+      <Link>Content\Textures\Sprites\MonsterA\Run.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterB\Die.xnb">
+      <Link>Content\Textures\Sprites\MonsterB\Die.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterB\Idle.xnb">
+      <Link>Content\Textures\Sprites\MonsterB\Idle.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterB\Run.xnb">
+      <Link>Content\Textures\Sprites\MonsterB\Run.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterC\Die.xnb">
+      <Link>Content\Textures\Sprites\MonsterC\Die.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterC\Idle.xnb">
+      <Link>Content\Textures\Sprites\MonsterC\Idle.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterC\Run.xnb">
+      <Link>Content\Textures\Sprites\MonsterC\Run.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterD\Die.xnb">
+      <Link>Content\Textures\Sprites\MonsterD\Die.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterD\Idle.xnb">
+      <Link>Content\Textures\Sprites\MonsterD\Idle.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\Content\Textures\Sprites\MonsterD\Run.xnb">
+      <Link>Content\Textures\Sprites\MonsterD\Run.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>

+ 11 - 16
Samples/Linux/BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/TileEngine/Tile Engine.csproj

@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Tile_Engine</RootNamespace>
     <AssemblyName>Tile Engine</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -34,30 +34,25 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="..\..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\TileEngine\TileMap.cs">
-      <Link>TileMap.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\TileEngine\MyClass.cs">
-      <Link>MyClass.cs</Link>
+    <Compile Include="..\..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\TileEngine\Camera.cs">
+      <Link>Camera.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\TileEngine\MapSquare.cs">
+    <Compile Include="..\..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\TileEngine\MapSquare.cs">
       <Link>MapSquare.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\TileEngine\Camera.cs">
-      <Link>Camera.cs</Link>
+    <Compile Include="..\..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\TileEngine\MyClass.cs">
+      <Link>MyClass.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\TileEngine\TileMap.cs">
+      <Link>TileMap.cs</Link>
     </Compile>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\..\..\..\..\projects\monogame\Samples\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\TileEngine\AssemblyInfo.cs">
-      <Link>AssemblyInfo.cs</Link>
-    </None>
-  </ItemGroup>
 </Project>

+ 18 - 16
Samples/Linux/BookSourceCode/XNAGameDevelopmentbyExampleCode/RobotRampage/MonoGame.Samples.RobotRampage.Linux.csproj

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{86A219E2-C8F0-452B-B762-C69D5BB07C98}</ProjectGuid>
+    <ProjectGuid>{9522776F-02BA-4BED-B8BB-6BAE580F4068}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>AsteroidBeltAssault</RootNamespace>
     <AssemblyName>FloodControl</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,18 +52,6 @@
     <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Game.ico">
       <Link>Game.ico</Link>
     </None>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Content\Fonts\Pericles14.xnb">
-      <Link>Content\Fonts\Pericles14.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Content\Textures\TitleScreen.xnb">
-      <Link>Content\Textures\TitleScreen.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Content\Textures\SpriteSheet.xnb">
-      <Link>Content\Textures\SpriteSheet.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
@@ -121,9 +109,23 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Content\Fonts\Pericles14.xnb">
+      <Link>Content\Fonts\Pericles14.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Content\Textures\TitleScreen.xnb">
+      <Link>Content\Textures\TitleScreen.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\..\MacOS\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\Content\Textures\SpriteSheet.xnb">
+      <Link>Content\Textures\SpriteSheet.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>

+ 3 - 3
Samples/Linux/ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.Linux.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>ChaseAndEvade</RootNamespace>
     <AssemblyName>ChaseAndEvade</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,7 +68,7 @@
     <Content Include="GameThumbnail.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>

+ 4 - 5
Samples/Linux/Draw2D/MonoGame.Samples.Draw2D.Linux.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Draw2D</RootNamespace>
     <AssemblyName>Draw2D</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -37,10 +36,10 @@
     <Compile Include="..\..\iOS\Draw2D\FPSCounterComponent.cs">
       <Link>FPSCounterComponent.cs</Link>
     </Compile>
+    <Compile Include="Program.cs" />
     <Compile Include="..\..\iOS\Draw2D\Game1.cs">
       <Link>Game1.cs</Link>
     </Compile>
-    <Compile Include="Program.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\..\iOS\Draw2D\Content\monogameicon.png">
@@ -79,7 +78,7 @@
   </Target>
   -->
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>

+ 78 - 0
Samples/Linux/GooCursor/GooCursor.csproj

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>GooCursor</RootNamespace>
+    <AssemblyName>GooCursor</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+      <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
+      <Name>MonoGame.Framework.Linux</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\MacOS\GooCursor\Cursor.cs">
+      <Link>Cursor.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MacOS\GooCursor\Game1.cs">
+      <Link>Game1.cs</Link>
+    </Compile>
+    <Compile Include="Program.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\MacOS\GooCursor\Game.ico">
+      <Link>Game.ico</Link>
+    </None>
+    <None Include="..\..\MacOS\GooCursor\GameThumbnail.png">
+      <Link>GameThumbnail.png</Link>
+    </None>
+    <None Include="..\..\MacOS\GooCursor\Readme.md">
+      <Link>Readme.md</Link>
+    </None>
+    <None Include="..\..\MacOS\GooCursor\Content\SimpleFont.spritefont">
+      <Link>Content\SimpleFont.spritefont</Link>
+    </None>
+    <None Include="..\..\MacOS\GooCursor\Content\cursor.bmp">
+      <Link>Content\cursor.bmp</Link>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\MacOS\GooCursor\Content\SimpleFont.xnb">
+      <Link>Content\SimpleFont.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\GooCursor\Content\cursor.xnb">
+      <Link>Content\cursor.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+</Project>

+ 19 - 0
Samples/Linux/GooCursor/Program.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace GooCursor
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        static void Main(string[] args)
+        {
+            using (Game1 game = new Game1())
+            {
+                game.Run();
+            }
+        }
+    }
+}
+

+ 263 - 190
Samples/Linux/NetRumble/MonoGame.Samples.NetRumble.Linux.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>NetRumble</RootNamespace>
     <AssemblyName>NetRumble</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -49,363 +49,186 @@
     <None Include="..\..\MacOS\NetRumble\Game.ico">
       <Link>Game.ico</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\One Step Beyond.xnb">
-      <Link>Content\One Step Beyond.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\One Step Beyond.wma">
       <Link>Content\One Step Beyond.wma</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\title.xnb">
-      <Link>Content\Textures\title.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\title.png">
       <Link>Content\Textures\title.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\shipShields.xnb">
-      <Link>Content\Textures\shipShields.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\shipShields.png">
       <Link>Content\Textures\shipShields.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship3Overlay.xnb">
-      <Link>Content\Textures\ship3Overlay.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\ship3Overlay.png">
       <Link>Content\Textures\ship3Overlay.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship3.xnb">
-      <Link>Content\Textures\ship3.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\ship3.png">
       <Link>Content\Textures\ship3.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship2Overlay.xnb">
-      <Link>Content\Textures\ship2Overlay.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\ship2Overlay.png">
       <Link>Content\Textures\ship2Overlay.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship2.xnb">
-      <Link>Content\Textures\ship2.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\ship2.png">
       <Link>Content\Textures\ship2.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship1Overlay.xnb">
-      <Link>Content\Textures\ship1Overlay.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\ship1Overlay.png">
       <Link>Content\Textures\ship1Overlay.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship1.xnb">
-      <Link>Content\Textures\ship1.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\ship1.png">
       <Link>Content\Textures\ship1.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship0Overlay.xnb">
-      <Link>Content\Textures\ship0Overlay.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\ship0Overlay.png">
       <Link>Content\Textures\ship0Overlay.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ship0.xnb">
-      <Link>Content\Textures\ship0.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\ship0.png">
       <Link>Content\Textures\ship0.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\rocket.xnb">
-      <Link>Content\Textures\rocket.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\rocket.png">
       <Link>Content\Textures\rocket.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\ready.xnb">
-      <Link>Content\Textures\ready.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\ready.png">
       <Link>Content\Textures\ready.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\powerupTripleLaser.xnb">
-      <Link>Content\Textures\powerupTripleLaser.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\powerupTripleLaser.png">
       <Link>Content\Textures\powerupTripleLaser.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\powerupRocket.xnb">
-      <Link>Content\Textures\powerupRocket.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\powerupRocket.png">
       <Link>Content\Textures\powerupRocket.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\powerupDoubleLaser.xnb">
-      <Link>Content\Textures\powerupDoubleLaser.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\powerupDoubleLaser.png">
       <Link>Content\Textures\powerupDoubleLaser.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\mine.xnb">
-      <Link>Content\Textures\mine.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\mine.png">
       <Link>Content\Textures\mine.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\laser.xnb">
-      <Link>Content\Textures\laser.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\laser.png">
       <Link>Content\Textures\laser.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\explosion.xnb">
-      <Link>Content\Textures\explosion.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\explosion.png">
       <Link>Content\Textures\explosion.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\clouds.xnb">
-      <Link>Content\Textures\clouds.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\clouds.png">
       <Link>Content\Textures\clouds.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\chatTalking.xnb">
-      <Link>Content\Textures\chatTalking.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\chatTalking.png">
       <Link>Content\Textures\chatTalking.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\chatMute.xnb">
-      <Link>Content\Textures\chatMute.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\chatMute.png">
       <Link>Content\Textures\chatMute.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\chatAble.xnb">
-      <Link>Content\Textures\chatAble.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\chatAble.png">
       <Link>Content\Textures\chatAble.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\blank.xnb">
-      <Link>Content\Textures\blank.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\blank.png">
       <Link>Content\Textures\blank.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\barrierRed.xnb">
-      <Link>Content\Textures\barrierRed.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\barrierRed.png">
       <Link>Content\Textures\barrierRed.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\barrierPurple.xnb">
-      <Link>Content\Textures\barrierPurple.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\barrierPurple.png">
       <Link>Content\Textures\barrierPurple.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\barrierEnd.xnb">
-      <Link>Content\Textures\barrierEnd.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\barrierEnd.png">
       <Link>Content\Textures\barrierEnd.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\asteroid2.xnb">
-      <Link>Content\Textures\asteroid2.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\asteroid2.png">
       <Link>Content\Textures\asteroid2.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\asteroid1.xnb">
-      <Link>Content\Textures\asteroid1.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\asteroid1.png">
       <Link>Content\Textures\asteroid1.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\asteroid0.xnb">
-      <Link>Content\Textures\asteroid0.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\asteroid0.png">
       <Link>Content\Textures\asteroid0.png</Link>
     </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\Particles\defaultParticle.PNG">
       <Link>Content\Textures\Particles\defaultParticle.PNG</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\Particles\defaultParticle.xnb">
-      <Link>Content\Textures\Particles\defaultParticle.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\Particles\particle.png">
       <Link>Content\Textures\Particles\particle.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\Particles\particle.xnb">
-      <Link>Content\Textures\Particles\particle.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\Particles\smoke.png">
       <Link>Content\Textures\Particles\smoke.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\Particles\smoke.xnb">
-      <Link>Content\Textures\Particles\smoke.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Textures\Particles\spark.png">
       <Link>Content\Textures\Particles\spark.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Textures\Particles\spark.xnb">
-      <Link>Content\Textures\Particles\spark.xnb</Link>
-    </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Particles\laserExplosion.xml">
-      <Link>Content\Particles\laserExplosion.xml</Link>
-    </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Particles\mineExplosion.xml">
-      <Link>Content\Particles\mineExplosion.xml</Link>
-    </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Particles\rocketExplosion.xml">
-      <Link>Content\Particles\rocketExplosion.xml</Link>
-    </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Particles\rocketTrail.xml">
-      <Link>Content\Particles\rocketTrail.xml</Link>
-    </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Particles\shipExplosion.xml">
-      <Link>Content\Particles\shipExplosion.xml</Link>
-    </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Particles\shipSpawn.xml">
-      <Link>Content\Particles\shipSpawn.xml</Link>
-    </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Fonts\NetRumbleFont.xnb">
-      <Link>Content\Fonts\NetRumbleFont.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Fonts\NetRumbleFont.png">
       <Link>Content\Fonts\NetRumbleFont.png</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Fonts\MessageBox.xnb">
-      <Link>Content\Fonts\MessageBox.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Fonts\MessageBox.spritefont">
       <Link>Content\Fonts\MessageBox.spritefont</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Fonts\MenuFont.xnb">
-      <Link>Content\Fonts\MenuFont.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Fonts\MenuFont.spritefont">
       <Link>Content\Fonts\MenuFont.spritefont</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomCombine.fsh">
-      <Link>Content\BloomPostprocess\Effects\BloomCombine.fsh</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomCombine.fx">
       <Link>Content\BloomPostprocess\Effects\BloomCombine.fx</Link>
     </None>
     <None Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomCombine.xnb">
       <Link>Content\BloomPostprocess\Effects\BloomCombine.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomExtract.fsh">
-      <Link>Content\BloomPostprocess\Effects\BloomExtract.fsh</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomExtract.fx">
       <Link>Content\BloomPostprocess\Effects\BloomExtract.fx</Link>
     </None>
     <None Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomExtract.xnb">
       <Link>Content\BloomPostprocess\Effects\BloomExtract.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\GaussianBlur.fsh">
-      <Link>Content\BloomPostprocess\Effects\GaussianBlur.fsh</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\GaussianBlur.fx">
       <Link>Content\BloomPostprocess\Effects\GaussianBlur.fx</Link>
     </None>
     <None Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\GaussianBlur.xnb">
       <Link>Content\BloomPostprocess\Effects\GaussianBlur.xnb</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\rocket.xnb">
-      <Link>Content\Audio\wav\rocket.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\rocket.wav">
       <Link>Content\Audio\wav\rocket.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\powerup_touch.xnb">
-      <Link>Content\Audio\wav\powerup_touch.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\powerup_touch.wav">
       <Link>Content\Audio\wav\powerup_touch.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\powerup_spawn.xnb">
-      <Link>Content\Audio\wav\powerup_spawn.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\powerup_spawn.wav">
       <Link>Content\Audio\wav\powerup_spawn.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\player_spawn.xnb">
-      <Link>Content\Audio\wav\player_spawn.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\player_spawn.wav">
       <Link>Content\Audio\wav\player_spawn.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\menu_select.xnb">
-      <Link>Content\Audio\wav\menu_select.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\menu_select.wav">
       <Link>Content\Audio\wav\menu_select.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\menu_scroll.xnb">
-      <Link>Content\Audio\wav\menu_scroll.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\menu_scroll.wav">
       <Link>Content\Audio\wav\menu_scroll.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_rocket2.xnb">
-      <Link>Content\Audio\wav\fire_rocket2.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_rocket2.wav">
       <Link>Content\Audio\wav\fire_rocket2.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_rocket1.xnb">
-      <Link>Content\Audio\wav\fire_rocket1.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_rocket1.wav">
       <Link>Content\Audio\wav\fire_rocket1.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser3.xnb">
-      <Link>Content\Audio\wav\fire_laser3.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser3.wav">
       <Link>Content\Audio\wav\fire_laser3.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser2.xnb">
-      <Link>Content\Audio\wav\fire_laser2.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser2.wav">
       <Link>Content\Audio\wav\fire_laser2.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser1.xnb">
-      <Link>Content\Audio\wav\fire_laser1.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser1.wav">
       <Link>Content\Audio\wav\fire_laser1.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_shockwave.xnb">
-      <Link>Content\Audio\wav\explosion_shockwave.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_shockwave.wav">
       <Link>Content\Audio\wav\explosion_shockwave.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_medium.xnb">
-      <Link>Content\Audio\wav\explosion_medium.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_medium.wav">
       <Link>Content\Audio\wav\explosion_medium.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_large.xnb">
-      <Link>Content\Audio\wav\explosion_large.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_large.wav">
       <Link>Content\Audio\wav\explosion_large.wav</Link>
     </None>
-    <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\asteroid_touch.xnb">
-      <Link>Content\Audio\wav\asteroid_touch.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\NetRumble\Content\Audio\wav\asteroid_touch.wav">
       <Link>Content\Audio\wav\asteroid_touch.wav</Link>
     </None>
+    <None Include="..\..\MacOS\NetRumble\Content\Effects\Clouds.fx">
+      <Link>Content\Effects\Clouds.fx</Link>
+    </None>
+    <None Include="..\..\MacOS\NetRumble\Content\Effects\Clouds.xnb">
+      <Link>Content\Effects\Clouds.xnb</Link>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
@@ -548,10 +371,6 @@
       <Link>BloomPostprocess\BloomComponent.cs</Link>
     </Compile>
     <Compile Include="AudioManager.cs" />
-    <Compile Include="Effects\GaussianBlurEffect.cs" />
-    <Compile Include="Effects\CloudsEffect.cs" />
-    <Compile Include="Effects\BloomExtractEffect.cs" />
-    <Compile Include="Effects\BloomCombineEffect.cs" />
     <Compile Include="Rendering\Starfield.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -594,9 +413,263 @@
     <Folder Include="Content\BloomPostprocess\" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\asteroid_touch.xnb">
+      <Link>Content\Audio\wav\asteroid_touch.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\rocket.xnb">
+      <Link>Content\Audio\wav\rocket.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\powerup_touch.xnb">
+      <Link>Content\Audio\wav\powerup_touch.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\powerup_spawn.xnb">
+      <Link>Content\Audio\wav\powerup_spawn.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\player_spawn.xnb">
+      <Link>Content\Audio\wav\player_spawn.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\menu_select.xnb">
+      <Link>Content\Audio\wav\menu_select.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\menu_scroll.xnb">
+      <Link>Content\Audio\wav\menu_scroll.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_rocket2.xnb">
+      <Link>Content\Audio\wav\fire_rocket2.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_rocket1.xnb">
+      <Link>Content\Audio\wav\fire_rocket1.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser3.xnb">
+      <Link>Content\Audio\wav\fire_laser3.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser2.xnb">
+      <Link>Content\Audio\wav\fire_laser2.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\fire_laser1.xnb">
+      <Link>Content\Audio\wav\fire_laser1.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_shockwave.xnb">
+      <Link>Content\Audio\wav\explosion_shockwave.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_medium.xnb">
+      <Link>Content\Audio\wav\explosion_medium.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Audio\wav\explosion_large.xnb">
+      <Link>Content\Audio\wav\explosion_large.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomCombine.fsh">
+      <Link>Content\BloomPostprocess\Effects\BloomCombine.fsh</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\BloomExtract.fsh">
+      <Link>Content\BloomPostprocess\Effects\BloomExtract.fsh</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\BloomPostprocess\Effects\GaussianBlur.fsh">
+      <Link>Content\BloomPostprocess\Effects\GaussianBlur.fsh</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Fonts\NetRumbleFont.xnb">
+      <Link>Content\Fonts\NetRumbleFont.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Fonts\MessageBox.xnb">
+      <Link>Content\Fonts\MessageBox.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Fonts\MenuFont.xnb">
+      <Link>Content\Fonts\MenuFont.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Particles\laserExplosion.xml">
+      <Link>Content\Particles\laserExplosion.xml</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Particles\mineExplosion.xml">
+      <Link>Content\Particles\mineExplosion.xml</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Particles\rocketExplosion.xml">
+      <Link>Content\Particles\rocketExplosion.xml</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Particles\rocketTrail.xml">
+      <Link>Content\Particles\rocketTrail.xml</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Particles\shipExplosion.xml">
+      <Link>Content\Particles\shipExplosion.xml</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Particles\shipSpawn.xml">
+      <Link>Content\Particles\shipSpawn.xml</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\One Step Beyond.xnb">
+      <Link>Content\One Step Beyond.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\title.xnb">
+      <Link>Content\Textures\title.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\shipShields.xnb">
+      <Link>Content\Textures\shipShields.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship3Overlay.xnb">
+      <Link>Content\Textures\ship3Overlay.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship3.xnb">
+      <Link>Content\Textures\ship3.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship2Overlay.xnb">
+      <Link>Content\Textures\ship2Overlay.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship2.xnb">
+      <Link>Content\Textures\ship2.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship1Overlay.xnb">
+      <Link>Content\Textures\ship1Overlay.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship1.xnb">
+      <Link>Content\Textures\ship1.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship0Overlay.xnb">
+      <Link>Content\Textures\ship0Overlay.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ship0.xnb">
+      <Link>Content\Textures\ship0.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\rocket.xnb">
+      <Link>Content\Textures\rocket.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\ready.xnb">
+      <Link>Content\Textures\ready.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\powerupTripleLaser.xnb">
+      <Link>Content\Textures\powerupTripleLaser.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\powerupRocket.xnb">
+      <Link>Content\Textures\powerupRocket.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\powerupDoubleLaser.xnb">
+      <Link>Content\Textures\powerupDoubleLaser.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\mine.xnb">
+      <Link>Content\Textures\mine.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\laser.xnb">
+      <Link>Content\Textures\laser.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\explosion.xnb">
+      <Link>Content\Textures\explosion.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\clouds.xnb">
+      <Link>Content\Textures\clouds.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\chatTalking.xnb">
+      <Link>Content\Textures\chatTalking.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\chatMute.xnb">
+      <Link>Content\Textures\chatMute.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\chatAble.xnb">
+      <Link>Content\Textures\chatAble.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\blank.xnb">
+      <Link>Content\Textures\blank.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\barrierRed.xnb">
+      <Link>Content\Textures\barrierRed.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\barrierPurple.xnb">
+      <Link>Content\Textures\barrierPurple.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\barrierEnd.xnb">
+      <Link>Content\Textures\barrierEnd.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\asteroid2.xnb">
+      <Link>Content\Textures\asteroid2.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\asteroid1.xnb">
+      <Link>Content\Textures\asteroid1.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\asteroid0.xnb">
+      <Link>Content\Textures\asteroid0.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\Particles\defaultParticle.xnb">
+      <Link>Content\Textures\Particles\defaultParticle.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\Particles\particle.xnb">
+      <Link>Content\Textures\Particles\particle.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\Particles\smoke.xnb">
+      <Link>Content\Textures\Particles\smoke.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Textures\Particles\spark.xnb">
+      <Link>Content\Textures\Particles\spark.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\NetRumble\Content\Effects\Clouds.fsh">
+      <Link>Content\Effects\Clouds.fsh</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Linux.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.Linux</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>

+ 11 - 8
Samples/Linux/NetworkStateManagement/NetworkStateManagement.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,7 +11,6 @@
     <RootNamespace>NetworkStateManagement</RootNamespace>
     <AssemblyName>NetworkStateManagement</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -121,12 +120,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
-      <Project>{7DE47032-A904-4C29-BD22-2D235E8D91BA}</Project>
-      <Name>MonoGame.Framework.Windows</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="..\..\MacOS\NetworkStateManagement\Content\background.xnb">
       <Link>Content\background.xnb</Link>
@@ -185,4 +178,14 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+      <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
+      <Name>MonoGame.Framework.Linux</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Linux.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.Linux</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>

BIN
Samples/Linux/NetworkStateManagement/Resources.resources


+ 98 - 0
Samples/Linux/ParticleSample/ParticleSample.csproj

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ParticleSample</RootNamespace>
+    <AssemblyName>ParticleSample</AssemblyName>
+    <StartupObject>ParticleSample.Program</StartupObject>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <None Include="..\..\MacOS\ParticleSample\Background.png">
+      <Link>Background.png</Link>
+    </None>
+    <None Include="..\..\MacOS\ParticleSample\Game.ico">
+      <Link>Game.ico</Link>
+    </None>
+    <None Include="..\..\MacOS\ParticleSample\GameThumbnail.png">
+      <Link>GameThumbnail.png</Link>
+    </None>
+    <None Include="..\..\MacOS\ParticleSample\Content\explosion.png">
+      <Link>Content\explosion.png</Link>
+    </None>
+    <None Include="..\..\MacOS\ParticleSample\Content\font.spritefont">
+      <Link>Content\font.spritefont</Link>
+    </None>
+    <None Include="..\..\MacOS\ParticleSample\Content\smoke.bmp">
+      <Link>Content\smoke.bmp</Link>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\MacOS\ParticleSample\ExplosionParticleSystem.cs">
+      <Link>ExplosionParticleSystem.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MacOS\ParticleSample\ExplosionSmokeParticleSystem.cs">
+      <Link>ExplosionSmokeParticleSystem.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MacOS\ParticleSample\Particle.cs">
+      <Link>Particle.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MacOS\ParticleSample\ParticleSampleGame.cs">
+      <Link>ParticleSampleGame.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MacOS\ParticleSample\ParticleSystem.cs">
+      <Link>ParticleSystem.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MacOS\ParticleSample\SmokePlumeParticleSystem.cs">
+      <Link>SmokePlumeParticleSystem.cs</Link>
+    </Compile>
+    <Compile Include="Program.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+      <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
+      <Name>MonoGame.Framework.Linux</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\MacOS\ParticleSample\Content\explosion.xnb">
+      <Link>Content\explosion.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\ParticleSample\Content\font.xnb">
+      <Link>Content\font.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\ParticleSample\Content\smoke.xnb">
+      <Link>Content\smoke.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+</Project>

+ 19 - 0
Samples/Linux/ParticleSample/Program.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace ParticleSample
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        static void Main(string[] args)
+        {
+            using (ParticleSampleGame game = new ParticleSampleGame())
+            {
+                game.Run();
+            }
+        }
+    }
+}
+

+ 7 - 3
Samples/Linux/Peer2PeerSample/MonoGame.Samples.Peer2PeerSample.Linux.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Peer2PeerSample</RootNamespace>
     <AssemblyName>Peer2PeerSample</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,9 +69,13 @@
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Linux.csproj">
+      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Name>Lidgren.Network.Linux</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>

+ 20 - 0
Samples/Linux/RenderTarget2DSample/Program.cs

@@ -0,0 +1,20 @@
+using System;
+
+namespace RenderTarget2DSample
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        static void Main(string[] args)
+        {
+            using (Game1 game = new Game1())
+            {
+                game.Run();
+            }
+        }
+    }
+}
+
+

+ 70 - 0
Samples/Linux/RenderTarget2DSample/RenderTarget2DSample.csproj

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DED4371E-B92B-46FC-B4A3-B56BCAE12477}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>RenderTarget2DSample</RootNamespace>
+    <AssemblyName>RenderTarget2DSample</AssemblyName>
+    <StartupObject>RenderTarget2DSample.Program</StartupObject>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+      <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
+      <Name>MonoGame.Framework.Linux</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\MacOS\RenderTarget2DSample\Background.png">
+      <Link>Background.png</Link>
+    </None>
+    <None Include="..\..\MacOS\RenderTarget2DSample\Game.ico">
+      <Link>Game.ico</Link>
+    </None>
+    <None Include="..\..\MacOS\RenderTarget2DSample\GameThumbnail.png">
+      <Link>GameThumbnail.png</Link>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\MacOS\RenderTarget2DSample\Game1.cs">
+      <Link>Game1.cs</Link>
+    </Compile>
+    <Compile Include="Program.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\MacOS\RenderTarget2DSample\Content\MooTheMerciless.xnb">
+      <Link>Content\MooTheMerciless.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\RenderTarget2DSample\Content\wood.xnb">
+      <Link>Content\wood.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+</Project>

+ 3 - 4
Samples/Linux/Sound/MonoGame.Samples.Sound.Linux.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Draw2D</RootNamespace>
     <AssemblyName>Draw2D</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -74,7 +73,7 @@
   </Target>
   -->
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>

+ 37 - 35
Samples/Linux/SpriteEffects/MonoGame.Samples.SpriteEffects.Linux.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>SpriteEffects</RootNamespace>
     <AssemblyName>SpriteEffects</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,56 +40,24 @@
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\MacOS\SpriteEffects\Content\waterfall.xnb">
-      <Link>Content\waterfall.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="..\..\MacOS\SpriteEffects\Content\refraction.fx">
       <Link>Content\refraction.fx</Link>
     </None>
-    <None Include="..\..\MacOS\SpriteEffects\Content\refraction.fsh">
-      <Link>Content\refraction.fsh</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="..\..\MacOS\SpriteEffects\Content\normalmap.fx">
       <Link>Content\normalmap.fx</Link>
     </None>
-    <None Include="..\..\MacOS\SpriteEffects\Content\normalmap.fsh">
-      <Link>Content\normalmap.fsh</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\MacOS\SpriteEffects\Content\glacier.xnb">
-      <Link>Content\glacier.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="..\..\MacOS\SpriteEffects\Content\disappear.fx">
       <Link>Content\disappear.fx</Link>
     </None>
-    <None Include="..\..\MacOS\SpriteEffects\Content\disappear.fsh">
-      <Link>Content\disappear.fsh</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="..\..\MacOS\SpriteEffects\Content\desaturate.fx">
       <Link>Content\desaturate.fx</Link>
     </None>
-    <None Include="..\..\MacOS\SpriteEffects\Content\desaturate.fsh">
-      <Link>Content\desaturate.fsh</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\MacOS\SpriteEffects\Content\cat_normalmap.xnb">
-      <Link>Content\cat_normalmap.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="..\..\MacOS\SpriteEffects\Content\cat_depth.jpg">
       <Link>Content\cat_depth.jpg</Link>
     </None>
     <None Include="..\..\MacOS\SpriteEffects\Content\cat_alpha.jpg">
       <Link>Content\cat_alpha.jpg</Link>
     </None>
-    <None Include="..\..\MacOS\SpriteEffects\Content\cat.xnb">
-      <Link>Content\cat.xnb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="..\..\MacOS\SpriteEffects\Content\cat.jpg">
       <Link>Content\cat.jpg</Link>
     </None>
@@ -111,9 +79,43 @@
     <Compile Include="DesaturateEffect.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\MacOS\SpriteEffects\Content\waterfall.xnb">
+      <Link>Content\waterfall.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\SpriteEffects\Content\refraction.fsh">
+      <Link>Content\refraction.fsh</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\SpriteEffects\Content\normalmap.fsh">
+      <Link>Content\normalmap.fsh</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\SpriteEffects\Content\glacier.xnb">
+      <Link>Content\glacier.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\SpriteEffects\Content\disappear.fsh">
+      <Link>Content\disappear.fsh</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\SpriteEffects\Content\desaturate.fsh">
+      <Link>Content\desaturate.fsh</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\SpriteEffects\Content\cat_normalmap.xnb">
+      <Link>Content\cat_normalmap.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\SpriteEffects\Content\cat.xnb">
+      <Link>Content\cat.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>

+ 22 - 16
Samples/Linux/Tetris/MonoGame.Samples.Tetris.Linux.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Tetris</RootNamespace>
     <AssemblyName>Tetris</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,12 +40,6 @@
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\MacOS\Tetris\Content\tetris.png">
-      <Link>Content\tetris.png</Link>
-    </None>
-    <None Include="..\..\MacOS\Tetris\Content\score.png">
-      <Link>Content\score.png</Link>
-    </None>
     <None Include="..\..\MacOS\Tetris\Content\font.spritefont">
       <Link>Content\font.spritefont</Link>
     </None>
@@ -55,12 +49,6 @@
     <None Include="..\..\MacOS\Tetris\Content\background.psd">
       <Link>Content\background.psd</Link>
     </None>
-    <None Include="..\..\MacOS\Tetris\Content\background.png">
-      <Link>Content\background.png</Link>
-    </None>
-    <None Include="..\..\MacOS\Tetris\Content\Arial.xnb">
-      <Link>Content\Arial.xnb</Link>
-    </None>
     <None Include="..\..\MacOS\Tetris\Info.plist">
       <Link>Info.plist</Link>
     </None>
@@ -85,12 +73,30 @@
     <Compile Include="Engine.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <Folder Include="Content\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Content\" />
+    <Content Include="..\..\MacOS\Tetris\Content\Arial.xnb">
+      <Link>Content\Arial.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\Tetris\Content\background.png">
+      <Link>Content\background.png</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\Tetris\Content\tetris.png">
+      <Link>Content\tetris.png</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\MacOS\Tetris\Content\score.png">
+      <Link>Content\score.png</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 </Project>

+ 3 - 3
Samples/Linux/TiledSprites/MonoGame.Samples.TiledSprites.Linux.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>TiledSprites</RootNamespace>
     <AssemblyName>TiledSprites</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -81,7 +81,7 @@
     <Content Include="GameThumbnail.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj">
       <Project>{35253CE1-C864-4CD3-8249-4D1319748E8F}</Project>
       <Name>MonoGame.Framework.Linux</Name>
     </ProjectReference>

+ 1 - 1
Samples/MacOS/BookSourceCode/XNAGameDevelopmentbyExampleCode/AsteroidBeltAssault/AsteroidBeltAssault.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1585306B-CF46-479D-B234-1E10EDF4D741}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>AsteroidBeltAssault</RootNamespace>
     <AssemblyName>AsteroidBeltAssault</AssemblyName>

+ 1 - 1
Samples/MacOS/BookSourceCode/XNAGameDevelopmentbyExampleCode/FloodControl/FloodControl.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F3115910-E6D1-450D-97FB-A8168A5D622E}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>FloodControl</RootNamespace>
     <AssemblyName>FloodControl</AssemblyName>

+ 1 - 1
Samples/MacOS/BookSourceCode/XNAGameDevelopmentbyExampleCode/GemstoneHunter/GemstoneHunter.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{81313197-A8DF-4465-B503-2DD8248B80A9}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>GemstoneHunter</RootNamespace>
     <AssemblyName>GemstoneHunter</AssemblyName>

+ 1 - 1
Samples/MacOS/BookSourceCode/XNAGameDevelopmentbyExampleCode/RobotRampage/RobotRampage.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9522776F-02BA-4BED-B8BB-6BAE580F4068}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>RobotRampage</RootNamespace>
     <AssemblyName>RobotRampage</AssemblyName>

+ 1 - 1
Samples/MacOS/BouncingBox/MonoGame.Samples.BouncingBox.MacOS.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4480BF44-7CE2-4A22-9372-DAFA3B05390E}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>Microsoft.Xna.Samples.BouncingBox.MacOS</RootNamespace>
     <AssemblyName>Microsoft.Xna.Samples.BouncingBox.MacOS</AssemblyName>

+ 1 - 1
Samples/MacOS/ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.MacOS.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D03F3BAF-E4D0-4B6B-A567-9A0E2F882335}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>ChaseAndEvade</RootNamespace>
     <AssemblyName>ChaseAndEvade</AssemblyName>

+ 1 - 1
Samples/MacOS/Draw2D/MonoGame.Samples.Draw2D.MacOS.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A82EAD58-40D7-49BE-8F24-09FEA34F9E55}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>MonoGame.Samples.Draw2D.MacOS</RootNamespace>
     <AssemblyName>MonoGame.Samples.Draw2D.MacOS</AssemblyName>

BIN
Samples/MacOS/GameStateManagement/Content/menufont.xnb


+ 1 - 1
Samples/MacOS/GameStateManagement/GameStateManagement.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4AD6BC7A-DB9A-4A6F-9EE2-DAD9B0BBA2A8}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>GameStateManagement</RootNamespace>
     <AssemblyName>GameStateManagement</AssemblyName>

+ 2 - 2
Samples/MacOS/GooCursor/Cursor.cs

@@ -244,12 +244,12 @@ namespace GooCursor
             position.X = mouseState.X;
             position.Y = mouseState.Y;
             #endif
-
+			Console.WriteLine(position);
             // modify position using delta, the CursorSpeed, and
             // the elapsed game time.
             position += deltaMovement * CursorSpeed *
                 (float)gameTime.ElapsedGameTime.TotalSeconds;
-
+			
 
             #if XBOX360
             // clamp the cursor position to the viewport, so that it can't move off the

+ 1 - 1
Samples/MacOS/GooCursor/GooCursor.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{18E6467D-47C4-47CA-8CD1-508AD311C054}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>GooCursor</RootNamespace>
     <AssemblyName>GooCursor</AssemblyName>

+ 1 - 1
Samples/MacOS/HoneycombRush/HoneycombRush.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2C0696B3-0D1E-4039-B4AB-9A210B3CF290}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>HoneycombRush</RootNamespace>
     <AssemblyName>HoneycombRush</AssemblyName>

+ 1 - 1
Samples/MacOS/NetRumble/NetRumble.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{52735207-2136-433B-A3E4-4C082728EED8}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>NetRumble</RootNamespace>
     <AssemblyName>NetRumble</AssemblyName>

+ 1 - 1
Samples/MacOS/NetworkPrediction/NetworkPrediction.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{05E3B2AB-1E38-4E19-864D-BECFA95139D6}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>NetworkPrediction</RootNamespace>
     <AssemblyName>NetworkPrediction</AssemblyName>

+ 1 - 1
Samples/MacOS/NetworkStateManagement/NetworkStateManagement.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{71871CF8-8563-4FA3-ABF2-EC1CBBF817E4}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>NetworkStateManagement</RootNamespace>
     <AssemblyName>NetworkStateManagement</AssemblyName>

+ 1 - 1
Samples/MacOS/Particle3DSample/Particle3DSample.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1230A19A-FA76-4D12-85E5-68A452315299}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>Particle3DSample</RootNamespace>
     <AssemblyName>Particle3DSample</AssemblyName>

+ 6 - 6
Samples/MacOS/ParticleSample/ParticleSample.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5CA0180F-C404-431A-87B5-03A26E5BFA23}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>ParticleSample</RootNamespace>
     <AssemblyName>ParticleSample</AssemblyName>
@@ -59,11 +59,6 @@
     <Compile Include="Program.cs" />
     <Compile Include="SmokePlumeParticleSystem.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Content\explosion.xnb" />
-    <Content Include="Content\font.xnb" />
-    <Content Include="Content\smoke.xnb" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
       <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
@@ -74,4 +69,9 @@
       <Name>Lidgren.Network.MacOS</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\explosion.xnb" />
+    <Content Include="Content\font.xnb" />
+    <Content Include="Content\smoke.xnb" />
+  </ItemGroup>
 </Project>

+ 1 - 1
Samples/MacOS/ParticleSettingsMac/ParticleSettingsMac.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3388FF68-6F15-4F36-B226-7823E5309E92}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>ParticleSettingsWindows</RootNamespace>
     <AssemblyName>ParticleSettings</AssemblyName>

+ 1 - 1
Samples/MacOS/Peer2PeerSample/Peer2PeerSample.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{27C1B777-4E37-4E2B-9CE4-5FDEE8CD9C40}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>Peer2PeerSample</RootNamespace>
     <AssemblyName>Peer2PeerSample</AssemblyName>

+ 1 - 1
Samples/MacOS/PerPixelCollisionSample/PerPixelCollisionSample.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{56C67234-2829-4AB0-8FEE-C8D01617CDCE}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>PerPixelCollisionSample</RootNamespace>
     <AssemblyName>PerPixelCollisionSample</AssemblyName>

+ 1 - 1
Samples/MacOS/RectangleCollisionSample/RectangleCollisionSample.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{466FBEF8-3AB2-4CED-92B6-6250CFD310DB}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>RectangleCollisionSample</RootNamespace>
     <AssemblyName>RectangleCollisionSample</AssemblyName>

+ 1 - 1
Samples/MacOS/RolePlayingGame/RolePlayingGame.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{75200892-E593-49EE-82D5-F59DB45883AD}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>RolePlayingGame</RootNamespace>
     <AssemblyName>RolePlayingGame</AssemblyName>

+ 1 - 1
Samples/MacOS/SpriteEffects/SpriteEffects.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3B9ABB34-4D0F-4CFD-A02D-30D5569A060B}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>SpriteEffects</RootNamespace>
     <AssemblyName>SpriteEffects</AssemblyName>

+ 1 - 1
Samples/MacOS/Tetris/MonoGame.Samples.Tetris.MacOS.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FE144248-B1ED-4A7C-980C-7A2E603CE604}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>Tetris</RootNamespace>
     <AssemblyName>Tetris</AssemblyName>

+ 1 - 1
Samples/MacOS/TiledSprites/MonoGame.Samples.TiledSprites.MacOS.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7D24D7EA-822C-4991-8BC9-1C2EF9C5F59A}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>TiledSprites</RootNamespace>
     <AssemblyName>TiledSprites</AssemblyName>

+ 1 - 1
Samples/MacOS/TransformedCollisionSample/TransformedCollisionSample.csproj

@@ -6,7 +6,7 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73162561-6D3B-4A7F-AC4B-E7040B0824BE}</ProjectGuid>
-    <ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>TransformedCollisionSample</RootNamespace>
     <AssemblyName>TransformedCollisionSample</AssemblyName>

+ 0 - 0
Samples/iOS/Video/monogameicon.png → Samples/MacOS/VideoPlayer/Content/monogameicon.png


BIN
Samples/MacOS/VideoPlayer/Content/sintel_trailer.m4v


+ 0 - 0
Samples/iOS/Video/Content/SpriteFont1.xnb → Samples/MacOS/VideoPlayer/Content/spriteFont1.xnb


+ 0 - 0
Samples/iOS/Video/Default.png → Samples/MacOS/VideoPlayer/Default.png


+ 41 - 30
Samples/iOS/Video/Game1.cs → Samples/MacOS/VideoPlayer/Game1.cs

@@ -1,13 +1,18 @@
-
 using System;
+using System.Collections.Generic;
+
+#if ANDROID
+using Android.App;
+#endif
 
-using Microsoft.Xna;
 using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Media;
 using Microsoft.Xna.Framework.Input;
+using Microsoft.Xna.Framework.Media;
+using Microsoft.Xna.Framework.Storage;
 
-namespace Microsoft.Xna.Samples.VideoSample
+namespace MonoGame.Samples.VideoPlayer
 {
 	/// <summary>
 	/// This is the main type for your game
@@ -15,18 +20,26 @@ namespace Microsoft.Xna.Samples.VideoSample
 	public class Game1 : Microsoft.Xna.Framework.Game
 	{
 		GraphicsDeviceManager graphics;
-		SpriteBatch spriteBatch;
+		SpriteBatch spriteBatch;		
+		
 		SpriteFont font;
+		
 		Video video;
-		VideoPlayer player;
-
-		public Game1 ()
+		Microsoft.Xna.Framework.Media.VideoPlayer videoPlayer;
+		bool playVideo = false;
+		
+        public Game1 ()  
 		{
 			graphics = new GraphicsDeviceManager (this);
+			
 			Content.RootDirectory = "Content";
-			graphics.IsFullScreen = true;
-		}
+			
+			graphics.PreferMultiSampling = true;
+			graphics.IsFullScreen = true;	
 
+			graphics.SupportedOrientations = DisplayOrientation.LandscapeLeft | DisplayOrientation.LandscapeRight;
+		}
+		
 		/// <summary>
 		/// Allows the game to perform any initialization it needs to before starting to run.
 		/// This is where it can query for any required services and load any non-graphic
@@ -36,10 +49,8 @@ namespace Microsoft.Xna.Samples.VideoSample
 		protected override void Initialize ()
 		{
 			// TODO: Add your initialization logic here
-			player = new VideoPlayer(this);
-			
-			base.Initialize ();
 
+			base.Initialize ();
 		}
 
 		/// <summary>
@@ -51,9 +62,12 @@ namespace Microsoft.Xna.Samples.VideoSample
 			// Create a new SpriteBatch, which can be used to draw textures.
 			spriteBatch = new SpriteBatch (GraphicsDevice);
 
-			//TODO: use this.Content to load your game content here 
-			font = Content.Load<SpriteFont>("SpriteFont1");
-			video = Content.Load<Video>("MonoGame.m4v");
+			// TODO: use this.Content to load your game content here
+			font = Content.Load<SpriteFont> ("spriteFont1");
+			
+			video = Content.Load<Video> ("sintel_trailer");
+			videoPlayer = new Microsoft.Xna.Framework.Media.VideoPlayer(this);
+			playVideo = true;
 		}
 
 		/// <summary>
@@ -63,15 +77,16 @@ namespace Microsoft.Xna.Samples.VideoSample
 		/// <param name="gameTime">Provides a snapshot of timing values.</param>
 		protected override void Update (GameTime gameTime)
 		{
-			// TODO: Add your update logic here			
-			
-			if (Mouse.GetState().X != 0)
+			// TODO: Add your update logic here
+			if (playVideo)
 			{
-				if (player.State != MediaState.Playing)
-					player.Play(video);
-				Mouse.SetPosition(0,0);
+				if (videoPlayer.State == MediaState.Stopped) 
+				{
+					videoPlayer.Play(video);
+					playVideo = false;
+				}
 			}
-			
+
 			base.Update (gameTime);
 		}
 
@@ -82,15 +97,11 @@ namespace Microsoft.Xna.Samples.VideoSample
 		protected override void Draw (GameTime gameTime)
 		{
 			graphics.GraphicsDevice.Clear (Color.CornflowerBlue);
-
-			//TODO: Add your drawing code here
-			spriteBatch.Begin();
-			
-			spriteBatch.DrawString(font,"Tap To Play",new Vector2(65,200),Color.Black);
 			
+			// Won't be visible until we hide the movie
+			spriteBatch.Begin();
+			spriteBatch.DrawString(font, "Video has ended, let the Game BEGIN!!", new Vector2 (50, 40), Color.Red);
 			spriteBatch.End();
-
-			base.Draw (gameTime);
 		}
 	}
 }

+ 16 - 0
Samples/MacOS/VideoPlayer/Info.plist

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.MonoGame.Samples.VideoPlayer.MacOS</string>
+	<key>CFBundleName</key>
+	<string>MonoGame.Samples.VideoPlayer.MacOS</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.6</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

+ 73 - 0
Samples/MacOS/VideoPlayer/MonoGame.Samples.VideoPlayer.MacOS.csproj

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{71192C89-7FB6-49A4-A19D-FC89E3D18248}</ProjectGuid>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>MonoGame.Samples.VideoPlayer</RootNamespace>
+    <AssemblyName>MonoGame.Samples.VideoPlayer.MacOS</AssemblyName>
+    <StartupObject>MonoGame.Samples.VideoPlayer.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG MONOMAC</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <StartupObject>Microsoft.Xna.Samples.Draw2D.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <StartupObject>Microsoft.Xna.Samples.Draw2D.Program</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="MonoMac, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\MonoMac\monomac\src\MonoMac.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
+  <ItemGroup>
+    <Folder Include="Content\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="main.cs" />
+    <Compile Include="Game1.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="monogameicon.png" />
+    <Content Include="Content\spriteFont1.xnb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\sintel_trailer.m4v">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Info.plist" />
+  </ItemGroup>
+</Project>

+ 39 - 0
Samples/MacOS/VideoPlayer/main.cs

@@ -0,0 +1,39 @@
+using MonoMac.AppKit;
+using MonoMac.Foundation;
+
+namespace MonoGame.Samples.VideoPlayer
+{
+	class Program
+	{
+		static void Main (string[] args)
+		{
+			NSApplication.Init ();
+
+			using (var p = new NSAutoreleasePool ()) {
+				NSApplication.SharedApplication.Delegate = new AppDelegate ();
+
+				// Set our Application Icon
+				NSImage appIcon = NSImage.ImageNamed ("monogameicon.png");
+				NSApplication.SharedApplication.ApplicationIconImage = appIcon;
+				
+				NSApplication.Main (args);
+			}
+		}
+	}
+
+	class AppDelegate : NSApplicationDelegate
+	{
+		private Game1 game;
+
+		public override void FinishedLaunching (MonoMac.Foundation.NSObject notification)
+		{
+			game = new Game1 ();
+			game.Run ();
+		}
+
+		public override bool ApplicationShouldTerminateAfterLastWindowClosed (NSApplication sender)
+		{
+			return true;
+		}
+	}	
+}

BIN
Samples/MacOS/VideoPlayer/monogameicon.png


+ 7 - 1
Samples/MonoGame.Samples.Android.sln

@@ -15,12 +15,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.RenderTarg
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sound", "Android\Sound\Sound.csproj", "{E2B6ED3C-A769-47AF-9605-A7410F194B1C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.VideoPlayer", "Android\VideoPlayer\MonoGame.Samples.VideoPlayer.csproj", "{27C3DD7C-5322-4C2D-8EE4-07610390CDAF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{27C3DD7C-5322-4C2D-8EE4-07610390CDAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27C3DD7C-5322-4C2D-8EE4-07610390CDAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27C3DD7C-5322-4C2D-8EE4-07610390CDAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27C3DD7C-5322-4C2D-8EE4-07610390CDAF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -53,7 +59,7 @@ Global
 		{E2B6ED3C-A769-47AF-9605-A7410F194B1C}.Release|Any CPU.Deploy.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Android\RenderTarget2D\MonoGame.Samples.RenderTarget2D.Android.csproj
+		StartupItem = ..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 452 - 0
Samples/MonoGame.Samples.Linux.sln

@@ -0,0 +1,452 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.ChaseAndEvade.Linux", "Linux\ChaseAndEvade\MonoGame.Samples.ChaseAndEvade.Linux.csproj", "{86A619E2-C8F0-452B-B764-C69D5BB07C98}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Draw2D.Linux", "Linux\Draw2D\MonoGame.Samples.Draw2D.Linux.csproj", "{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.Linux", "..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Linux.csproj", "{35253CE1-C864-4CD3-8249-4D1319748E8F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.Linux", "..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Linux.csproj", "{AE483C29-042E-4226-BA52-D247CE7676DA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.NetRumble.Linux", "Linux\NetRumble\MonoGame.Samples.NetRumble.Linux.csproj", "{52735207-2136-433B-A3E4-4C082728EED8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Tetris.Linux", "Linux\Tetris\MonoGame.Samples.Tetris.Linux.csproj", "{86A619E2-C8F0-452B-B762-C69D5BB07C98}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetworkStateManagement", "Linux\NetworkStateManagement\NetworkStateManagement.csproj", "{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Peer2PeerSample.Linux", "Linux\Peer2PeerSample\MonoGame.Samples.Peer2PeerSample.Linux.csproj", "{86A619E2-C8D0-452B-B762-C69D5BB07C98}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Sound.Linux", "Linux\Sound\MonoGame.Samples.Sound.Linux.csproj", "{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.SpriteEffects.Linux", "Linux\SpriteEffects\MonoGame.Samples.SpriteEffects.Linux.csproj", "{86A919E2-D7F0-452B-B762-C69D5BB07C98}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.TiledSprites.Linux", "Linux\TiledSprites\MonoGame.Samples.TiledSprites.Linux.csproj", "{86A619E2-C8F0-452B-A762-C69D5BB07C98}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParticleSample", "Linux\ParticleSample\ParticleSample.csproj", "{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GooCursor", "Linux\GooCursor\GooCursor.csproj", "{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenderTarget2DSample", "Linux\RenderTarget2DSample\RenderTarget2DSample.csproj", "{DED4371E-B92B-46FC-B4A3-B56BCAE12477}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BookSourceCode", "BookSourceCode", "{A28FF8DB-5350-4D08-A94D-93C3C67FCB63}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.RobotRampage.Linux", "Linux\BookSourceCode\XNAGameDevelopmentbyExampleCode\RobotRampage\MonoGame.Samples.RobotRampage.Linux.csproj", "{9522776F-02BA-4BED-B8BB-6BAE580F4068}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tile Engine", "Linux\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\TileEngine\Tile Engine.csproj", "{521972FD-1A9B-4CFD-A435-EB2224985131}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GemstoneHunter", "Linux\BookSourceCode\XNAGameDevelopmentbyExampleCode\GemstoneHunter\GemstoneHunter.csproj", "{86A219E2-C8F0-452B-B762-C69D5BB07C98}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.AsteroidBeltAssault.Linux", "Linux\BookSourceCode\XNAGameDevelopmentbyExampleCode\AsteroidBeltAssault\MonoGame.Samples.AsteroidBeltAssault.Linux.csproj", "{86A219E2-C8F0-452B-B762-C69D5BB07C99}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.FloodControl.Linux", "Linux\BookSourceCode\XNAGameDevelopmentbyExampleCode\FloodControl\MonoGame.Samples.FloodControl.Linux.csproj", "{86A219E2-C8F1-422B-C762-C69D5BB07C98}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|iPhone = Debug|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|Any CPU.Build.0 = Debug|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|iPhone.ActiveCfg = Debug|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|iPhone.Build.0 = Debug|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x86.ActiveCfg = Debug|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x86.Build.0 = Debug|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|Any CPU.ActiveCfg = Release|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|Any CPU.Build.0 = Release|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|iPhone.ActiveCfg = Release|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|iPhone.Build.0 = Release|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|Mixed Platforms.Build.0 = Release|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x86.ActiveCfg = Release|x86
+		{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x86.Build.0 = Release|x86
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Debug|x86.Build.0 = Debug|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|Any CPU.Build.0 = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|iPhone.Build.0 = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|x86.ActiveCfg = Release|Any CPU
+		{521972FD-1A9B-4CFD-A435-EB2224985131}.Release|x86.Build.0 = Release|Any CPU
+		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|Any CPU.Build.0 = Debug|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|iPhone.ActiveCfg = Debug|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|iPhone.Build.0 = Debug|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|x86.ActiveCfg = Debug|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Debug|x86.Build.0 = Debug|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Release|Any CPU.ActiveCfg = Release|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Release|Any CPU.Build.0 = Release|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Release|iPhone.ActiveCfg = Release|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Release|iPhone.Build.0 = Release|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Release|Mixed Platforms.Build.0 = Release|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Release|x86.ActiveCfg = Release|x86
+		{52735207-2136-433B-A3E4-4C082728EED8}.Release|x86.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Any CPU.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhone.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhone.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|x86.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Debug|x86.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|Any CPU.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|Any CPU.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhone.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhone.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|Mixed Platforms.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|x86.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98}.Release|x86.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|Any CPU.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|iPhone.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|iPhone.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|x86.ActiveCfg = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Debug|x86.Build.0 = Debug|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|Any CPU.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|Any CPU.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|iPhone.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|iPhone.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|Mixed Platforms.Build.0 = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|x86.ActiveCfg = Release|x86
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99}.Release|x86.Build.0 = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|Any CPU.Build.0 = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|iPhone.ActiveCfg = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|iPhone.Build.0 = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|x86.ActiveCfg = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Debug|x86.Build.0 = Debug|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|Any CPU.ActiveCfg = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|Any CPU.Build.0 = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|iPhone.ActiveCfg = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|iPhone.Build.0 = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|Mixed Platforms.Build.0 = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|x86.ActiveCfg = Release|x86
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98}.Release|x86.Build.0 = Release|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Debug|Any CPU.Build.0 = Debug|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Debug|iPhone.ActiveCfg = Debug|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Debug|iPhone.Build.0 = Debug|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Debug|x86.ActiveCfg = Debug|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Debug|x86.Build.0 = Debug|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Release|Any CPU.ActiveCfg = Release|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Release|Any CPU.Build.0 = Release|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Release|iPhone.ActiveCfg = Release|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Release|iPhone.Build.0 = Release|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Release|Mixed Platforms.Build.0 = Release|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Release|x86.ActiveCfg = Release|x86
+		{86A619E2-C8D0-452B-B762-C69D5BB07C98}.Release|x86.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Debug|Any CPU.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Debug|iPhone.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Debug|iPhone.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Debug|x86.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Debug|x86.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Release|Any CPU.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Release|Any CPU.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Release|iPhone.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Release|iPhone.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Release|Mixed Platforms.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Release|x86.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-A762-C69D5BB07C98}.Release|x86.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Any CPU.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhone.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhone.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|x86.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Debug|x86.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|Any CPU.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|Any CPU.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhone.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhone.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|Mixed Platforms.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|x86.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-B762-C69D5BB07C98}.Release|x86.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Debug|Any CPU.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Debug|iPhone.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Debug|iPhone.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Debug|x86.ActiveCfg = Debug|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Debug|x86.Build.0 = Debug|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Release|Any CPU.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Release|Any CPU.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Release|iPhone.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Release|iPhone.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Release|Mixed Platforms.Build.0 = Release|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Release|x86.ActiveCfg = Release|x86
+		{86A619E2-C8F0-452B-B764-C69D5BB07C98}.Release|x86.Build.0 = Release|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Debug|Any CPU.Build.0 = Debug|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Debug|iPhone.ActiveCfg = Debug|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Debug|iPhone.Build.0 = Debug|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Debug|x86.ActiveCfg = Debug|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Debug|x86.Build.0 = Debug|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Release|Any CPU.ActiveCfg = Release|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Release|Any CPU.Build.0 = Release|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Release|iPhone.ActiveCfg = Release|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Release|iPhone.Build.0 = Release|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Release|Mixed Platforms.Build.0 = Release|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Release|x86.ActiveCfg = Release|x86
+		{86A919E2-D7F0-452B-B762-C69D5BB07C98}.Release|x86.Build.0 = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|Any CPU.Build.0 = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|iPhone.ActiveCfg = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|iPhone.Build.0 = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|x86.ActiveCfg = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|x86.Build.0 = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|Any CPU.ActiveCfg = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|Any CPU.Build.0 = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|iPhone.ActiveCfg = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|iPhone.Build.0 = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|Mixed Platforms.Build.0 = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|x86.ActiveCfg = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|x86.Build.0 = Release|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Debug|Any CPU.Build.0 = Debug|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Debug|iPhone.ActiveCfg = Debug|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Debug|iPhone.Build.0 = Debug|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Debug|x86.ActiveCfg = Debug|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Debug|x86.Build.0 = Debug|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Release|Any CPU.ActiveCfg = Release|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Release|Any CPU.Build.0 = Release|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Release|iPhone.ActiveCfg = Release|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Release|iPhone.Build.0 = Release|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Release|Mixed Platforms.Build.0 = Release|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Release|x86.ActiveCfg = Release|x86
+		{8CFEF2EE-5E32-43EB-A730-EB3AACDC77B1}.Release|x86.Build.0 = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|Any CPU.Build.0 = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|iPhone.ActiveCfg = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|iPhone.Build.0 = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|x86.ActiveCfg = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Debug|x86.Build.0 = Debug|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|Any CPU.ActiveCfg = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|Any CPU.Build.0 = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|iPhone.ActiveCfg = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|iPhone.Build.0 = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|Mixed Platforms.Build.0 = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|x86.ActiveCfg = Release|x86
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068}.Release|x86.Build.0 = Release|x86
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|x86.Build.0 = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|iPhone.Build.0 = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|x86.ActiveCfg = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|x86.Build.0 = Release|Any CPU
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Debug|Any CPU.Build.0 = Debug|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Debug|iPhone.ActiveCfg = Debug|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Debug|iPhone.Build.0 = Debug|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Debug|x86.ActiveCfg = Debug|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Debug|x86.Build.0 = Debug|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Release|Any CPU.ActiveCfg = Release|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Release|Any CPU.Build.0 = Release|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Release|iPhone.ActiveCfg = Release|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Release|iPhone.Build.0 = Release|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Release|Mixed Platforms.Build.0 = Release|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Release|x86.ActiveCfg = Release|x86
+		{D0E05092-60B2-47FF-B924-D5CDED0C0DD1}.Release|x86.Build.0 = Release|x86
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Debug|x86.Build.0 = Debug|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Release|iPhone.Build.0 = Release|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Release|x86.ActiveCfg = Release|Any CPU
+		{DED4371E-B92B-46FC-B4A3-B56BCAE12477}.Release|x86.Build.0 = Release|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Debug|x86.Build.0 = Debug|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Release|iPhone.Build.0 = Release|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Release|x86.ActiveCfg = Release|Any CPU
+		{EA7CF275-795B-4385-80AA-C41DA3B9B0F9}.Release|x86.Build.0 = Release|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Debug|x86.Build.0 = Debug|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Release|iPhone.Build.0 = Release|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Release|x86.ActiveCfg = Release|Any CPU
+		{EB1F36EC-5DB8-41AC-AB99-E9337239A9F9}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{9522776F-02BA-4BED-B8BB-6BAE580F4068} = {A28FF8DB-5350-4D08-A94D-93C3C67FCB63}
+		{521972FD-1A9B-4CFD-A435-EB2224985131} = {A28FF8DB-5350-4D08-A94D-93C3C67FCB63}
+		{86A219E2-C8F0-452B-B762-C69D5BB07C98} = {A28FF8DB-5350-4D08-A94D-93C3C67FCB63}
+		{86A219E2-C8F0-452B-B762-C69D5BB07C99} = {A28FF8DB-5350-4D08-A94D-93C3C67FCB63}
+		{86A219E2-C8F1-422B-C762-C69D5BB07C98} = {A28FF8DB-5350-4D08-A94D-93C3C67FCB63}
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Linux\RenderTarget2DSample\RenderTarget2DSample.csproj
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

+ 30 - 0
Samples/MonoGame.Samples.MacOS.sln

@@ -63,6 +63,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenderTarget2DSample", "Mac
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParticleSample", "MacOS\ParticleSample\ParticleSample.csproj", "{5CA0180F-C404-431A-87B5-03A26E5BFA23}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.VideoPlayer.MacOS", "MacOS\VideoPlayer\MonoGame.Samples.VideoPlayer.MacOS.csproj", "{71192C89-7FB6-49A4-A19D-FC89E3D18248}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -70,6 +72,10 @@ Global
 		Distribution|Any CPU = Distribution|Any CPU
 		Debug|x86 = Debug|x86
 		Release|x86 = Release|x86
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Debug|iPhone = Debug|iPhone
+		Release|iPhone = Release|iPhone
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{05E3B2AB-1E38-4E19-864D-BECFA95139D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -238,6 +244,24 @@ Global
 		{5CA0180F-C404-431A-87B5-03A26E5BFA23}.Release|Any CPU.Build.0 = Release|x86
 		{5CA0180F-C404-431A-87B5-03A26E5BFA23}.Release|x86.ActiveCfg = Release|x86
 		{5CA0180F-C404-431A-87B5-03A26E5BFA23}.Release|x86.Build.0 = Release|x86
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Debug|x86.Build.0 = Debug|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Distribution|Any CPU.ActiveCfg = Debug|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Distribution|Any CPU.Build.0 = Debug|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Release|iPhone.Build.0 = Release|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Release|x86.ActiveCfg = Release|Any CPU
+		{71192C89-7FB6-49A4-A19D-FC89E3D18248}.Release|x86.Build.0 = Release|Any CPU
 		{71871CF8-8563-4FA3-ABF2-EC1CBBF817E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{71871CF8-8563-4FA3-ABF2-EC1CBBF817E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{71871CF8-8563-4FA3-ABF2-EC1CBBF817E4}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -310,8 +334,14 @@ Global
 		{973C423F-0CC0-4230-9E67-D944ED70ED19}.Release|x86.Build.0 = Release|Any CPU
 		{A82EAD58-40D7-49BE-8F24-09FEA34F9E55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A82EAD58-40D7-49BE-8F24-09FEA34F9E55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A82EAD58-40D7-49BE-8F24-09FEA34F9E55}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A82EAD58-40D7-49BE-8F24-09FEA34F9E55}.Debug|x86.Build.0 = Debug|Any CPU
+		{A82EAD58-40D7-49BE-8F24-09FEA34F9E55}.Distribution|Any CPU.ActiveCfg = Debug|Any CPU
+		{A82EAD58-40D7-49BE-8F24-09FEA34F9E55}.Distribution|Any CPU.Build.0 = Debug|Any CPU
 		{A82EAD58-40D7-49BE-8F24-09FEA34F9E55}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A82EAD58-40D7-49BE-8F24-09FEA34F9E55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A82EAD58-40D7-49BE-8F24-09FEA34F9E55}.Release|x86.ActiveCfg = Release|Any CPU
+		{A82EAD58-40D7-49BE-8F24-09FEA34F9E55}.Release|x86.Build.0 = Release|Any CPU
 		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AE483C29-042E-4226-BA52-D247CE7676DA}.Distribution|Any CPU.ActiveCfg = Debug|Any CPU

+ 17 - 17
Samples/MonoGame.Samples.iOS.sln

@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.iOS", "..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.iOS.csproj", "{734EAA48-F1CA-481A-B391-0285BC0E8B40}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.iOS", "..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.iOS.csproj", "{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}"
@@ -39,12 +39,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.TouchGestu
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.TransformedCollision", "iOS\TransformedCollision\MonoGame.Samples.TransformedCollision.csproj", "{96F32BCF-B579-438B-A5DC-667BB9A5849C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Video", "iOS\Video\MonoGame.Samples.Video.csproj", "{21E42CAF-11B3-4A25-A771-189A61732F94}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.VirtualGamePad", "iOS\VirtualGamePad\MonoGame.Samples.VirtualGamePad.csproj", "{326DC8E8-649F-4F96-92BA-EE0EF51A32DB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Waypoint", "iOS\Waypoint\MonoGame.Samples.Waypoint.csproj", "{75E860EE-EBF1-4BB4-AE39-9729900AFD39}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.VideoPlayer", "iOS\VideoPlayer\MonoGame.Samples.VideoPlayer.csproj", "{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|iPhoneSimulator = Debug|iPhoneSimulator
@@ -91,18 +91,6 @@ Global
 		{1557EE13-80AB-4E4C-9C10-9CBFC8E727C3}.Release|iPhone.Build.0 = Release|iPhone
 		{1557EE13-80AB-4E4C-9C10-9CBFC8E727C3}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
 		{1557EE13-80AB-4E4C-9C10-9CBFC8E727C3}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{21E42CAF-11B3-4A25-A771-189A61732F94}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{21E42CAF-11B3-4A25-A771-189A61732F94}.Debug|iPhone.Build.0 = Debug|iPhone
-		{21E42CAF-11B3-4A25-A771-189A61732F94}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{21E42CAF-11B3-4A25-A771-189A61732F94}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{21E42CAF-11B3-4A25-A771-189A61732F94}.Distribution|iPhone.ActiveCfg = Debug|iPhone
-		{21E42CAF-11B3-4A25-A771-189A61732F94}.Distribution|iPhone.Build.0 = Debug|iPhone
-		{21E42CAF-11B3-4A25-A771-189A61732F94}.Distribution|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{21E42CAF-11B3-4A25-A771-189A61732F94}.Distribution|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{21E42CAF-11B3-4A25-A771-189A61732F94}.Release|iPhone.ActiveCfg = Release|iPhone
-		{21E42CAF-11B3-4A25-A771-189A61732F94}.Release|iPhone.Build.0 = Release|iPhone
-		{21E42CAF-11B3-4A25-A771-189A61732F94}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{21E42CAF-11B3-4A25-A771-189A61732F94}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 		{326DC8E8-649F-4F96-92BA-EE0EF51A32DB}.Debug|iPhone.ActiveCfg = Debug|iPhone
 		{326DC8E8-649F-4F96-92BA-EE0EF51A32DB}.Debug|iPhone.Build.0 = Debug|iPhone
 		{326DC8E8-649F-4F96-92BA-EE0EF51A32DB}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
@@ -255,6 +243,18 @@ Global
 		{CE342066-BCCD-4989-A401-0D36287276EF}.Release|iPhone.Build.0 = Release|iPhone
 		{CE342066-BCCD-4989-A401-0D36287276EF}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
 		{CE342066-BCCD-4989-A401-0D36287276EF}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}.Debug|iPhone.Build.0 = Debug|iPhone
+		{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}.Distribution|iPhone.ActiveCfg = Debug|iPhone
+		{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}.Distribution|iPhone.Build.0 = Debug|iPhone
+		{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}.Distribution|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}.Distribution|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}.Release|iPhone.ActiveCfg = Release|iPhone
+		{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}.Release|iPhone.Build.0 = Release|iPhone
+		{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 		{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}.Debug|iPhone.ActiveCfg = Debug|iPhone
 		{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}.Debug|iPhone.Build.0 = Debug|iPhone
 		{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
@@ -313,6 +313,6 @@ Global
 		{F5FA28E2-53B2-482B-8723-71588DF50BB6}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = ..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.iOS.csproj
+		StartupItem = iOS\GameStateManagement\MonoGame.Samples.GameStateManagement.csproj
 	EndGlobalSection
 EndGlobal

+ 2 - 9
Samples/Windows/Draw2D/MonoGame.Samples.Draw2D.Windows.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,7 +11,6 @@
     <RootNamespace>Draw2D</RootNamespace>
     <AssemblyName>Draw2D</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -33,12 +32,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
-      <Project>{7DE47032-A904-4C29-BD22-2D235E8D91BA}</Project>
-      <Name>MonoGame.Framework.Windows</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\iOS\Draw2D\FPSCounterComponent.cs">
       <Link>FPSCounterComponent.cs</Link>
@@ -68,7 +61,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.XML" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\..\iOS\Draw2D\Default.png">

+ 9 - 11
Samples/Windows/NetRumble/NetRumble.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <PropertyGroup>
     <ProjectGuid>{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}</ProjectGuid>
@@ -9,6 +9,8 @@
     <AssemblyName>NetRumble</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <AppDesignerFolder>Properties</AppDesignerFolder>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -29,6 +31,12 @@
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -443,16 +451,6 @@
     </Content>
     <None Include="app.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
-      <Project>{7DE47032-A904-4C29-BD22-2D235E8D91BA}</Project>
-      <Name>MonoGame.Framework.Windows</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Windows.csproj">
-      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
-      <Name>Lidgren.Network.Windows</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Effects\" />
   </ItemGroup>

+ 9 - 14
Samples/Windows/RenderTarget2D/RenderTarget2D.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <PropertyGroup>
     <ProjectGuid>{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}</ProjectGuid>
@@ -9,6 +9,8 @@
     <AssemblyName>RenderTarget2D</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <AppDesignerFolder>Properties</AppDesignerFolder>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -29,6 +31,12 @@
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -44,19 +52,6 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
-      <Project>{7DE47032-A904-4C29-BD22-2D235E8D91BA}</Project>
-      <Name>MonoGame.Framework.Windows</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Windows.csproj">
-      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
-      <Name>Lidgren.Network.Windows</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Content" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="..\..\MacOS\RenderTarget2DSample\Content\MooTheMerciless.xnb">
       <Link>Content\MooTheMerciless.xnb</Link>

+ 15 - 4
Samples/iOS/Aiming/Info.plist

@@ -1,5 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict />
-</plist>
+<dict>
+	<key>CFBundleDisplayName</key>
+	<string>Aiming</string>
+	<key>CFBundleIconFiles</key>
+	<array>
+		<string>GameThumbnail.png</string>
+	</array>
+	<key>CFBundleIdentifier</key>
+	<string>project.MonoGame.Aiming</string>
+	<key>MinimumOSVersion</key>
+	<string>3.1</string>
+</dict>
+</plist>

+ 13 - 4
Samples/iOS/BatteryStatus/Info.plist

@@ -1,5 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict />
-</plist>
+<dict>
+	<key>CFBundleDisplayName</key>
+	<string>Battery Status</string>
+	<key>CFBundleIconFiles</key>
+	<array>
+		<string>Default.png</string>
+	</array>
+	<key>MinimumOSVersion</key>
+	<string>3.1</string>
+</dict>
+</plist>

+ 1 - 9
Samples/iOS/BatteryStatus/MonoGame.Samples.BatteryStatus.csproj

@@ -6,11 +6,9 @@
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B1E27EDB-2AC5-4A8A-8FD2-29CEEBDF3344}</ProjectGuid>
-    <ProjectTypeGuids>{E613F3A2-FE9C-494F-B74E-F63BCB86FEA6};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <BundleDisplayName>Battery Status</BundleDisplayName>
-    <BundleIcon>Default.png</BundleIcon>
     <RootNamespace>MonoGame.Samples.BatteryStatus</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
@@ -24,7 +22,6 @@
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>True</MtouchDebug>
     <MtouchI18n />
-    <MtouchMinimumOS>3.1</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -40,7 +37,6 @@
     <WarningLevel>4</WarningLevel>
     <MtouchDebug>False</MtouchDebug>
     <MtouchI18n />
-    <MtouchMinimumOS>3.1</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -59,7 +55,6 @@
     <MtouchDebug>True</MtouchDebug>
     <MtouchI18n />
     <MtouchSdkVersion>4.0</MtouchSdkVersion>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
@@ -78,7 +73,6 @@
     <MtouchI18n />
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchSdkVersion>4.0</MtouchSdkVersion>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -91,7 +85,6 @@
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
     <WarningLevel>4</WarningLevel>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchDebug>False</MtouchDebug>
     <MtouchUseSGen>false</MtouchUseSGen>
     <MtouchUseLlvm>false</MtouchUseLlvm>
@@ -105,7 +98,6 @@
     <Optimize>false</Optimize>
     <OutputPath>bin\Release</OutputPath>
     <WarningLevel>4</WarningLevel>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchDebug>False</MtouchDebug>
     <MtouchUseSGen>false</MtouchUseSGen>
     <MtouchUseLlvm>false</MtouchUseLlvm>

+ 2 - 10
Samples/iOS/BouncingBox/MonoGame.Samples.BouncingBox.csproj

@@ -6,12 +6,10 @@
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F5FA28E2-53B2-482B-8723-71588DF50BB6}</ProjectGuid>
-    <ProjectTypeGuids>{E613F3A2-FE9C-494F-B74E-F63BCB86FEA6};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
     <RootNamespace>MonoGame.Samples.BouncingBox</RootNamespace>
-    <BundleDisplayName>Bouncing Box</BundleDisplayName>
-    <BundleIcon>monogameicon.png</BundleIcon>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -24,7 +22,6 @@
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>True</MtouchDebug>
     <MtouchI18n />
-    <MtouchMinimumOS>3.1</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -40,7 +37,6 @@
     <WarningLevel>4</WarningLevel>
     <MtouchDebug>False</MtouchDebug>
     <MtouchI18n />
-    <MtouchMinimumOS>3.1</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -60,7 +56,6 @@
     <MtouchDebug>True</MtouchDebug>
     <MtouchI18n />
     <MtouchSdkVersion>4.0</MtouchSdkVersion>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -74,11 +69,9 @@
     <OutputPath>bin\iPhone\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchDebug>False</MtouchDebug>
     <MtouchI18n />
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchSdkVersion>4.0</MtouchSdkVersion>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -91,7 +84,6 @@
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
     <WarningLevel>4</WarningLevel>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchDebug>False</MtouchDebug>
     <MtouchUseSGen>false</MtouchUseSGen>
     <MtouchUseLlvm>false</MtouchUseLlvm>
@@ -105,7 +97,6 @@
     <Optimize>false</Optimize>
     <OutputPath>bin\Release</OutputPath>
     <WarningLevel>4</WarningLevel>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchDebug>False</MtouchDebug>
     <MtouchUseSGen>false</MtouchUseSGen>
     <MtouchUseLlvm>false</MtouchUseLlvm>
@@ -138,6 +129,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <None Include="monogameicon.png" />
+    <None Include="Info.plist" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">

+ 20 - 10
Samples/iOS/ChaseAndEvade/Info.plist

@@ -1,11 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
-    <key>UISupportedInterfaceOrientations</key>
-    <array>
-      <string>UIInterfaceOrientationPortrait</string>
-      <string>UIInterfaceOrientationPortraitUpsideDown</string>
-    </array>
-  </dict>
-</plist>
+<dict>
+	<key>CFBundleDisplayName</key>
+	<string>ChaseAndEvade</string>
+	<key>CFBundleIconFiles</key>
+	<array>
+		<string>GameThumbnail.png</string>
+	</array>
+	<key>CFBundleIdentifier</key>
+	<string>project.MonoGame.ChaseAndEvade</string>
+	<key>MinimumOSVersion</key>
+	<string>3.1</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+	</array>
+</dict>
+</plist>

+ 1 - 11
Samples/iOS/ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.csproj

@@ -6,15 +6,11 @@
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1557EE13-80AB-4E4C-9C10-9CBFC8E727C3}</ProjectGuid>
-    <ProjectTypeGuids>{E613F3A2-FE9C-494F-B74E-F63BCB86FEA6};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>MonoGame.Samples.ChaseAndEvade</RootNamespace>
     <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <BundleDisplayName>ChaseAndEvade</BundleDisplayName>
-    <BundleIcon>GameThumbnail.png</BundleIcon>
-    <BundleIdentifier>project.MonoGame.ChaseAndEvade</BundleIdentifier>
     <AssemblyName>ChaseAndEvade</AssemblyName>
-    <BundleIconHigh>GameThumbnail.png</BundleIconHigh>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -28,7 +24,6 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchLink>None</MtouchLink>
     <MtouchI18n />
-    <MtouchMinimumOS>3.1</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -46,7 +41,6 @@
     <MtouchLink>None</MtouchLink>
     <DefineConstants>IPHONE</DefineConstants>
     <MtouchI18n />
-    <MtouchMinimumOS>3.1</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -66,7 +60,6 @@
     <MtouchLink>None</MtouchLink>
     <MtouchI18n />
     <MtouchSdkVersion>3.0</MtouchSdkVersion>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -83,7 +76,6 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <DefineConstants>IPHONE</DefineConstants>
     <MtouchSdkVersion>3.0</MtouchSdkVersion>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -100,7 +92,6 @@
     <MtouchI18n />
     <DefineConstants>IPHONE</DefineConstants>
     <MtouchSdkVersion>3.0</MtouchSdkVersion>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -113,7 +104,6 @@
     <OutputPath>bin\Distribution</OutputPath>
     <WarningLevel>4</WarningLevel>
     <MtouchUseSGen>false</MtouchUseSGen>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchDebug>False</MtouchDebug>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseThumb>false</MtouchUseThumb>

+ 28 - 15
Samples/iOS/Draw2D/Info.plist

@@ -1,16 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
-    <key>UISupportedInterfaceOrientations</key>
-    <array>
-      <string>UIInterfaceOrientationLandscapeLeft</string>
-      <string>UIInterfaceOrientationLandscapeRight</string>
-    </array>
-    <key>UISupportedInterfaceOrientations~ipad</key>
-    <array>
-      <string>UIInterfaceOrientationPortrait</string>
-      <string>UIInterfaceOrientationPortraitUpsideDown</string>
-    </array>
-  </dict>
-</plist>
+<dict>
+	<key>CFBundleDisplayName</key>
+	<string>Draw2D</string>
+	<key>CFBundleIconFiles</key>
+	<array>
+		<string>monogameicon.png</string>
+	</array>
+	<key>MinimumOSVersion</key>
+	<string>3.1</string>
+	<key>UIDeviceFamily</key>
+	<array>
+		<string>1</string>
+		<string>2</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+	</array>
+</dict>
+</plist>

+ 1 - 11
Samples/iOS/Draw2D/MonoGame.Samples.Draw2D.csproj

@@ -6,13 +6,9 @@
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DEC435F4-9E84-490B-9890-72E5F514B8D0}</ProjectGuid>
-    <ProjectTypeGuids>{E613F3A2-FE9C-494F-B74E-F63BCB86FEA6};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <BundleDisplayName>Draw2D</BundleDisplayName>
-    <BundleIcon>monogameicon.png</BundleIcon>
     <RootNamespace>MonoGame.Samples.Draw2D</RootNamespace>
-    <SupportedDevices>IPhoneAndIPad</SupportedDevices>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -25,7 +21,6 @@
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>True</MtouchDebug>
     <MtouchI18n />
-    <MtouchMinimumOS>3.1</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -41,7 +36,6 @@
     <WarningLevel>4</WarningLevel>
     <MtouchDebug>False</MtouchDebug>
     <MtouchI18n />
-    <MtouchMinimumOS>3.1</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -61,7 +55,6 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchI18n />
     <MtouchSdkVersion>4.0</MtouchSdkVersion>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -79,7 +72,6 @@
     <MtouchI18n />
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchSdkVersion>4.0</MtouchSdkVersion>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -92,7 +84,6 @@
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
     <WarningLevel>4</WarningLevel>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchDebug>False</MtouchDebug>
     <MtouchUseSGen>false</MtouchUseSGen>
     <MtouchUseLlvm>false</MtouchUseLlvm>
@@ -106,7 +97,6 @@
     <Optimize>false</Optimize>
     <OutputPath>bin\Release</OutputPath>
     <WarningLevel>4</WarningLevel>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchDebug>False</MtouchDebug>
     <MtouchUseSGen>false</MtouchUseSGen>
     <MtouchUseLlvm>false</MtouchUseLlvm>

+ 2 - 10
Samples/iOS/GameComponents/MonoGame.Samples.GameComponents.csproj

@@ -6,12 +6,9 @@
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4F51EB5C-03A1-4488-8EEA-0E8F2411DB0C}</ProjectGuid>
-    <ProjectTypeGuids>{E613F3A2-FE9C-494F-B74E-F63BCB86FEA6};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>MonoGame.Samples.GameComponents</RootNamespace>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
-    <BundleDisplayName>GameComponents</BundleDisplayName>
-    <BundleIcon>monogameicon.png</BundleIcon>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -24,7 +21,6 @@
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>True</MtouchDebug>
     <MtouchI18n />
-    <MtouchMinimumOS>3.1</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -40,7 +36,6 @@
     <WarningLevel>4</WarningLevel>
     <MtouchDebug>False</MtouchDebug>
     <MtouchI18n />
-    <MtouchMinimumOS>3.1</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -59,7 +54,6 @@
     <MtouchDebug>True</MtouchDebug>
     <MtouchI18n />
     <MtouchSdkVersion>4.0</MtouchSdkVersion>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -77,7 +71,6 @@
     <MtouchI18n />
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchSdkVersion>4.0</MtouchSdkVersion>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
     <MtouchUseThumb>false</MtouchUseThumb>
@@ -90,7 +83,6 @@
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
     <WarningLevel>4</WarningLevel>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchDebug>False</MtouchDebug>
     <MtouchUseSGen>false</MtouchUseSGen>
     <MtouchUseLlvm>false</MtouchUseLlvm>
@@ -104,7 +96,6 @@
     <Optimize>false</Optimize>
     <OutputPath>bin\Release</OutputPath>
     <WarningLevel>4</WarningLevel>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
     <MtouchDebug>False</MtouchDebug>
     <MtouchUseSGen>false</MtouchUseSGen>
     <MtouchUseLlvm>false</MtouchUseLlvm>
@@ -139,6 +130,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <None Include="monogameicon.png" />
+    <None Include="Info.plist" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">

BIN
Samples/iOS/GameStateManagement/.DS_Store


BIN
Samples/iOS/GameStateManagement/Content/gamefont.xnb


BIN
Samples/iOS/GameStateManagement/Content/menufont.xnb


+ 6 - 44
Samples/iOS/GameStateManagement/MonoGame.Samples.GameStateManagement.csproj

@@ -2,17 +2,14 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <ProjectGuid>{B1A596F8-B26C-4826-99D1-94C9327AB586}</ProjectGuid>
-    <ProjectTypeGuids>{E613F3A2-FE9C-494F-B74E-F63BCB86FEA6};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <OutputType>Exe</OutputType>
-    <BundleDisplayName>GameStateManagement</BundleDisplayName>
-    <BundleIcon>GameThumbnail.png</BundleIcon>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>GameStateManagement</RootNamespace>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
     <Thumbnail>GameThumbnail.png</Thumbnail>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
@@ -25,15 +22,10 @@
     <WarningLevel>4</WarningLevel>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <MtouchLink>None</MtouchLink>
-    <MtouchDebug>True</MtouchDebug>
+    <MtouchDebug>true</MtouchDebug>
     <MtouchI18n />
-    <MtouchMinimumOS>3.1</MtouchMinimumOS>
-    <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
-    <MtouchUseThumb>false</MtouchUseThumb>
-    <MtouchUseSGen>false</MtouchUseSGen>
     <AssemblyName>GameStateManagement</AssemblyName>
-    <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
@@ -42,15 +34,9 @@
     <ErrorReport>prompt</ErrorReport>
     <DefineConstants>IPHONE</DefineConstants>
     <WarningLevel>4</WarningLevel>
-    <MtouchDebug>False</MtouchDebug>
     <MtouchI18n />
-    <MtouchMinimumOS>3.1</MtouchMinimumOS>
-    <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
-    <MtouchUseThumb>false</MtouchUseThumb>
-    <MtouchUseSGen>false</MtouchUseSGen>
     <AssemblyName>GameStateManagement</AssemblyName>
-    <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
@@ -60,16 +46,11 @@
     <DefineConstants>DEBUG;IPHONE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchDebug>True</MtouchDebug>
+    <MtouchDebug>true</MtouchDebug>
     <MtouchI18n />
     <MtouchSdkVersion>4.0</MtouchSdkVersion>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
-    <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
-    <MtouchUseThumb>false</MtouchUseThumb>
-    <MtouchUseSGen>false</MtouchUseSGen>
     <AssemblyName>GameStateManagement</AssemblyName>
-    <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
@@ -78,45 +59,27 @@
     <DefineConstants>IPHONE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchDebug>False</MtouchDebug>
     <MtouchI18n />
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchSdkVersion>4.0</MtouchSdkVersion>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
-    <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
-    <MtouchUseThumb>false</MtouchUseThumb>
-    <MtouchUseSGen>false</MtouchUseSGen>
     <AssemblyName>GameStateManagement</AssemblyName>
-    <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
     <WarningLevel>4</WarningLevel>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
-    <MtouchDebug>False</MtouchDebug>
-    <MtouchUseSGen>false</MtouchUseSGen>
-    <MtouchUseLlvm>false</MtouchUseLlvm>
     <AssemblyName>MonoGameSamplesGameStateManagement</AssemblyName>
-    <MtouchUseThumb>false</MtouchUseThumb>
     <MtouchUseArmv7>false</MtouchUseArmv7>
-    <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Release</OutputPath>
     <WarningLevel>4</WarningLevel>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
-    <MtouchDebug>False</MtouchDebug>
-    <MtouchUseSGen>false</MtouchUseSGen>
-    <MtouchUseLlvm>false</MtouchUseLlvm>
     <AssemblyName>MonoGameSamplesGameStateManagement</AssemblyName>
-    <MtouchUseThumb>false</MtouchUseThumb>
     <MtouchUseArmv7>false</MtouchUseArmv7>
-    <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -147,6 +110,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="GameThumbnail.png" />
+    <None Include="Info.plist" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\background.png">
@@ -164,9 +128,7 @@
     <Content Include="Content\gradient.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\menufont.xnb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <Content Include="Content\menufont.xnb" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -177,7 +139,7 @@
   </Target>
   -->
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>

+ 13 - 0
Samples/iOS/MonoGame.Samples.VideoPlayer/Info.plist

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>

+ 19 - 0
Samples/iOS/MonoGame.Samples.VideoPlayer/Main.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MonoTouch.Foundation;
+using MonoTouch.UIKit;
+
+namespace MonoGame.Samples.VideoPlayer
+{
+	public class Application
+	{
+		// This is the main entry point of the application.
+		static void Main (string[] args)
+		{
+			// if you want to use a different Application Delegate class from "AppDelegate"
+			// you can specify it here.
+			UIApplication.Main (args, null, "AppDelegate");
+		}
+	}
+}

+ 80 - 0
Samples/iOS/MonoGame.Samples.VideoPlayer/MonoGame.Samples.VideoPlayer.csproj

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D6A6EF59-928C-4DDB-AD8D-D85DD914BF82}</ProjectGuid>
+    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>MonoGame.Samples.VideoPlayer</RootNamespace>
+    <AssemblyName>MonoGameSamplesVideoPlayer</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <MtouchLink>None</MtouchLink>
+    <MtouchDebug>true</MtouchDebug>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <MtouchLink>None</MtouchLink>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\iPhone\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <MtouchDebug>true</MtouchDebug>
+    <CodesignKey>iPhone Developer</CodesignKey>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\iPhone\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <CodesignKey>iPhone Developer</CodesignKey>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="monotouch" />
+    <Reference Include="OpenTK" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Info.plist" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Main.cs" />
+    <Compile Include="AppDelegate.cs" />
+    <Compile Include="OpenGLViewController.cs" />
+    <Compile Include="EAGLView.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <InterfaceDefinition Include="OpenGLViewController.xib" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Shader.fsh" />
+    <Content Include="Shader.vsh" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>

+ 5 - 41
Samples/iOS/MultiTouch/MonoGame.Samples.MultiTouch.csproj

@@ -2,17 +2,14 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <ProjectGuid>{DF8DF5E3-2FF4-46DD-9EE0-AE3C9923C6BA}</ProjectGuid>
-    <ProjectTypeGuids>{E613F3A2-FE9C-494F-B74E-F63BCB86FEA6};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <OutputType>Exe</OutputType>
-    <BundleDisplayName>MultiTouch</BundleDisplayName>
-    <BundleIcon>GameThumbnail.png</BundleIcon>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MultiTouch</RootNamespace>
-    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
     <Thumbnail>GameThumbnail.png</Thumbnail>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
@@ -25,15 +22,10 @@
     <WarningLevel>4</WarningLevel>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <MtouchLink>None</MtouchLink>
-    <MtouchDebug>True</MtouchDebug>
+    <MtouchDebug>true</MtouchDebug>
     <MtouchI18n />
-    <MtouchMinimumOS>3.1</MtouchMinimumOS>
-    <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
-    <MtouchUseThumb>false</MtouchUseThumb>
-    <MtouchUseSGen>false</MtouchUseSGen>
     <AssemblyName>MultiTouch</AssemblyName>
-    <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
@@ -41,15 +33,9 @@
     <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchDebug>False</MtouchDebug>
     <MtouchI18n />
-    <MtouchMinimumOS>3.1</MtouchMinimumOS>
-    <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
-    <MtouchUseThumb>false</MtouchUseThumb>
-    <MtouchUseSGen>false</MtouchUseSGen>
     <AssemblyName>MultiTouch</AssemblyName>
-    <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
@@ -59,16 +45,11 @@
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchDebug>True</MtouchDebug>
+    <MtouchDebug>true</MtouchDebug>
     <MtouchI18n />
     <MtouchSdkVersion>4.0</MtouchSdkVersion>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
-    <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
-    <MtouchUseThumb>false</MtouchUseThumb>
-    <MtouchUseSGen>false</MtouchUseSGen>
     <AssemblyName>MultiTouch</AssemblyName>
-    <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
@@ -76,45 +57,27 @@
     <OutputPath>bin\iPhone\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchDebug>False</MtouchDebug>
     <MtouchI18n />
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchSdkVersion>4.0</MtouchSdkVersion>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
-    <MtouchUseLlvm>false</MtouchUseLlvm>
     <MtouchUseArmv7>false</MtouchUseArmv7>
-    <MtouchUseThumb>false</MtouchUseThumb>
-    <MtouchUseSGen>false</MtouchUseSGen>
     <AssemblyName>MultiTouch</AssemblyName>
-    <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
     <WarningLevel>4</WarningLevel>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
-    <MtouchDebug>False</MtouchDebug>
-    <MtouchUseSGen>false</MtouchUseSGen>
-    <MtouchUseLlvm>false</MtouchUseLlvm>
     <AssemblyName>MonoGameSamplesMultiTouch</AssemblyName>
-    <MtouchUseThumb>false</MtouchUseThumb>
     <MtouchUseArmv7>false</MtouchUseArmv7>
-    <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Release</OutputPath>
     <WarningLevel>4</WarningLevel>
-    <MtouchMinimumOS>3.0</MtouchMinimumOS>
-    <MtouchDebug>False</MtouchDebug>
-    <MtouchUseSGen>false</MtouchUseSGen>
-    <MtouchUseLlvm>false</MtouchUseLlvm>
     <AssemblyName>MonoGameSamplesMultiTouch</AssemblyName>
-    <MtouchUseThumb>false</MtouchUseThumb>
     <MtouchUseArmv7>false</MtouchUseArmv7>
-    <MtouchArch>ARMv6</MtouchArch>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -131,6 +94,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="GameThumbnail.png" />
+    <None Include="Info.plist" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\circle.png">
@@ -152,7 +116,7 @@
   </Target>
   -->
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>

BIN
Samples/iOS/ParticleSample/.DS_Store


BIN
Samples/iOS/ParticleSample/Content/Arial.xnb


BIN
Samples/iOS/ParticleSample/Content/explosion.xnb


BIN
Samples/iOS/ParticleSample/Content/font.xnb


Some files were not shown because too many files changed in this diff