Win10 RTM support

Updated project files for MonoGame.Framework, new project templates, but no NuGet support
SickheadGames · Jul 24, 2015 · 298080e · 298080e
1 parent 532b1a1
commit 298080e
Show file tree

Hide file tree

Showing 20 changed files with 69 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,6 +37,9 @@ obj/
 [Dd]ebug*/
 [Rr]elease*/
 Ankh.NoLoad
+.vs/
+project.lock.json
+artifacts/
 
 #Tooling
 _ReSharper*/

diff --git a/Build/GenerateProject.CSharp.xslt b/Build/GenerateProject.CSharp.xslt
@@ -286,8 +286,8 @@
           </xsl:when>
           <xsl:when test="/Input/Generation/Platform = 'WindowsUAP'">
 			  <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-			  <TargetPlatformVersion>10.0.10069.0</TargetPlatformVersion>
-			  <TargetPlatformMinVersion>10.0.10069.0</TargetPlatformMinVersion>
+			  <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
+			  <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
 			  <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
 		  </xsl:when>			
           <xsl:when test="/Input/Generation/Platform = 'iOS' or /Input/Generation/Platform = 'PSMobile'">

diff --git a/Build/Projects/MonoGame.Framework.definition b/Build/Projects/MonoGame.Framework.definition
@@ -1103,6 +1103,9 @@
     <Compile Include="WindowsUAP\XamlGame.cs">
       <Platforms>WindowsUAP</Platforms>
     </Compile>	  
+    <None Include="project.json">
+      <Platforms>WindowsUAP</Platforms>
+    </None>
 
 
     <!-- Windows Desktop Platfom -->

diff --git a/MonoGame.Framework/project.json b/MonoGame.Framework/project.json
@@ -0,0 +1,16 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
+  },
+  "frameworks": {
+    "uap10.0": {}
+  },
+  "runtimes": {
+    "win10-arm": {},
+    "win10-arm-aot": {},
+    "win10-x86": {},
+    "win10-x86-aot": {},
+    "win10-x64": {},
+    "win10-x64-aot": {}
+  }
+}
diff --git a/ProjectTemplates/VisualStudio2015/WindowsUAP/Application.csproj b/ProjectTemplates/VisualStudio2015/WindowsUAP/Application.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>$projectname$</AssemblyName>
     <DefaultLanguage>$currentuiculturename$</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.10069.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10069.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <FileAlignment>512</FileAlignment>
@@ -108,6 +108,9 @@
     <Compile Include="Game1.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+  	<None Include="project.json" />
+  </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
@@ -118,11 +121,13 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Properties\Default.rd.xml" />
-    <Content Include="Assets\Logo.scale-100.png" />
-    <Content Include="Assets\SmallLogo.scale-100.png" />
-    <Content Include="Assets\SplashScreen.scale-100.png" />
-    <Content Include="Assets\StoreLogo.scale-100.png" />
-    <Content Include="Assets\WideLogo.scale-100.png" />
+    <Content Include="Assets\LockScreenLogo.scale-200.png" />
+    <Content Include="Assets\SplashScreen.scale-200.png" />
+    <Content Include="Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Assets\StoreLogo.png" />
+    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
     <MonoGameContentReference Include="Content\Content.mgcb" />

