Merge pull request #397 from KSchlobohm/kschlobohm/keep_winforms_imports

src/MSBuild.Abstractions/ProjectItemHelpers.cs

@@ -29,10 +29,12 @@ public static bool IsSpecificPacakgeReference(ProjectItemElement element, string
         /// Checks if a given item needs to be removed because it either only runs on desktop .NET or is automatically pulled in as a reference and is thus unnecessary.
         /// </summary>
         public static bool DesktopReferencesNeedsRemoval(ProjectItemElement item) =>
-            DesktopFacts.ReferencesThatNeedRemoval.Contains(item.Include, StringComparer.OrdinalIgnoreCase)
-            || DesktopFacts.KnownWPFReferences.Contains(item.Include, StringComparer.OrdinalIgnoreCase)
-            || DesktopFacts.KnownWinFormsReferences.Contains(item.Include, StringComparer.OrdinalIgnoreCase)
-            || DesktopFacts.KnownDesktopReferences.Contains(item.Include, StringComparer.OrdinalIgnoreCase);
+            !(item.ElementName.Equals("import", StringComparison.OrdinalIgnoreCase)
+                && !string.IsNullOrWhiteSpace(item.Include))
+            && (DesktopFacts.ReferencesThatNeedRemoval.Contains(item.Include, StringComparer.OrdinalIgnoreCase)
+                || DesktopFacts.KnownWPFReferences.Contains(item.Include, StringComparer.OrdinalIgnoreCase)
+                || DesktopFacts.KnownWinFormsReferences.Contains(item.Include, StringComparer.OrdinalIgnoreCase)
+                || DesktopFacts.KnownDesktopReferences.Contains(item.Include, StringComparer.OrdinalIgnoreCase));
 
         /// <summary>
         /// Checks if a given item is a desktop item that is globbed, so long as the metadata is a form type.
@@ -48,7 +50,8 @@ public static bool IsDesktopRemovableGlobbedItem(ProjectStyle style, ProjectItem
         /// Checks if a given item is a well-known reference that can be converted to PackageReference.
         /// </summary>
         public static bool IsReferenceConvertibleToPackageReference(ProjectItemElement item) =>
-            MSBuildFacts.DefaultItemsThatHavePackageEquivalents.ContainsKey(item.Include);
+            !item.ElementName.Equals("import", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrWhiteSpace(item.Include)
+            && MSBuildFacts.DefaultItemsThatHavePackageEquivalents.ContainsKey(item.Include);
 
         /// <summary>
         /// Checks if a reference is coming from an old-stlye NuGet package.

src/MSBuild.Conversion.SDK/TargetFrameworkHelper.cs

@@ -5,7 +5,6 @@
 using System.Text.Json;
 using System.Text.RegularExpressions;
 
-using Microsoft.Build.Locator;
 using MSBuild.Conversion.Facts;
 using NuGet.Versioning;
 
@@ -16,13 +15,18 @@ public static class TargetFrameworkHelper
         /// <summary>
         /// Determine the TFM to use based on what is installed on the users machine
         /// </summary>
-        public static string FindHighestInstalledTargetFramework(bool usePreviewSDK)
+        public static string FindHighestInstalledTargetFramework(bool usePreviewSDK, string msbuildPath)
         {
             // Finds SDK path
             string? sdkPath = null;
             try
             {
-                sdkPath = Path.GetFullPath(Path.Combine(MSBuildLocator.QueryVisualStudioInstances().Single().VisualStudioRootPath, "..", ".."));
+                if (string.IsNullOrWhiteSpace(msbuildPath))
+                {
+                    throw new InvalidOperationException("msbuildPath is rquired");
+                }
+
+                sdkPath = Path.GetFullPath(Path.Combine(msbuildPath, "..", ".."));
             }
             catch (Exception)
             {

src/try-convert/Program.cs

@@ -79,7 +79,7 @@ public static int Run(string? project, string? workspace, string? msbuildPath, s
                 }
                 else
                 {
-                    tfm = TargetFrameworkHelper.FindHighestInstalledTargetFramework(preview);
+                    tfm = TargetFrameworkHelper.FindHighestInstalledTargetFramework(preview, msbuildPath);
                 }
 
                 var workspacePath = string.Empty;

tests/TestData/SmokeTests.MSTestVbNet5Baseline/SmokeTests.MSTestVbNet5Baseline.vbproj

@@ -57,7 +57,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.*" />
-    <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />