Browse Source

All android samples running and pointing to the Monogame and lidgren

Andrea 12 years ago
parent
commit
1026ea41f9
42 changed files with 303 additions and 42 deletions
  1. 10 0
      AdMob/AdMob.Android.csproj
  2. 15 1
      AdMob/Resources/Resource.designer.cs
  3. 10 0
      CatapaultWars/CatapultWars.Android.csproj
  4. 15 1
      CatapaultWars/Resources/Resource.designer.cs
  5. 10 0
      CatapultNetWars/CatapultNetWars.Android.csproj
  6. 15 1
      CatapultNetWars/Resources/Resource.designer.cs
  7. 10 0
      ChaseAndEvade/ChaseAndEvade.Android.csproj
  8. 15 1
      ChaseAndEvade/Resources/Resource.Designer.cs
  9. BIN
      CompiledContent/Android/Content/Effects/Clouds.xnb
  10. BIN
      CompiledContent/Android/Content/Effects/ParticleEffect.xnb
  11. BIN
      CompiledContent/Android/Content/Fonts/Arial.xnb
  12. BIN
      CompiledContent/Android/Content/Fonts/DataActiveFont.xnb
  13. BIN
      CompiledContent/Android/Content/Fonts/Font.xnb
  14. BIN
      CompiledContent/Android/Content/Fonts/GameScreenFont14px.xnb
  15. BIN
      CompiledContent/Android/Content/Fonts/GameScreenFont16px.xnb
  16. BIN
      CompiledContent/Android/Content/Fonts/GameScreenFont36px.xnb
  17. BIN
      CompiledContent/Android/Content/Fonts/HUDFont.xnb
  18. BIN
      CompiledContent/Android/Content/Fonts/HighScoreFont.xnb
  19. BIN
      CompiledContent/Android/Content/Fonts/InstructionsActiveFont.xnb
  20. BIN
      CompiledContent/Android/Content/Fonts/MenuFont.xnb
  21. BIN
      CompiledContent/Android/Content/Fonts/TitleFont.xnb
  22. BIN
      CompiledContent/Android/Content/Fonts/TypeFont.xnb
  23. BIN
      CompiledContent/Android/Content/Fonts/gamefont.xnb
  24. BIN
      CompiledContent/Android/Content/Music/InGameSong_Loop.wma
  25. BIN
      CompiledContent/Android/Content/Music/MenuMusic_Loop.wma
  26. BIN
      CompiledContent/Android/Content/Music/One Step Beyond.wma
  27. 19 16
      Draw2D/Draw2D.Android.csproj
  28. 2 2
      Draw2D/Game1.cs
  29. 15 1
      Draw2D/Resources/Resource.Designer.cs
  30. 10 0
      Input/Input.Android.csproj
  31. 15 1
      Input/Resources/Resource.designer.cs
  32. 1 1
      MonoGame.Samples.Android.sln
  33. 10 0
      Orientation/Orientation.Android.csproj
  34. 15 1
      Orientation/Resources/Resource.designer.cs
  35. 10 0
      Peer2PeerSample/Peer2Peer.Android.csproj
  36. 15 1
      Peer2PeerSample/Resources/Resource.Designer.cs
  37. 10 0
      Primitives/Primitives.Android.csproj
  38. 15 1
      Primitives/Resources/Resource.designer.cs
  39. 21 9
      RenderTarget2DSample/RenderTarget2D.Android.csproj
  40. 15 1
      RenderTarget2DSample/Resources/Resource.designer.cs
  41. 15 1
      VideoPlayer/Resources/Resource.designer.cs
  42. 15 3
      VideoPlayer/VideoPlayer.Android.csproj

+ 10 - 0
AdMob/AdMob.Android.csproj

@@ -77,4 +77,14 @@
   <ItemGroup>
   <ItemGroup>
     <AndroidJavaLibrary Include="GoogleAdMobAdsSdk-4.3.1.jar" />
     <AndroidJavaLibrary Include="GoogleAdMobAdsSdk-4.3.1.jar" />
   </ItemGroup>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+      <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+      <Name>Lidgren.Network.Android</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+      <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+      <Name>MonoGame.Framework.Android</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
 </Project>

+ 15 - 1
AdMob/Resources/Resource.designer.cs

