From bd0d58931ab08b4e3a7c992886eb9e7bea12fd04 Mon Sep 17 00:00:00 2001
From: Rob LaDuca <roladuca@microsoft.com>
Date: Wed, 4 Sep 2019 09:33:48 -0700
Subject: [PATCH 1/4] Fixing removal of None from Page under certain conditions
 (EnableDefaultApplicationDefinition or EnableDefaultPageItems is false).
 Further adding a fix to ensure this doesn't result in ApplicationDefinition
 being included in Page as well when EnableDefaultApplicationDefinition is
 false.

---
 .../Microsoft.NET.Sdk.WindowsDesktop.targets  | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
index f772eff79a4..34700e59f12 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
@@ -27,11 +27,26 @@
 
   <ItemGroup Condition=" ('$(EnableDefaultItems)' == 'true') And ('$(UseWPF)' == 'true') And ('$(_TargetFrameworkVersionValue)' != '$(_UndefinedTargetFrameworkVersion)') And 
                          ('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
-    
-    <!-- In the WindowsDesktop .props, we globbed all .xaml files as Page items.  If any of those files are included
-         as Resource, Content, or None items, then remove them from the Page items. -->
-    <Page Remove="@(Resource);@(Content);@(None)"
+
+    <!--
+         In the WindowsDesktop .props, we globbed all .xaml files as Page items.  If any of those files are included
+         as Resource, Content then remove them from the Page items.
+         
+         If EnableDefaultApplicationDefinition is false, ApplicationDefinition must also be removed from Page as
+         PresentationBuildTasks will include the generated code for the ApplicationDefinition twice otherwise.
+         We cannot do this in all cases in the props file as ApplicationDefinition won't be available
+         at that point in the evaluation when EnableDefaultApplicationDefinition is false.
+    -->
+    <Page Remove="@(Resource);@(Content);@(ApplicationDefinition)"
           Condition="'$(EnableDefaultPageItems)' != 'false'" />
+
+    <!--
+         Only remove None from Page in the event that we disable both the default ApplicationDefinition and the DefaultPageItems.
+         Otherwise we can enter a situation where we are explicitly removing page items that should otherwise be included (such as
+         when (EnableDefaultApplicationDefinition xor EnableDefaultPageItems) is true).
+    -->
+    <Page Remove="@(None)"
+          Condition="'$(EnableDefaultApplicationDefinition)' != 'false' and '$(EnableDefaultPageItems)' != 'false'" />
   </ItemGroup>
 
   <!-- Generate error if there are duplicate page items.  The task comes from the .NET SDK, and this target follows

From 53bc105a22ee86199e281f68a34193e988d81aca Mon Sep 17 00:00:00 2001
From: Rob LaDuca <roladuca@microsoft.com>
Date: Wed, 4 Sep 2019 14:02:47 -0700
Subject: [PATCH 2/4] Fixing removal of ApplicationDefinition from Page to be
 unconditional.

---
 .../Microsoft.NET.Sdk.WindowsDesktop.targets       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
index 34700e59f12..64783d15b32 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
@@ -31,15 +31,19 @@
     <!--
          In the WindowsDesktop .props, we globbed all .xaml files as Page items.  If any of those files are included
          as Resource, Content then remove them from the Page items.
-         
-         If EnableDefaultApplicationDefinition is false, ApplicationDefinition must also be removed from Page as
-         PresentationBuildTasks will include the generated code for the ApplicationDefinition twice otherwise.
-         We cannot do this in all cases in the props file as ApplicationDefinition won't be available
-         at that point in the evaluation when EnableDefaultApplicationDefinition is false.
     -->
     <Page Remove="@(Resource);@(Content);@(ApplicationDefinition)"
           Condition="'$(EnableDefaultPageItems)' != 'false'" />
 
+    <!--
+        If ApplicationDefinition must also be removed from Page as PresentationBuildTasks will include the
+        generated code for the ApplicationDefinition twice otherwise.  We cannot do this in all cases in the
+        props file as ApplicationDefinition won't be available at that point in the evaluation when
+        EnableDefaultApplicationDefinition is false.  We unconditionally remove it here as ApplicationDefinition
+        is considered a special singleton Item that WPF ensures is only where it needs to be.
+    -->
+    <Page Remove="@(ApplicationDefinition)" />
+    
     <!--
          Only remove None from Page in the event that we disable both the default ApplicationDefinition and the DefaultPageItems.
          Otherwise we can enter a situation where we are explicitly removing page items that should otherwise be included (such as

From d2ccd042b09000aff42281c9c2b20eaeaa6ba8f1 Mon Sep 17 00:00:00 2001
From: Rob LaDuca <roladuca@microsoft.com>
Date: Wed, 4 Sep 2019 14:03:15 -0700
Subject: [PATCH 3/4] Removing extraneous ApplicationDefinition

---
 .../targets/Microsoft.NET.Sdk.WindowsDesktop.targets            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
index 64783d15b32..707c5a83ce2 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
@@ -32,7 +32,7 @@
          In the WindowsDesktop .props, we globbed all .xaml files as Page items.  If any of those files are included
          as Resource, Content then remove them from the Page items.
     -->
-    <Page Remove="@(Resource);@(Content);@(ApplicationDefinition)"
+    <Page Remove="@(Resource);@(Content)"
           Condition="'$(EnableDefaultPageItems)' != 'false'" />
 
     <!--

From d4f4ffb2c47cc05f8f8b5cc46398e78b8a8dca5c Mon Sep 17 00:00:00 2001
From: Rob LaDuca <roladuca@microsoft.com>
Date: Thu, 5 Sep 2019 15:05:45 -0700
Subject: [PATCH 4/4] Clarifying comments

---
 .../Microsoft.NET.Sdk.WindowsDesktop.targets  | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
index 707c5a83ce2..839a615f888 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
@@ -36,18 +36,23 @@
           Condition="'$(EnableDefaultPageItems)' != 'false'" />
 
     <!--
-        If ApplicationDefinition must also be removed from Page as PresentationBuildTasks will include the
-        generated code for the ApplicationDefinition twice otherwise.  We cannot do this in all cases in the
-        props file as ApplicationDefinition won't be available at that point in the evaluation when
-        EnableDefaultApplicationDefinition is false.  We unconditionally remove it here as ApplicationDefinition
-        is considered a special singleton Item that WPF ensures is only where it needs to be.
+        ApplicationDefinition must also be removed from Page.  Otherwise, PresentationBuildTasks will include the
+        generated code for the ApplicationDefinition twice.  We cannot do this in all cases in the props file as
+        ApplicationDefinition isn't available at that point in the evaluation when EnableDefaultApplicationDefinition
+        is false.  We unconditionally remove it here as ApplicationDefinition is considered a special singleton Item 
+        in WPF.
     -->
     <Page Remove="@(ApplicationDefinition)" />
     
     <!--
-         Only remove None from Page in the event that we disable both the default ApplicationDefinition and the DefaultPageItems.
-         Otherwise we can enter a situation where we are explicitly removing page items that should otherwise be included (such as
-         when (EnableDefaultApplicationDefinition xor EnableDefaultPageItems) is true).
+         The WindowsDesktop props file removes "**/*.xaml" from None if both EnableDefaultApplicationDefinition and 
+         EnableDefaultPageItems are true.  This is done so that we remove any implicitly globbed XAML files from None
+         in support of Visual Studio.  
+         
+         In the case where one or both of these properties are not true, the WindowsDesktop props file does not remove
+         any XAML files from None.  Under those conditions, removing None from Page here will remove explicitly specified
+         pages causing compilation errors.  We match the condition from the WindowsDesktop props file here so that we only
+         remove None from Page when we are guaranteed to not need those items.
     -->
     <Page Remove="@(None)"
           Condition="'$(EnableDefaultApplicationDefinition)' != 'false' and '$(EnableDefaultPageItems)' != 'false'" />