From 90a5cc4ffb4e836679a77076fc908f3182e30753 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Wed, 14 Jul 2021 15:38:07 -0700
Subject: [PATCH 1/2] Rationalize default Imports for C# and VB

---
 .../targets/Microsoft.NET.Sdk.DefaultItems.props | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
index d2e38c6fb6d6..06a9bc286aea 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
@@ -82,18 +82,22 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   </ItemGroup>
 
-  <!-- C# implicit imports -->
+  <!-- Implicit imports -->
   <ItemGroup Condition=" '$(DisableImplicitNamespaceImports_DotNet)' != 'true'
-                      and '$(Language)' == 'C#'
                       and '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
                       and $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0'))">
-    <Import Include="System" />
-    <Import Include="System.Collections.Generic" />
+
+    <!-- These imports are already defined as VB implicit imports, so only add them for C# here -->
+    <Import Include="System" Condition="'$(Language)' == 'C#'" />
+    <Import Include="System.Collections.Generic" Condition="'$(Language)' == 'C#'" />
+    <Import Include="System.Linq" Condition="'$(Language)' == 'C#'" />
+    <Import Include="System.Threading.Tasks" Condition="'$(Language)' == 'C#'" />
+    
+    <!-- These imports were not included by default for VB projects prior to .NET 6, so they apply to both languages -->
     <Import Include="System.IO" />
-    <Import Include="System.Linq" />
     <Import Include="System.Net.Http" />
     <Import Include="System.Threading" />
-    <Import Include="System.Threading.Tasks" />
+
   </ItemGroup>
 
   <!-- VB implicit imports -->

From 9f435383f98a29a5b3f807ea82835ce3f5e0c9f1 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Wed, 14 Jul 2021 18:09:45 -0700
Subject: [PATCH 2/2] Fix ordering of Import items to be alphabetical

---
 .../targets/Microsoft.NET.Sdk.DefaultItems.props   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
index 06a9bc286aea..ceb02b0ff611 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
@@ -87,17 +87,15 @@ Copyright (c) .NET Foundation. All rights reserved.
                       and '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
                       and $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0'))">
 
-    <!-- These imports are already defined as VB implicit imports, so only add them for C# here -->
-    <Import Include="System" Condition="'$(Language)' == 'C#'" />
-    <Import Include="System.Collections.Generic" Condition="'$(Language)' == 'C#'" />
-    <Import Include="System.Linq" Condition="'$(Language)' == 'C#'" />
-    <Import Include="System.Threading.Tasks" Condition="'$(Language)' == 'C#'" />
-    
-    <!-- These imports were not included by default for VB projects prior to .NET 6, so they apply to both languages -->
+    <!-- Imports already defined as VB implicit imports are conditioned to not be added twice -->
+    <Import Include="System" Condition="'$(Language)' != 'VB'" />
+    <Import Include="System.Collections.Generic" Condition="'$(Language)' != 'VB'" />
     <Import Include="System.IO" />
+    <Import Include="System.Linq" Condition="'$(Language)' != 'VB'" />
     <Import Include="System.Net.Http" />
     <Import Include="System.Threading" />
-
+    <Import Include="System.Threading.Tasks" Condition="'$(Language)' != 'VB'" />
+    
   </ItemGroup>
 
   <!-- VB implicit imports -->