@@ -1,20 +1,33 @@
+#pragma warning disable 1591
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 // <auto-generated>
 // <auto-generated>
 //     This code was generated by a tool.
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.530
+//     Runtime Version:4.0.30319.586
 //
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 //     the code is regenerated.
 // </auto-generated>
 // </auto-generated>
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
 
+[assembly: Android.Runtime.ResourceDesignerAttribute("MonoGame.Samples.AdMob.Resource", IsApplication=true)]
+
 namespace MonoGame.Samples.AdMob
 namespace MonoGame.Samples.AdMob
 {
 {
 	
 	
 	
 	
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
 	public partial class Resource
 	public partial class Resource
 	{
 	{
 		
 		
+		Resource()
+		{
+			global::Android.Runtime.ResourceIdManager.UpdateIdValues ();
+		}
+		
+		public static void UpdateIdValues()
+		{
+		}
+		
 		public partial class Attribute
 		public partial class Attribute
 		{
 		{
 			
 			
@@ -49,3 +62,4 @@ namespace MonoGame.Samples.AdMob
 		}
 		}
 	}
 	}
 }
 }
+#pragma warning restore 1591

+ 10 - 0
CatapaultWars/CatapultWars.Android.csproj

@@ -280,4 +280,14 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
     </AndroidAsset>
   </ItemGroup>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+      <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+      <Name>Lidgren.Network.Android</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+      <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+      <Name>MonoGame.Framework.Android</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
 </Project>

+ 15 - 1
CatapaultWars/Resources/Resource.designer.cs

@@ -1,20 +1,33 @@
+#pragma warning disable 1591
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 // <auto-generated>
 // <auto-generated>
 //     This code was generated by a tool.
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.530
+//     Runtime Version:4.0.30319.586
 //
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 //     the code is regenerated.
 // </auto-generated>
 // </auto-generated>
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
 
+[assembly: Android.Runtime.ResourceDesignerAttribute("MonoGame.Samples.CatapultWars.Resource", IsApplication=true)]
+
 namespace MonoGame.Samples.CatapultWars
 namespace MonoGame.Samples.CatapultWars
 {
 {
 	
 	
 	
 	
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
 	public partial class Resource
 	public partial class Resource
 	{
 	{
 		
 		
+		Resource()
+		{
+			global::Android.Runtime.ResourceIdManager.UpdateIdValues ();
+		}
+		
+		public static void UpdateIdValues()
+		{
+		}
+		
 		public partial class Attribute
 		public partial class Attribute
 		{
 		{
 			
 			
@@ -57,3 +70,4 @@ namespace MonoGame.Samples.CatapultWars
 		}
 		}
 	}
 	}
 }
 }
+#pragma warning restore 1591

+ 10 - 0
CatapultNetWars/CatapultNetWars.Android.csproj

@@ -324,4 +324,14 @@
       <Link>Resources.resx</Link>
       <Link>Resources.resx</Link>
     </EmbeddedResource>
     </EmbeddedResource>
   </ItemGroup>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+      <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+      <Name>MonoGame.Framework.Android</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+      <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+      <Name>Lidgren.Network.Android</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
 </Project>

+ 15 - 1
CatapultNetWars/Resources/Resource.designer.cs

@@ -1,20 +1,33 @@
+#pragma warning disable 1591
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 // <auto-generated>
 // <auto-generated>
 //     This code was generated by a tool.
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.530
+//     Runtime Version:4.0.30319.586
 //
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 //     the code is regenerated.
 // </auto-generated>
 // </auto-generated>
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
 
+[assembly: Android.Runtime.ResourceDesignerAttribute("CatapultWarsNet.Resource", IsApplication=true)]
+
 namespace CatapultWarsNet
 namespace CatapultWarsNet
 {
 {
 	
 	
 	
 	
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
 	public partial class Resource
 	public partial class Resource
 	{
 	{
 		
 		
+		Resource()
+		{
+			global::Android.Runtime.ResourceIdManager.UpdateIdValues ();
+		}
+		
+		public static void UpdateIdValues()
+		{
+		}
+		
 		public partial class Attribute
 		public partial class Attribute
 		{
 		{
 			
 			
@@ -177,3 +190,4 @@ namespace CatapultWarsNet
 		}
 		}
 	}
 	}
 }
 }
