Renamed Projects from Project (platform) to Project.Platform at the recommendation of the MG group

Also switched all projects to use NuGet, not just iOS. (except DesktopGL which is currently broken)

GameStateManagementSample.sln

@@ -7,15 +7,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameStateManagement", "Game
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{B7157C98-57CE-457E-A45C-9D1D746A7B93}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameStateManagementSample (DesktopGL)", "Platforms\DesktopGL\GameStateManagementSample (DesktopGL).csproj", "{055FEDD0-AB52-45CE-A74D-48C009E4DB73}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameStateManagementSample.DesktopGL", "Platforms\DesktopGL\GameStateManagementSample.DesktopGL.csproj", "{055FEDD0-AB52-45CE-A74D-48C009E4DB73}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameStateManagementSample (WindowsDX)", "Platforms\WindowsDX\GameStateManagementSample (WindowsDX).csproj", "{360266C3-DF94-4A96-A1C9-915D97D6549F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameStateManagementSample.WindowsDX", "Platforms\WindowsDX\GameStateManagementSample.WindowsDX.csproj", "{360266C3-DF94-4A96-A1C9-915D97D6549F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameStateManagementSample (UWP)", "Platforms\WindowsUWP\GameStateManagementSample (UWP).csproj", "{98E44B20-48E2-4B36-9A87-D626E2C598BB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameStateManagementSample.UWP", "Platforms\WindowsUWP\GameStateManagementSample.UWP.csproj", "{98E44B20-48E2-4B36-9A87-D626E2C598BB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameStateManagementSample (Android)", "Platforms\Android\GameStateManagementSample (Android).csproj", "{39138599-48BD-4DCF-83AF-78DBB4C23277}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameStateManagementSample.Android", "Platforms\Android\GameStateManagementSample.Android.csproj", "{39138599-48BD-4DCF-83AF-78DBB4C23277}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameStateManagementSample (iOS)", "Platforms\iOS\GameStateManagementSample (iOS).csproj", "{F70F5F39-72F9-45FC-97DA-FAA70C66BA65}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameStateManagementSample.iOS", "Platforms\iOS\GameStateManagementSample.iOS.csproj", "{F70F5F39-72F9-45FC-97DA-FAA70C66BA65}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -166,6 +166,7 @@ Global
 		{360266C3-DF94-4A96-A1C9-915D97D6549F}.AppStore|x86.ActiveCfg = Release|x86
 		{360266C3-DF94-4A96-A1C9-915D97D6549F}.AppStore|x86.Build.0 = Release|x86
 		{360266C3-DF94-4A96-A1C9-915D97D6549F}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{360266C3-DF94-4A96-A1C9-915D97D6549F}.Debug|Any CPU.Build.0 = Debug|x86
 		{360266C3-DF94-4A96-A1C9-915D97D6549F}.Debug|ARM.ActiveCfg = Debug|x86
 		{360266C3-DF94-4A96-A1C9-915D97D6549F}.Debug|iPhone.ActiveCfg = Debug|x86
 		{360266C3-DF94-4A96-A1C9-915D97D6549F}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
@@ -216,6 +217,7 @@ Global
 		{98E44B20-48E2-4B36-9A87-D626E2C598BB}.AppStore|x86.Build.0 = Release|x86
 		{98E44B20-48E2-4B36-9A87-D626E2C598BB}.AppStore|x86.Deploy.0 = Release|x86
 		{98E44B20-48E2-4B36-9A87-D626E2C598BB}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{98E44B20-48E2-4B36-9A87-D626E2C598BB}.Debug|Any CPU.Build.0 = Debug|x86
 		{98E44B20-48E2-4B36-9A87-D626E2C598BB}.Debug|ARM.ActiveCfg = Debug|ARM
 		{98E44B20-48E2-4B36-9A87-D626E2C598BB}.Debug|ARM.Build.0 = Debug|ARM
 		{98E44B20-48E2-4B36-9A87-D626E2C598BB}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -328,6 +330,7 @@ Global
 		{F70F5F39-72F9-45FC-97DA-FAA70C66BA65}.AppStore|x64.ActiveCfg = AppStore|iPhone
 		{F70F5F39-72F9-45FC-97DA-FAA70C66BA65}.AppStore|x86.ActiveCfg = AppStore|iPhone
 		{F70F5F39-72F9-45FC-97DA-FAA70C66BA65}.Debug|Any CPU.ActiveCfg = Debug|iPhone
+		{F70F5F39-72F9-45FC-97DA-FAA70C66BA65}.Debug|Any CPU.Build.0 = Debug|iPhone
 		{F70F5F39-72F9-45FC-97DA-FAA70C66BA65}.Debug|ARM.ActiveCfg = Debug|iPhone
 		{F70F5F39-72F9-45FC-97DA-FAA70C66BA65}.Debug|iPhone.ActiveCfg = Debug|iPhone
 		{F70F5F39-72F9-45FC-97DA-FAA70C66BA65}.Debug|iPhone.Build.0 = Debug|iPhone

Platforms/Android/GameStateManagementSample (Android).csproj → Platforms/Android/GameStateManagementSample.Android.csproj

@@ -47,15 +47,15 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
+    <Reference Include="MonoGame.Framework, Version=3.6.0.1625, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MonoGame.Framework.Android.3.6.0.1625\lib\MonoAndroid\MonoGame.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="OpenTK-1.0" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
-    <Reference Include="MonoGame.Framework">
-      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Android\MonoGame.Framework.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\SampleCode\Game.cs">
@@ -111,6 +111,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Resources\AboutResources.txt" />
     <None Include="Assets\AboutAssets.txt" />
   </ItemGroup>

Platforms/Android/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MonoGame.Framework.Android" version="3.6.0.1625" targetFramework="monoandroid60" />
+</packages>

Platforms/DesktopGL/MonoGame.Framework.dll.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<dllmap dll="SDL2.dll" os="osx" target="libSDL2-2.0.0.dylib"/>
+	<dllmap dll="soft_oal.dll" os="osx" target="libopenal.1.dylib" />
+	<dllmap dll="SDL2.dll" os="linux" cpu="x86" target="./x86/libSDL2-2.0.so.0"/>
+	<dllmap dll="soft_oal.dll" os="linux" cpu="x86" target="./x86/libopenal.so.1" />
+	<dllmap dll="SDL2.dll" os="linux" cpu="x86-64" target="./x64/libSDL2-2.0.so.0"/>
+	<dllmap dll="soft_oal.dll" os="linux" cpu="x86-64" target="./x64/libopenal.so.1" />
+</configuration>

Platforms/WindowsDX/GameStateManagementSample (WindowsDX).csproj → Platforms/WindowsDX/GameStateManagementSample.WindowsDX.csproj

@@ -93,8 +93,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="MonoGame.Framework">
-      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\MonoGame.Framework.dll</HintPath>
+    <Reference Include="MonoGame.Framework, Version=3.6.0.1625, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MonoGame.Framework.WindowsDX.3.6.0.1625\lib\net40\MonoGame.Framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
@@ -107,6 +107,7 @@
       <Link>Content\Content.mgcb</Link>
     </MonoGameContentReference>
     <None Include="app.manifest" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>

Platforms/WindowsDX/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MonoGame.Framework.WindowsDX" version="3.6.0.1625" targetFramework="net45" />
+</packages>

Platforms/WindowsUWP/GameStateManagementSample (UWP).csproj → Platforms/WindowsUWP/GameStateManagementSample.UWP.csproj

@@ -90,12 +90,6 @@
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <Reference Include="MonoGame.Framework">
-      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\WindowsUniversal\MonoGame.Framework.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\SampleCode\Game.cs">
       <Link>Game.cs</Link>

Platforms/WindowsUWP/project.json

@@ -1,6 +1,7 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2"
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.1",
+    "MonoGame.Framework.WindowsUniversal": "3.6.0.1625"
   },
   "frameworks": {
     "uap10.0": {}