revert, do not keep <import> elements that are included by default ta…

…rget file
dotnet · Apr 26, 2021 · 3353dcc · 3353dcc
1 parent 9542b81
commit 3353dcc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 20 deletions.
diff --git a/src/MSBuild.Conversion.Project/ProjectRootElementExtensionsForConversion.cs b/src/MSBuild.Conversion.Project/ProjectRootElementExtensionsForConversion.cs
@@ -242,9 +242,7 @@ static void UpdateBasedOnDiff(ImmutableArray<ItemsDiff> itemsDiff, ProjectItemGr
                 if (!itemTypeDiff.DefaultedItems.IsDefault)
                 {
                     var defaultedItems = itemTypeDiff.DefaultedItems.Select(i => i.EvaluatedInclude);
-                    if (defaultedItems.Contains(item.Include, StringComparer.OrdinalIgnoreCase)
-                        // and this item is not an import element
-                        && !item.ElementName.Equals("import", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrWhiteSpace(item.Include))
+                    if (defaultedItems.Contains(item.Include, StringComparer.OrdinalIgnoreCase))
                     {
                         itemGroup.RemoveChild(item);
                     }

diff --git a/tests/TestData/SmokeTests.WinformsVbKeepTfm/SmokeTests.WinformsVbKeepTfm.vbproj b/tests/TestData/SmokeTests.WinformsVbKeepTfm/SmokeTests.WinformsVbKeepTfm.vbproj
@@ -20,17 +20,8 @@
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Import Include="Microsoft.VisualBasic" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Data" />
     <Import Include="System.Drawing" />
-    <Import Include="System.Diagnostics" />
     <Import Include="System.Windows.Forms" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-    <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="My Project\AssemblyInfo.vb" />

diff --git a/tests/TestData/SmokeTests.WpfVbNet5Baseline/SmokeTests.WpfVbNet5Baseline.vbproj b/tests/TestData/SmokeTests.WpfVbNet5Baseline/SmokeTests.WpfVbNet5Baseline.vbproj
@@ -21,14 +21,6 @@
     <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Import Include="System.Threading.Tasks" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-    <Import Include="Microsoft.VisualBasic" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Diagnostics" />
     <Import Include="System.Windows" />
     <Import Include="System.Windows.Controls" />
     <Import Include="System.Windows.Data" />