+#pragma warning restore 1591

+ 10 - 0
ChaseAndEvade/ChaseAndEvade.Android.csproj

@@ -88,4 +88,14 @@
   <Target Name="AfterBuild">
   <Target Name="AfterBuild">
   </Target>
   </Target>
   -->
   -->
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+      <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+      <Name>Lidgren.Network.Android</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+      <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+      <Name>MonoGame.Framework.Android</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
 </Project>

+ 15 - 1
ChaseAndEvade/Resources/Resource.Designer.cs

@@ -1,20 +1,33 @@
+#pragma warning disable 1591
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 // <auto-generated>
 // <auto-generated>
 //     This code was generated by a tool.
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.530
+//     Runtime Version:4.0.30319.586
 //
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 //     the code is regenerated.
 // </auto-generated>
 // </auto-generated>
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
 
+[assembly: Android.Runtime.ResourceDesignerAttribute("MonoGame.Samples.ChaseAndEvade.Android.Resource", IsApplication=true)]
+
 namespace MonoGame.Samples.ChaseAndEvade.Android
 namespace MonoGame.Samples.ChaseAndEvade.Android
 {
 {
 	
 	
 	
 	
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
 	public partial class Resource
 	public partial class Resource
 	{
 	{
 		
 		
+		Resource()
+		{
+			global::Android.Runtime.ResourceIdManager.UpdateIdValues ();
+		}
+		
+		public static void UpdateIdValues()
+		{
+		}
+		
 		public partial class Attribute
 		public partial class Attribute
 		{
 		{
 			
 			
@@ -49,3 +62,4 @@ namespace MonoGame.Samples.ChaseAndEvade.Android
 		}
 		}
 	}
 	}
 }
 }
+#pragma warning restore 1591

BIN
CompiledContent/Android/Content/Effects/Clouds.xnb


BIN
CompiledContent/Android/Content/Effects/ParticleEffect.xnb


BIN
CompiledContent/Android/Content/Fonts/Arial.xnb


BIN
CompiledContent/Android/Content/Fonts/DataActiveFont.xnb


BIN
CompiledContent/Android/Content/Fonts/Font.xnb


BIN
CompiledContent/Android/Content/Fonts/GameScreenFont14px.xnb


BIN
CompiledContent/Android/Content/Fonts/GameScreenFont16px.xnb


BIN
CompiledContent/Android/Content/Fonts/GameScreenFont36px.xnb


BIN
CompiledContent/Android/Content/Fonts/HUDFont.xnb


BIN
CompiledContent/Android/Content/Fonts/HighScoreFont.xnb


BIN
CompiledContent/Android/Content/Fonts/InstructionsActiveFont.xnb


BIN
CompiledContent/Android/Content/Fonts/MenuFont.xnb


BIN
CompiledContent/Android/Content/Fonts/TitleFont.xnb


BIN
CompiledContent/Android/Content/Fonts/TypeFont.xnb


BIN
CompiledContent/Android/Content/Fonts/gamefont.xnb


BIN
CompiledContent/Android/Content/Music/InGameSong_Loop.wma


BIN
CompiledContent/Android/Content/Music/MenuMusic_Loop.wma


BIN
CompiledContent/Android/Content/Music/One Step Beyond.wma


+ 19 - 16
Draw2D/Draw2D.Android.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -47,14 +47,10 @@
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Compile Include="Activity1.cs" />
     <Compile Include="Activity1.cs" />
-    <Compile Include="Game1.cs">
-      <Link>Game1.cs</Link>
-    </Compile>
+    <Compile Include="FPSCounterComponent.cs" />
+    <Compile Include="Game1.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="FPSCounterComponent.cs">
-      <Link>FPSCounterComponent.cs</Link>
-    </Compile>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Content Include="Properties\AndroidManifest.xml" />
     <Content Include="Properties\AndroidManifest.xml" />
@@ -63,15 +59,6 @@
     <AndroidResource Include="Resources\Drawable\Icon.png" />
     <AndroidResource Include="Resources\Drawable\Icon.png" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <AndroidAsset Include="Content\monogameicon.png">
