From e36948f559002bf98e1fae38ed13afe53d4cdcd5 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 8 Jan 2021 02:20:13 +0100
Subject: [PATCH] Glob include files based on project extension (VS) (#46702)

* Glob include files based on project extension (VS)

* Update Directory.Build.targets

* Update Directory.Build.targets

* Update Directory.Build.targets
---
 Directory.Build.targets               | 10 +++++++++-
 src/libraries/Directory.Build.targets |  7 -------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index e84ae45..e6457e6 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -24,6 +24,14 @@
     <InformationalVersion Condition="'$(InformationalVersion)' == '' and '$(VersionSuffix)' == ''">$(ProductVersion)</InformationalVersion>
     <InformationalVersion Condition="'$(InformationalVersion)' == '' and '$(VersionSuffix)' != ''">$(ProductVersion)-$(VersionSuffix)</InformationalVersion>
   </PropertyGroup>
+  
+  <!-- The Default behavior in VS is to show files for the first target framework in TargetFrameworks property.
+       This is required to show all the files corresponding to all target frameworks in VS. -->
+  <ItemGroup Condition="'$(DefaultLanguageSourceExtension)' != '' and
+                        ('$(BuildingInsideVisualStudio)' == 'true' or '$(DesignTimeBuild)' == 'true')">
+    <None Include="$(MSBuildProjectDirectory)\**\*$(DefaultLanguageSourceExtension)"
+          Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);@(Compile)" />
+  </ItemGroup>
 
   <!-- Packaging -->
   <ItemGroup Condition="'$(IsPackable)' == 'true'">
@@ -62,4 +70,4 @@
       <PackDependsOn />
     </PropertyGroup>
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 6b13a6e..eadd1ad 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -256,13 +256,6 @@
     </When>
   </Choose>
 
-  <!-- The Default behavior in VS is to show files for the first target framework in TargetFrameworks property.
-        This is required to show all the files corresponding to all target frameworks in VS. -->
-  <ItemGroup Condition="'$(BuildingInsideVisualStudio)' == 'true' or '$(DesignTimeBuild)' == 'true'">
-    <None Include="$(MSBuildProjectDirectory)\**\*.cs"
-          Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);@(Compile)" />
-  </ItemGroup>
-
   <PropertyGroup>
     <SkipLocalsInit Condition="'$(SkipLocalsInit)' == '' and '$(MSBuildProjectExtension)' == '.csproj' and '$(IsNETCoreAppSrc)' == 'true' and ($([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppCurrent)')))">true</SkipLocalsInit>
   </PropertyGroup>
-- 
2.7.4