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

Samples/MonoGame.Samples.Windows.sln

@@ -1,7 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-# SharpDevelop 4.0.0.7070
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.Windows", "..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Windows.csproj", "{AE483C29-042E-4226-BA52-D247CE7676DA}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.Windows", "..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Windows.csproj", "{7DE47032-A904-4C29-BD22-2D235E8D91BA}"
@@ -26,20 +25,20 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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|iPhoneSimulator.ActiveCfg = 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}.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|iPhoneSimulator.ActiveCfg = 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
+		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Debug|iPhone.ActiveCfg = Debug|x86
+		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Debug|x86.ActiveCfg = Debug|x86
+		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Debug|x86.Build.0 = Debug|x86
+		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Release|Any CPU.ActiveCfg = Release|x86
+		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Release|iPhone.ActiveCfg = Release|x86
+		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Release|Mixed Platforms.Build.0 = Release|x86
+		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Release|x86.ActiveCfg = Release|x86
+		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Release|x86.Build.0 = Release|x86
 		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -70,40 +69,43 @@ Global
 		{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
-		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Debug|iPhone.ActiveCfg = Debug|x86
-		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
-		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Debug|x86.ActiveCfg = Debug|x86
-		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Debug|x86.Build.0 = Debug|x86
-		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Release|Any CPU.ActiveCfg = Release|x86
-		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Release|iPhone.ActiveCfg = Release|x86
-		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Release|iPhoneSimulator.ActiveCfg = Release|x86
-		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Release|Mixed Platforms.Build.0 = Release|x86
-		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Release|x86.ActiveCfg = Release|x86
-		{36CDED1D-BE90-4C12-BC0A-F923AB92B98D}.Release|x86.Build.0 = Release|x86
-		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Debug|Any CPU.Build.0 = Debug|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|iPhoneSimulator.ActiveCfg = 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}.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|iPhoneSimulator.ActiveCfg = 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
 		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Debug|iPhone.Build.0 = Debug|x86
+		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Debug|Any CPU.Build.0 = Debug|x86
 		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Debug|iPhone.ActiveCfg = Debug|x86
-		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Debug|iPhoneSimulator.Build.0 = Debug|x86
+		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Debug|iPhone.Build.0 = Debug|x86
 		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
-		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Debug|iPhoneSimulator.Build.0 = Debug|x86
 		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Debug|x86.Build.0 = Debug|x86
+		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Debug|x86.ActiveCfg = Debug|x86
-		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Release|Any CPU.Build.0 = Release|x86
+		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Debug|x86.Build.0 = Debug|x86
 		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Release|Any CPU.ActiveCfg = Release|x86
-		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Release|iPhone.Build.0 = Release|x86
+		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Release|Any CPU.Build.0 = Release|x86
 		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Release|iPhone.ActiveCfg = Release|x86
-		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Release|iPhone.Build.0 = Release|x86
 		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Release|iPhoneSimulator.ActiveCfg = Release|x86
-		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Release|Mixed Platforms.Build.0 = Release|x86
+		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Release|iPhoneSimulator.Build.0 = Release|x86
 		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Release|x86.Build.0 = Release|x86
+		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Release|Mixed Platforms.Build.0 = Release|x86
 		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Release|x86.ActiveCfg = Release|x86
+		{B3DD03E0-4DEC-45A0-A481-2CF90A51C516}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Windows\RenderTarget2D\RenderTarget2D.csproj
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Samples/Windows/Draw2D/MonoGame.Samples.Draw2D.Windows.csproj

@@ -10,7 +10,6 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Draw2D</RootNamespace>
     <AssemblyName>Draw2D</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

Samples/Windows/NetRumble/NetRumble.csproj

@@ -7,7 +7,6 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>NetRumble</RootNamespace>
     <AssemblyName>NetRumble</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>

Samples/Windows/RenderTarget2D/RenderTarget2D.csproj

@@ -7,7 +7,6 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>RenderTarget2D</RootNamespace>
     <AssemblyName>RenderTarget2D</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -44,6 +43,9 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="OpenTK">
+      <HintPath>..\..\..\..\OpenTK1.0\Binaries\OpenTK\Release\OpenTK.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\MacOS\RenderTarget2DSample\Game1.cs">
@@ -63,4 +65,10 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
+      <Project>{7DE47032-A904-4C29-BD22-2D235E8D91BA}</Project>
+      <Name>MonoGame.Framework.Windows</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>