-      <Link>Assets\Content\monogameicon.png</Link>
-    </AndroidAsset>
-    <AndroidAsset Include="Content\purpleBall.xnb">
-      <Link>Assets\Content\purpleBall.xnb</Link>
-    </AndroidAsset>
-    <AndroidAsset Include="Content\spriteFont1.xnb">
-      <Link>Assets\Content\spriteFont1.xnb</Link>
-    </AndroidAsset>
     <AndroidAsset Include="Content\monogameicon48x48.png">
     <AndroidAsset Include="Content\monogameicon48x48.png">
       <Link>Assets\Content\monogameicon48x48.png</Link>
       <Link>Assets\Content\monogameicon48x48.png</Link>
     </AndroidAsset>
     </AndroidAsset>
@@ -87,4 +74,20 @@
   <ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\Layout\" />
     <Folder Include="Resources\Layout\" />
   </ItemGroup>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+      <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+      <Name>Lidgren.Network.Android</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+      <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+      <Name>MonoGame.Framework.Android</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="..\CompiledContent\Android\Content\Fonts\Font.xnb">
+      <Link>Assets\Content\Font.xnb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </AndroidAsset>
+  </ItemGroup>
 </Project>
 </Project>

+ 2 - 2
Draw2D/Game1.cs

@@ -45,7 +45,7 @@ namespace Microsoft.Xna.Samples.Draw2D
 			graphics.PreferredBackBufferHeight = 480;
 			graphics.PreferredBackBufferHeight = 480;
 			graphics.PreferredBackBufferWidth = 320;
 			graphics.PreferredBackBufferWidth = 320;
 
 
-			graphics.SupportedOrientations = DisplayOrientation.Portrait | DisplayOrientation.LandscapeLeft | DisplayOrientation.LandscapeRight | DisplayOrientation.PortraitUpsideDown;			
+			graphics.SupportedOrientations = DisplayOrientation.Portrait | DisplayOrientation.LandscapeLeft | DisplayOrientation.LandscapeRight | DisplayOrientation.PortraitDown;			
 		}
 		}
 		
 		
 		/// <summary>
 		/// <summary>
@@ -71,7 +71,7 @@ namespace Microsoft.Xna.Samples.Draw2D
 			spriteBatch = new SpriteBatch (GraphicsDevice);
 			spriteBatch = new SpriteBatch (GraphicsDevice);
 
 
 			// TODO: use this.Content to load your game content here
 			// TODO: use this.Content to load your game content here
-			texture = Content.Load<Texture2D> ("logo");
+			texture = Content.Load<Texture2D> ("monogameicon48x48");
 			font = Content.Load<SpriteFont> ("Font");
 			font = Content.Load<SpriteFont> ("Font");
 
 
 			fps = new FPSCounterComponent (this,spriteBatch,font);
 			fps = new FPSCounterComponent (this,spriteBatch,font);

+ 15 - 1
Draw2D/Resources/Resource.Designer.cs

@@ -1,20 +1,33 @@
+#pragma warning disable 1591
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 // <auto-generated>
 // <auto-generated>
 //     This code was generated by a tool.
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.530
+//     Runtime Version:4.0.30319.586
 //
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 //     the code is regenerated.
 // </auto-generated>
 // </auto-generated>
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
 
+[assembly: Android.Runtime.ResourceDesignerAttribute("MonoGame.Samples.Draw2D.Android.Resource", IsApplication=true)]
+
 namespace MonoGame.Samples.Draw2D.Android
 namespace MonoGame.Samples.Draw2D.Android
 {
 {
 	
 	
 	
 	
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
 	public partial class Resource
 	public partial class Resource
 	{
 	{
 		
 		
+		Resource()
+		{
+			global::Android.Runtime.ResourceIdManager.UpdateIdValues ();
+		}
+		
+		public static void UpdateIdValues()
+		{
+		}
+		
 		public partial class Attribute
 		public partial class Attribute
 		{
 		{
 			
 			
@@ -49,3 +62,4 @@ namespace MonoGame.Samples.Draw2D.Android
 		}
 		}
 	}
 	}
 }
 }
+#pragma warning restore 1591

+ 10 - 0
Input/Input.Android.csproj

