Remove Windows 8.1 and Windows Phone 8.1 support (MonoGame#5809)

* Remove Windows 8.1 and Windows Phone 8.1 support * Remove Win8.1 and WP preprocessor directives * Replace WINRT with WINDOWS_UAP and remove the define * Re-add removed method stub needed for compilation * Remove Windows 8 Store from docs * Remove build VS2012 templates in NAnt script * Remove WP8.1 in Windows nsi installer * Remove some leftover files * Re-add build targets * Remove duplicate file include * Re-add SignedInGamer for UWP
nkast · Jun 26, 2018 · 1cef5ed · 1cef5ed
1 parent 5e71cfa
commit 1cef5ed
Show file tree

Hide file tree

Showing 203 changed files with 152 additions and 15,595 deletions.
diff --git a/Build/Module.xml b/Build/Module.xml
@@ -4,8 +4,8 @@
   <DefaultAction>Generate</DefaultAction>
   <DefaultLinuxPlatforms>Android,Angle,Linux,WindowsGL</DefaultLinuxPlatforms>
   <DefaultMacOSPlatforms>Angle,MacOS,iOS,WindowsGL,Android,tvOS,Linux</DefaultMacOSPlatforms>
-  <DefaultWindowsPlatforms>Android,Angle,Linux,Windows8,Windows,WindowsGL,WindowsPhone81,WindowsUniversal,iOS,tvOS</DefaultWindowsPlatforms>
-  <SupportedPlatforms>Android,Angle,Linux,Windows8,Windows,WindowsGL,WindowsPhone81,WindowsUniversal,iOS,MacOS,Web,tvOS,PSVita,XBoxOne,Switch</SupportedPlatforms>
+  <DefaultWindowsPlatforms>Android,Angle,Linux,Windows,WindowsGL,WindowsUniversal,iOS,tvOS</DefaultWindowsPlatforms>
+  <SupportedPlatforms>Android,Angle,Linux,Windows,WindowsGL,WindowsUniversal,iOS,MacOS,Web,tvOS,PSVita,XBoxOne,Switch</SupportedPlatforms>
   <DisableSynchronisation>true</DisableSynchronisation>
   <GenerateNuGetRepositories>false</GenerateNuGetRepositories>
   <Packages>

diff --git a/Build/Projects/FrameworkReferences.Net.definition b/Build/Projects/FrameworkReferences.Net.definition
@@ -43,22 +43,12 @@
     <Reference Include="Lidgren.Network" />
   </Platform>
 
-  <Platform Type="Windows8">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime.Serialization" />
-  </Platform>
-
   <Platform Type="WindowsGL">
     <Reference Include="System" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Core" />
     <Reference Include="Lidgren.Network" />
   </Platform>
-
-  <Platform Type="WindowsPhone81">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime.Serialization" />
-  </Platform>
 
   <Platform Type="WindowsUniversal">
   </Platform>

diff --git a/Build/Projects/FrameworkReferences.definition b/Build/Projects/FrameworkReferences.definition
@@ -76,33 +76,6 @@
     </Service>
   </Platform>
 
-  <Platform Type="Windows8">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime.Serialization" />
-
-    <Binary
-      Name="SharpDX"
-      Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.dll" />
-    <Binary
-      Name="SharpDX.Direct2D1"
-      Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.Direct2D1.dll" />
-    <Binary
-      Name="SharpDX.Direct3D11"
-      Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.Direct3D11.dll" />
-    <Binary
-      Name="SharpDX.DXGI"
-      Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.DXGI.dll" />
-    <Binary
-      Name="SharpDX.MediaFoundation"
-      Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.MediaFoundation.dll" />
-    <Binary
-      Name="SharpDX.XAudio2"
-      Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.XAudio2.dll" />
-    <Binary
-      Name="SharpDX.XInput"
-      Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.XInput.dll" />
-  </Platform>
-
   <Platform Type="WindowsGL">
     <Reference Include="System" />
     <Reference Include="System.Runtime.Serialization" />
@@ -116,33 +89,6 @@
     </Service>
   </Platform>
 
-  <Platform Type="WindowsPhone81">
-    <Reference Include="System" />
-    <Reference Include="System.Runtime.Serialization" />
-
-    <Binary
-      Name="SharpDX"
-      Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.dll" />
-    <Binary
-      Name="SharpDX"
-      Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.Direct2D1.dll" />
-    <Binary
-      Name="SharpDX"
-      Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.DXGI.dll" />
-    <Binary
-      Name="SharpDX.Direct3D11"
-      Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.Direct3D11.dll" />
-    <Binary
-      Name="SharpDX.DXGI"
-      Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.DXGI.dll" />
-    <Binary
-      Name="SharpDX.MediaFoundation"
-      Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.MediaFoundation.dll" />
-    <Binary
-      Name="SharpDX.XAudio2"
-      Path="ThirdParty/Dependencies/SharpDX/StoreApp/SharpDX.XAudio2.dll" />
-  </Platform>
-
   <Platform Type="WindowsUniversal">
     <Binary
       Name="SharpDX"

diff --git a/Build/Projects/MonoGame.Framework.Net.definition b/Build/Projects/MonoGame.Framework.Net.definition
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Name="MonoGame.Framework.Net" Path="MonoGame.Framework" Type="Library" Platforms="Android,iOS,Linux,MacOS,Windows,Windows8,WindowsGL,WindowsPhone81,WindowsUniversal">
+<Project Name="MonoGame.Framework.Net" Path="MonoGame.Framework" Type="Library" Platforms="Android,iOS,Linux,MacOS,Windows,WindowsGL,WindowsUniversal">
 
   <!--
     Using Protobuild in your own project?  ProjectGuids are only in use here
@@ -14,9 +14,7 @@
 	<Platform Name="Linux">1B738549-0449-4504-B978-7BFC347E3F3C</Platform>
 	<Platform Name="MacOS">1294038B-66C2-4359-AFE9-EA06A758CA94</Platform>
 	<Platform Name="Windows">87A71215-7CAC-4B80-9D43-1700DECFB828</Platform>
-	<Platform Name="Windows8">A65B8326-1DDD-4E5D-8130-E74F70919E81</Platform>
 	<Platform Name="WindowsGL">6D6009F4-0AFB-4806-89D7-7945F20270F5</Platform>
-    <Platform Name="WindowsPhone81">423e2b58-4fbb-4a5d-8a86-1188f2889523</Platform>
     <Platform Name="WindowsUniversal">9CE2FA93-3D41-4025-B228-3D9D81F19BE0</Platform>
   </ProjectGuids>
 
@@ -43,18 +41,10 @@
       <Platform Name="Linux">TRACE;LINUX;OPENGL;OPENAL;NET;DESKTOPGL</Platform>
       <Platform Name="MacOS">MONOMAC;OPENGL;OPENAL;NET</Platform>
       <Platform Name="Windows">TRACE;WINDOWS;DIRECTX;WINDOWS_MEDIA_SESSION;NET</Platform>
-      <Platform Name="Windows8">TRACE;NETFX_CORE;WINRT;WINDOWS_STOREAPP;DIRECTX;DIRECTX11_1;WINDOWS_MEDIA_ENGINE;NET</Platform>
       <Platform Name="WindowsGL">TRACE;WINDOWS;OPENGL;OPENAL;NET;DESKTOPGL</Platform>
-      <Platform Name="WindowsPhone81">TRACE;WINRT;WINDOWS_PHONE81;DIRECTX;WINDOWS_STOREAPP</Platform>
       <Platform Name="WindowsUniversal">TRACE;NETFX_CORE;WINDOWS_UAP;WINRT;DIRECTX;DIRECTX11_1;WINDOWS_MEDIA_ENGINE</Platform>		
     </CustomDefinitions>
 
-    <FrameworkVersions>
-	  <Platform Name="Windows8">
-	    <Version>v4.5.1</Version>
-	  </Platform>
-    </FrameworkVersions>
-
   </Properties>
 
   <Files>
@@ -97,94 +87,94 @@
 
     <!-- Microsoft.Xna.Framework.Net -->
     <Compile Include="Net\AvailableNetworkSessionCollection.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\AvailableNetworkSession.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\CommandEvent.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\CommandEventType.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\CommandGamerJoined.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\CommandGamerLeft.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\CommandGamerStateChange.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\CommandReceiveData.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\CommandSendData.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\CommandSessionStateChange.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\GamerStates.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\ICommand.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\LocalNetworkGamer.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\MonoGamerPeer.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\NetworkException.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\NetworkGamer.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\NetworkMachine.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\NetworkMessageType.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\NetworkNotAvailableException.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\NetworkSession.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\NetworkSessionEndReason.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\NetworkSessionJoinError.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\NetworkSessionJoinException.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\NetworkSessionProperties.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\NetworkSessionState.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\NetworkSessionType.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\PacketReader.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\PacketWriter.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\QualityOfService.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
     <Compile Include="Net\SendDataOptions.cs">
-      <ExcludePlatforms>WindowsPhone81,Windows8,WindowsUniversal</ExcludePlatforms> 
+      <ExcludePlatforms>WindowsUniversal</ExcludePlatforms> 
     </Compile>
 
     <!-- Android Platform -->
@@ -254,14 +244,14 @@
     </Compile>
 
 
-    <!-- Windows 8 Platform -->
-    <Compile Include="Windows8\GamerServices\SignedInGamer.cs">
-      <Platforms>Windows8,WindowsPhone81,WindowsUniversal</Platforms>
+    <!-- Windows Universal Platform -->
+    <Compile Include="WindowsUniversal\GamerServices\SignedInGamer.cs">
+      <Platforms>WindowsUniversal</Platforms>
     </Compile>
 
     <!-- Windows Desktop Platform -->
     <Compile Include="Windows\GamerServices\Guide.cs">
-      <Platforms>Windows8,Windows,WindowsPhone81,WindowsUniversal</Platforms>
+      <Platforms>Windows,WindowsUniversal</Platforms>
     </Compile>
     <Compile Include="Windows\GamerServices\MonoGameGamerServicesHelper.cs">
       <Platforms>Windows</Platforms>