From 132519ad290a2fafc9514b82210668209af52c5a Mon Sep 17 00:00:00 2001
From: Vijay Ramakrishnan <vramak@microsoft.com>
Date: Tue, 14 Jul 2020 15:42:04 -0700
Subject: [PATCH 1/2] Moving the Well Known tooling properties to None glob

---
 sdk.sln                                       |  1 +
 .../Microsoft.NET.Sdk.Web.DefaultItems.props  | 44 +++++++++++++++++++
 .../Microsoft.NET.Sdk.Web.ProjectSystem.props |  3 ++
 .../Targets/Microsoft.NET.Sdk.Worker.props    |  3 +-
 4 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.DefaultItems.props

diff --git a/sdk.sln b/sdk.sln
index ee51d43bdccd..08cd9a108e1a 100644
--- a/sdk.sln
+++ b/sdk.sln
@@ -155,6 +155,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sdk", "Sdk", "{0C6854E8-01E
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{9446E46C-61A6-4DC0-975F-CF22B8A596A5}"
 	ProjectSection(SolutionItems) = preProject
+		src\WebSdk\ProjectSystem\Targets\Microsoft.NET.Sdk.Web.DefaultItems.props = src\WebSdk\ProjectSystem\Targets\Microsoft.NET.Sdk.Web.DefaultItems.props
 		src\WebSdk\ProjectSystem\Targets\Microsoft.NET.Sdk.Web.ProjectSystem.props = src\WebSdk\ProjectSystem\Targets\Microsoft.NET.Sdk.Web.ProjectSystem.props
 		src\WebSdk\ProjectSystem\Targets\Microsoft.NET.Sdk.Web.ProjectSystem.targets = src\WebSdk\ProjectSystem\Targets\Microsoft.NET.Sdk.Web.ProjectSystem.targets
 	EndProjectSection
diff --git a/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.DefaultItems.props b/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.DefaultItems.props
new file mode 100644
index 000000000000..7b556f875070
--- /dev/null
+++ b/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.DefaultItems.props
@@ -0,0 +1,44 @@
+<!--
+***********************************************************************************************
+Microsoft.NET.Sdk.Web.DefaultItems.props
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0">
+
+  <ItemGroup Condition="'$(EnableDefaultItems)' == 'true' 
+             And '$(EnableDefaultContentItems)' == 'true' 
+             And '$(EnableDefaultNoneItems)' == 'true'
+             And '$(AppDesignerFolder)' != ''">
+
+    <_webToolingArtifacts Include="$(AppDesignerFolder)\launchSettings.json;
+                          $(AppDesignerFolder)\serviceDependencies.json;
+                          $(AppDesignerFolder)\serviceDependencies.*.json;
+                          $(AppDesignerFolder)\ServiceDependencies\**;
+                          $(AppDesignerFolder)\PublishProfiles\**"
+                          Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"/>
+
+    <!-- Removing the tooling artifacts from all other globs and adding it to the none glob. This ensures that the 
+         up-to-date check is unimpacted by the changes to the tooling artifacts -->
+    <None Remove="@(_webToolingArtifacts)" />
+    <None Include="@(_webToolingArtifacts)"
+          CopyToOutputDirectory="Never"
+          CopyToPublishDirectory="Never"
+          ExcludeFromSingleFile="true" />
+
+    <Content Remove="@(_webToolingArtifacts)" />
+    <Compile Remove="@(_webToolingArtifacts)" />
+    <EmbeddedResource Remove="@(_webToolingArtifacts)" />
+
+    <!-- Keep track of the default content items for later to distinguish them from newly generated content items -->
+    <_ContentIncludedByDefault Remove="@(_ContentIncludedByDefault)" />
+    <_ContentIncludedByDefault Include="@(Content)" />
+    
+  </ItemGroup>
+
+</Project>
diff --git a/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.props b/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.props
index d57b43c9df08..5c9e736f8f8e 100644
--- a/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.props
+++ b/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.props
@@ -25,5 +25,8 @@ Copyright (c) .NET Foundation. All rights reserved.
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props"
       Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props')"/>
 
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Web.DefaultItems.props"
+    Condition="Exists('$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Web.DefaultItems.props')"/>
+
 </Project>
 
diff --git a/src/WebSdk/Worker/Targets/Microsoft.NET.Sdk.Worker.props b/src/WebSdk/Worker/Targets/Microsoft.NET.Sdk.Worker.props
index b7ebfc69e4b7..a60f95c27b76 100644
--- a/src/WebSdk/Worker/Targets/Microsoft.NET.Sdk.Worker.props
+++ b/src/WebSdk/Worker/Targets/Microsoft.NET.Sdk.Worker.props
@@ -36,8 +36,9 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <!-- Keep track of the default content items for later to distinguish them from newly generated content items -->
     <_ContentIncludedByDefault Include="@(Content)" />
-
   </ItemGroup>
 
+  <Import Sdk="Microsoft.NET.Sdk.Web.ProjectSystem" Project="../Targets/Microsoft.NET.Sdk.Web.DefaultItems.props" />
+
 </Project>
 

From f9dc4cf01a6603c7ca679ab939a2ee7e6ac3b2bb Mon Sep 17 00:00:00 2001
From: Vijay Ramakrishnan <vramak@microsoft.com>
Date: Tue, 14 Jul 2020 17:59:55 -0700
Subject: [PATCH 2/2] Fix the casing for the private property

---
 .../Targets/Microsoft.NET.Sdk.Web.DefaultItems.props | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.DefaultItems.props b/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.DefaultItems.props
index 7b556f875070..4aeeaf54e013 100644
--- a/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.DefaultItems.props
+++ b/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.DefaultItems.props
@@ -16,7 +16,7 @@ Copyright (c) .NET Foundation. All rights reserved.
              And '$(EnableDefaultNoneItems)' == 'true'
              And '$(AppDesignerFolder)' != ''">
 
-    <_webToolingArtifacts Include="$(AppDesignerFolder)\launchSettings.json;
+    <_WebToolingArtifacts Include="$(AppDesignerFolder)\launchSettings.json;
                           $(AppDesignerFolder)\serviceDependencies.json;
                           $(AppDesignerFolder)\serviceDependencies.*.json;
                           $(AppDesignerFolder)\ServiceDependencies\**;
@@ -25,15 +25,15 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <!-- Removing the tooling artifacts from all other globs and adding it to the none glob. This ensures that the 
          up-to-date check is unimpacted by the changes to the tooling artifacts -->
-    <None Remove="@(_webToolingArtifacts)" />
-    <None Include="@(_webToolingArtifacts)"
+    <None Remove="@(_WebToolingArtifacts)" />
+    <None Include="@(_WebToolingArtifacts)"
           CopyToOutputDirectory="Never"
           CopyToPublishDirectory="Never"
           ExcludeFromSingleFile="true" />
 
-    <Content Remove="@(_webToolingArtifacts)" />
-    <Compile Remove="@(_webToolingArtifacts)" />
-    <EmbeddedResource Remove="@(_webToolingArtifacts)" />
+    <Content Remove="@(_WebToolingArtifacts)" />
+    <Compile Remove="@(_WebToolingArtifacts)" />
+    <EmbeddedResource Remove="@(_WebToolingArtifacts)" />
 
     <!-- Keep track of the default content items for later to distinguish them from newly generated content items -->
     <_ContentIncludedByDefault Remove="@(_ContentIncludedByDefault)" />