@@ -71,4 +71,14 @@
       <Link>Assets\Content\spriteFont1.xnb</Link>
       <Link>Assets\Content\spriteFont1.xnb</Link>
     </AndroidAsset>
     </AndroidAsset>
   </ItemGroup>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+      <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+      <Name>Lidgren.Network.Android</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+      <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+      <Name>MonoGame.Framework.Android</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
 </Project>

+ 15 - 1
Input/Resources/Resource.designer.cs

@@ -1,20 +1,33 @@
+#pragma warning disable 1591
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 // <auto-generated>
 // <auto-generated>
 //     This code was generated by a tool.
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.530
+//     Runtime Version:4.0.30319.586
 //
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 //     the code is regenerated.
 // </auto-generated>
 // </auto-generated>
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
 
+[assembly: Android.Runtime.ResourceDesignerAttribute("MonoGame.Samples.Input.Resource", IsApplication=true)]
+
 namespace MonoGame.Samples.Input
 namespace MonoGame.Samples.Input
 {
 {
 	
 	
 	
 	
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
 	public partial class Resource
 	public partial class Resource
 	{
 	{
 		
 		
+		Resource()
+		{
+			global::Android.Runtime.ResourceIdManager.UpdateIdValues ();
+		}
+		
+		public static void UpdateIdValues()
+		{
+		}
+		
 		public partial class Attribute
 		public partial class Attribute
 		{
 		{
 			
 			
@@ -85,3 +98,4 @@ namespace MonoGame.Samples.Input
 		}
 		}
 	}
 	}
 }
 }
+#pragma warning restore 1591

+ 1 - 1
MonoGame.Samples.Android.sln

@@ -89,7 +89,7 @@ Global
 		{E2B6ED3C-A769-47AF-9605-A7410F194B1C}.Release|Any CPU.Deploy.0 = Release|Any CPU
 		{E2B6ED3C-A769-47AF-9605-A7410F194B1C}.Release|Any CPU.Deploy.0 = Release|Any CPU
 	EndGlobalSection
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = ..\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj
+		StartupItem = Draw2D\Draw2D.Android.csproj
 	EndGlobalSection
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 		HideSolutionNode = FALSE

+ 10 - 0
Orientation/Orientation.Android.csproj

@@ -77,4 +77,14 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidAsset>
     </AndroidAsset>
   </ItemGroup>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+      <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+      <Name>Lidgren.Network.Android</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+      <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+      <Name>MonoGame.Framework.Android</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
 </Project>

+ 15 - 1
Orientation/Resources/Resource.designer.cs

@@ -1,20 +1,33 @@
+#pragma warning disable 1591
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 // <auto-generated>
 // <auto-generated>
 //     This code was generated by a tool.
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.530
+//     Runtime Version:4.0.30319.586
 //
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 //     the code is regenerated.
 // </auto-generated>
 // </auto-generated>
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
 
+[assembly: Android.Runtime.ResourceDesignerAttribute("Orientation.Resource", IsApplication=true)]
+
 namespace Orientation
 namespace Orientation
 {
 {
 	
 	
 	
 	
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
 	public partial class Resource
 	public partial class Resource
 	{
 	{
 		
 		
+		Resource()
+		{
+			global::Android.Runtime.ResourceIdManager.UpdateIdValues ();
+		}
+		
+		public static void UpdateIdValues()
+		{
+		}
+		
 		public partial class Attribute
 		public partial class Attribute
 		{
 		{
 			
 			
@@ -49,3 +62,4 @@ namespace Orientation
 		}
 		}
 	}
 	}
 }
 }
+#pragma warning restore 1591

+ 10 - 0
Peer2PeerSample/Peer2Peer.Android.csproj

@@ -92,4 +92,14 @@
   <ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\Values\Styles.xml" />
     <AndroidResource Include="Resources\Values\Styles.xml" />
   </ItemGroup>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+      <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+      <Name>Lidgren.Network.Android</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+      <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+      <Name>MonoGame.Framework.Android</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
 </Project>

+ 15 - 1
Peer2PeerSample/Resources/Resource.Designer.cs

@@ -1,20 +1,33 @@
+#pragma warning disable 1591
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 // <auto-generated>
 // <auto-generated>
 //     This code was generated by a tool.
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.530
+//     Runtime Version:4.0.30319.586
 //
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 //     the code is regenerated.
 // </auto-generated>
 // </auto-generated>
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
 