diff --git a/ProjectTemplates/VisualStudio2015/WindowsUAP/LockScreenLogo.scale-200.png b/ProjectTemplates/VisualStudio2015/WindowsUAP/LockScreenLogo.scale-200.png
diff --git a/ProjectTemplates/VisualStudio2015/WindowsUAP/Logo.scale-100.png b/ProjectTemplates/VisualStudio2015/WindowsUAP/Logo.scale-100.png
diff --git a/ProjectTemplates/VisualStudio2015/WindowsUAP/SmallLogo.scale-100.png b/ProjectTemplates/VisualStudio2015/WindowsUAP/SmallLogo.scale-100.png
diff --git a/ProjectTemplates/VisualStudio2015/WindowsUAP/SplashScreen.scale-100.png b/ProjectTemplates/VisualStudio2015/WindowsUAP/SplashScreen.scale-100.png
diff --git a/ProjectTemplates/VisualStudio2015/WindowsUAP/SplashScreen.scale-200.png b/ProjectTemplates/VisualStudio2015/WindowsUAP/SplashScreen.scale-200.png
diff --git a/ProjectTemplates/VisualStudio2015/WindowsUAP/Square150x150Logo.scale-200.png b/ProjectTemplates/VisualStudio2015/WindowsUAP/Square150x150Logo.scale-200.png
diff --git a/ProjectTemplates/VisualStudio2015/WindowsUAP/Square44x44Logo.scale-200.png b/ProjectTemplates/VisualStudio2015/WindowsUAP/Square44x44Logo.scale-200.png
diff --git a/.../VisualStudio2015/WindowsUAP/Square44x44Logo.targetsize-24_altform-unplated.png b/.../VisualStudio2015/WindowsUAP/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/ProjectTemplates/VisualStudio2015/WindowsUAP/StoreLogo.png b/ProjectTemplates/VisualStudio2015/WindowsUAP/StoreLogo.png
diff --git a/ProjectTemplates/VisualStudio2015/WindowsUAP/StoreLogo.scale-100.png b/ProjectTemplates/VisualStudio2015/WindowsUAP/StoreLogo.scale-100.png
diff --git a/ProjectTemplates/VisualStudio2015/WindowsUAP/Wide310x150Logo.scale-200.png b/ProjectTemplates/VisualStudio2015/WindowsUAP/Wide310x150Logo.scale-200.png
diff --git a/ProjectTemplates/VisualStudio2015/WindowsUAP/WideLogo.scale-100.png b/ProjectTemplates/VisualStudio2015/WindowsUAP/WideLogo.scale-100.png
diff --git a/ProjectTemplates/VisualStudio2015/WindowsUAP/WindowsUAP.vstemplate b/ProjectTemplates/VisualStudio2015/WindowsUAP/WindowsUAP.vstemplate
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Project">
   <TemplateData>
-    <Name>MonoGame Windows 10 UAP Project</Name>
-    <Description>A MonoGame game project for Windows 10 UAP.</Description>
+    <Name>MonoGame Windows 10 Universal Project</Name>
+    <Description>A MonoGame game project for Windows 10 UWP.</Description>
     <Icon>__TemplateIcon.png</Icon>
     <PreviewImage>__PreviewImage.png</PreviewImage>
     <TemplateID>MonoGame.CS.WinRT.UAPGame</TemplateID>
@@ -26,14 +26,17 @@
       <ProjectItem ReplaceParameters="true" OpenInEditor="blend" TargetFileName="GamePage.xaml">GamePage.xaml</ProjectItem>
       <ProjectItem ReplaceParameters="true" TargetFileName="Game1.cs">Game1.cs</ProjectItem>    
       <ProjectItem ReplaceParameters="true" TargetFileName="GamePage.xaml.cs">GamePage.xaml.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="false" TargetFileName="project.json">project.json</ProjectItem>
       <ProjectItem ReplaceParameters="true" TargetFileName="Properties\AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
       <ProjectItem ReplaceParameters="true" TargetFileName="Properties\Default.rd.xml">Default.rd.xml</ProjectItem>
       <ProjectItem ReplaceParameters="true" TargetFileName="Package.appxmanifest">Package-managed.appxmanifest</ProjectItem>