+[assembly: Android.Runtime.ResourceDesignerAttribute("MonoGame.Samples.Peer2Peer.Android.Resource", IsApplication=true)]
+
 namespace MonoGame.Samples.Peer2Peer.Android
 namespace MonoGame.Samples.Peer2Peer.Android
 {
 {
 	
 	
 	
 	
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
 	public partial class Resource
 	public partial class Resource
 	{
 	{
 		
 		
+		Resource()
+		{
+			global::Android.Runtime.ResourceIdManager.UpdateIdValues ();
+		}
+		
+		public static void UpdateIdValues()
+		{
+		}
+		
 		public partial class Attribute
 		public partial class Attribute
 		{
 		{
 			
 			
@@ -49,3 +62,4 @@ namespace MonoGame.Samples.Peer2Peer.Android
 		}
 		}
 	}
 	}
 }
 }
+#pragma warning restore 1591

+ 10 - 0
Primitives/Primitives.Android.csproj

@@ -64,4 +64,14 @@
     <AndroidResource Include="Resources\drawable\Icon.png" />
     <AndroidResource Include="Resources\drawable\Icon.png" />
   </ItemGroup>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+      <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+      <Name>MonoGame.Framework.Android</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+      <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+      <Name>Lidgren.Network.Android</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
 </Project>

+ 15 - 1
Primitives/Resources/Resource.designer.cs

@@ -1,20 +1,33 @@
+#pragma warning disable 1591
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 // <auto-generated>
 // <auto-generated>
 //     This code was generated by a tool.
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.530
+//     Runtime Version:4.0.30319.586
 //
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 //     the code is regenerated.
 // </auto-generated>
 // </auto-generated>
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
 
+[assembly: Android.Runtime.ResourceDesignerAttribute("MonoGame.Samples.Primitives.Android.Resource", IsApplication=true)]
+
 namespace MonoGame.Samples.Primitives.Android
 namespace MonoGame.Samples.Primitives.Android
 {
 {
 	
 	
 	
 	
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
 	public partial class Resource
 	public partial class Resource
 	{
 	{
 		
 		
+		Resource()
+		{
+			global::Android.Runtime.ResourceIdManager.UpdateIdValues ();
+		}
+		
+		public static void UpdateIdValues()
+		{
+		}
+		
 		public partial class Attribute
 		public partial class Attribute
 		{
 		{
 			
 			
@@ -57,3 +70,4 @@ namespace MonoGame.Samples.Primitives.Android
 		}
 		}
 	}
 	}
 }
 }
+#pragma warning restore 1591

+ 21 - 9
RenderTarget2DSample/RenderTarget2D.Android.csproj

@@ -55,17 +55,8 @@
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <None Include="Resources\AboutResources.txt" />
     <None Include="Resources\AboutResources.txt" />
-    <None Include="Assets\AboutAssets.txt" />
   </ItemGroup>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
-  <ItemGroup>
-    <AndroidAsset Include="Content\MooTheMerciless.xnb">
-      <Link>Assets\Content\MooTheMerciless.xnb</Link>
-    </AndroidAsset>
-    <AndroidAsset Include="Content\wood.xnb">
-      <Link>Assets\Content\wood.xnb</Link>
-    </AndroidAsset>
-  </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\Splash.png" />
     <AndroidResource Include="Resources\drawable\Splash.png" />
   </ItemGroup>
   </ItemGroup>
@@ -76,4 +67,25 @@
     <Content Include="Properties\AndroidManifest.xml" />
     <Content Include="Properties\AndroidManifest.xml" />
     <AndroidResource Include="Resources\drawable\Icon.png" />
     <AndroidResource Include="Resources\drawable\Icon.png" />
   </ItemGroup>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Assets\Content\" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="..\CompiledContent\Android\Content\Textures\checker.xnb">
+      <Link>Assets\Content\checker.xnb</Link>
+    </AndroidAsset>
+    <AndroidAsset Include="..\CompiledContent\Android\Content\Textures\logo.xnb">
+      <Link>Assets\Content\logo.xnb</Link>
+    </AndroidAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+      <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+      <Name>Lidgren.Network.Android</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+      <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+      <Name>MonoGame.Framework.Android</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
 </Project>

+ 15 - 1
RenderTarget2DSample/Resources/Resource.designer.cs

@@ -1,20 +1,33 @@
+#pragma warning disable 1591
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 // <auto-generated>
 // <auto-generated>
 //     This code was generated by a tool.
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.530
+//     Runtime Version:4.0.30319.586
 //
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 //     the code is regenerated.
 // </auto-generated>
 // </auto-generated>
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
 
+[assembly: Android.Runtime.ResourceDesignerAttribute("MonoGame.Samples.RenderTarget2D.Android.Resource", IsApplication=true)]
+
 namespace MonoGame.Samples.RenderTarget2D.Android
 namespace MonoGame.Samples.RenderTarget2D.Android
 {
 {
 	
 	
 	
 	
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
 	public partial class Resource
 	public partial class Resource
 	{
 	{
 		
 		
+		Resource()
+		{
+			global::Android.Runtime.ResourceIdManager.UpdateIdValues ();
+		}
+		
+		public static void UpdateIdValues()
+		{
+		}
+		
 		public partial class Attribute
 		public partial class Attribute
 		{
 		{
 			
 			
@@ -49,3 +62,4 @@ namespace MonoGame.Samples.RenderTarget2D.Android
 		}
 		}
 	}
 	}
 }
 }
+#pragma warning restore 1591

+ 15 - 1
VideoPlayer/Resources/Resource.designer.cs

@@ -1,20 +1,33 @@
+#pragma warning disable 1591
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 // <auto-generated>
 // <auto-generated>
 //     This code was generated by a tool.
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.530
+//     Runtime Version:4.0.30319.586
 //
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 //     the code is regenerated.
 // </auto-generated>
 // </auto-generated>
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
 
+[assembly: Android.Runtime.ResourceDesignerAttribute("MonoGame.Samples.VideoPlayer.Resource", IsApplication=true)]
+
 namespace MonoGame.Samples.VideoPlayer
 namespace MonoGame.Samples.VideoPlayer
 {
 {
 	
 	
 	
 	
+	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
 	public partial class Resource
 	public partial class Resource
 	{
 	{
 		
 		
+		Resource()
+		{
+			global::Android.Runtime.ResourceIdManager.UpdateIdValues ();
+		}
+		
+		public static void UpdateIdValues()
+		{
+		}
+		
 		public partial class Attribute
 		public partial class Attribute
 		{
 		{
 			
 			
@@ -71,3 +84,4 @@ namespace MonoGame.Samples.VideoPlayer
 		}
 		}
 	}
 	}
 }
 }
+#pragma warning restore 1591

+ 15 - 3
VideoPlayer/VideoPlayer.Android.csproj

@@ -54,7 +54,6 @@
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <None Include="Resources\AboutResources.txt" />
     <None Include="Resources\AboutResources.txt" />
-    <None Include="Assets\AboutAssets.txt" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\layout\Main.axml" />
     <AndroidResource Include="Resources\layout\Main.axml" />
@@ -68,8 +67,21 @@
     <AndroidAsset Include="Content\spriteFont1.xnb">
     <AndroidAsset Include="Content\spriteFont1.xnb">
       <Link>Assets\Content\spriteFont1.xnb</Link>
       <Link>Assets\Content\spriteFont1.xnb</Link>
     </AndroidAsset>
     </AndroidAsset>
-    <AndroidAsset Include="Assets\Content\sintel_trailer.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <AndroidAsset Include="Content\sintel_trailer.mp4">
+      <Link>Assets\Content\sintel_trailer.mp4</Link>
     </AndroidAsset>
     </AndroidAsset>
+    <AndroidAsset Include="Content\sintel_trailer.m4v">
+      <Link>Assets\Content\sintel_trailer.m4v</Link>
+    </AndroidAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj">
+      <Project>{565129E0-4EE5-4F6F-B403-C3484C9740BE}</Project>
+      <Name>Lidgren.Network.Android</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoGame.Framework\MonoGame.Framework.Android.csproj">
+      <Project>{BA9476CF-99BA-4D03-92F2-73D2C5E58883}</Project>
+      <Name>MonoGame.Framework.Android</Name>
+    </ProjectReference>
   </ItemGroup>
   </ItemGroup>
 </Project>
 </Project>