-      <ProjectItem ReplaceParameters="false" TargetFileName="Assets\Logo.scale-100.png">Logo.scale-100.png</ProjectItem>
-      <ProjectItem ReplaceParameters="false" TargetFileName="Assets\SmallLogo.scale-100.png">SmallLogo.scale-100.png</ProjectItem>
-      <ProjectItem ReplaceParameters="false" TargetFileName="Assets\SplashScreen.scale-100.png">SplashScreen.scale-100.png</ProjectItem>
-      <ProjectItem ReplaceParameters="false" TargetFileName="Assets\StoreLogo.scale-100.png">StoreLogo.scale-100.png</ProjectItem>
-      <ProjectItem ReplaceParameters="false" TargetFileName="Assets\WideLogo.scale-100.png">WideLogo.scale-100.png</ProjectItem>
+      <ProjectItem ReplaceParameters="false" TargetFileName="Assets\LockScreenLogo.scale-200.png">LockScreenLogo.scale-200.png</ProjectItem>
+      <ProjectItem ReplaceParameters="false" TargetFileName="Assets\SplashScreen.scale-200.png">SplashScreen.scale-200.png</ProjectItem>
+      <ProjectItem ReplaceParameters="false" TargetFileName="Assets\Square150x150Logo.scale-200.png">Square150x150Logo.scale-200.png</ProjectItem>
+      <ProjectItem ReplaceParameters="false" TargetFileName="Assets\Square44x44Logo.scale-200.png">Square44x44Logo.scale-200.png</ProjectItem>
+      <ProjectItem ReplaceParameters="false" TargetFileName="Assets\Square44x44Logo.targetsize-24_altform-unplated.png">Square44x44Logo.targetsize-24_altform-unplated.png</ProjectItem>
+      <ProjectItem ReplaceParameters="false" TargetFileName="Assets\StoreLogo.png">StoreLogo.png</ProjectItem>
+      <ProjectItem ReplaceParameters="false" TargetFileName="Assets\Wide310x150Logo.scale-200.png">Wide310x150Logo.scale-200.png</ProjectItem>
       <ProjectItem ReplaceParameters="false" TargetFileName="$projectname$_TemporaryKey.pfx" BlendDoNotCreate="true">Application_TemporaryKey.pfx</ProjectItem>
       <Folder Name="Content" TargetFolderName="Content">
         <ProjectItem ReplaceParameters="true" TargetFileName="Content.mgcb">Content.mgcb</ProjectItem>
@@ -52,9 +55,13 @@
     <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
     <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
   </WizardExtension>
+  <WizardExtension>
+    <Assembly>Microsoft.VisualStudio.Universal.TemplateWizards, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
+    <FullClassName>Microsoft.VisualStudio.Universal.TemplateWizards.PlatformVersion.Wizard</FullClassName>
+  </WizardExtension>
   <WizardData>
-    <packages repository="registry" keyName="UAPFrameworkDependenciesLocationVS14" isPreunzipped="true">
-      <package id="System.Numerics.Vectors" version="4.0.0" skipAssemblyReferences="false" />
+    <packages repository="registry" keyName="NETCoreSDK" isPreunzipped="true">
+      <package id="Microsoft.NETCore.UniversalWindowsPlatform" version="5.0.0" skipAssemblyReferences="false" />
     </packages>
   </WizardData>
 </VSTemplate>
diff --git a/ProjectTemplates/VisualStudio2015/WindowsUAP/project.json b/ProjectTemplates/VisualStudio2015/WindowsUAP/project.json
@@ -0,0 +1,16 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
+  },
+  "frameworks": {
+    "uap10.0": {}
+  },
+  "runtimes": {
+    "win10-arm": {},
+    "win10-arm-aot": {},
+    "win10-x86": {},
+    "win10-x86-aot": {},
+    "win10-x64": {},
+    "win10-x64-aot": {}
+  }
+}
diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@ Our goal is to make it easy for XNA developers to create cross-platform games wi
 * [Windows Store Apps](http://dev.windows.com) (for Windows 8 and Windows RT)
 * [Windows Phone 8](http://dev.windowsphone.com)
 * [Windows Phone 8.1](http://dev.windows.com)
+* [Windows 10 UWP](http://dev.windows.com)
 * [OUYA](http://ouya.tv), an Android-based gaming console
 
 ## Quick Start