Merge pull request #280 from cartermp/no-web

Fail conversion if we see System.Web
dotnet · May 1, 2020 · 0ab29a7 · 0ab29a7
2 parents 3804a99 + 462a99c
commit 0ab29a7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 36 deletions.
diff --git a/src/MSBuild.Abstractions/MSBuildHelpers.cs b/src/MSBuild.Abstractions/MSBuildHelpers.cs
@@ -302,11 +302,6 @@ public static bool ArePropertyGroupElementsIdentical(ProjectPropertyGroupElement
                    && groupA.Properties.All(propA => groupB.Properties.Any(propB => ProjectPropertyHelpers.ArePropertiesEqual(propA, propB)));
         }
 
-        /// <summary>
-        /// Checks if there is a reference to System.Web, which is unsupported on .NET Core, in the given project.
-        /// </summary>
-        public static bool IsProjectReferencingSystemWeb(MSBuildProjectRootElement root) => root.ItemGroups.Any(ig => ig.Items.Any(ProjectItemHelpers.IsReferencingSystemWeb));
-
         /// <summary>
         /// Unquote string. It simply removes the starting and ending "'", and checks they are present before.
         /// </summary>

diff --git a/src/MSBuild.Abstractions/MSBuildWorkspace.cs b/src/MSBuild.Abstractions/MSBuildWorkspace.cs
@@ -237,43 +237,40 @@ private bool IsSupportedProjectType(MSBuildProjectRootElement root)
             }
 
             // Lots of wild old project types have project type guids that the old project system uses to light things up!
-            if (MSBuildHelpers.HasProjectTypeGuidsNode(root))
+            // Also some references that are incompatible.
+            var projectType = GetProjectSupportType(root);
+            switch (projectType)
             {
-                var projectType = GetProjectSupportType(root);
-                switch (projectType)
-                {
-                    case ProjectSupportType.LegacyWeb:
-                        Console.WriteLine($"'{root.FullPath}' is a legacy web project, which is unsupported by this tool.");
-                        return false;
-                    case ProjectSupportType.CodedUITest:
-                        Console.WriteLine($"'{root.FullPath}' is a coded UI test. Coded UI tests are deprecated and not convertable to .NET Core.");
-                        return false;
-                    case ProjectSupportType.UnknownTestProject:
-                        Console.WriteLine($"'{root.FullPath}' has invalid Project Type Guids for test projects and is not supported.");
-                        return false;
-                    case ProjectSupportType.UnsupportedTestType:
-                        Console.WriteLine($"'{root.FullPath}' is an unsupported MSTest test type. Only Unit Tests are supported.");
-                        return false;
-                    case ProjectSupportType.Desktop:
-                    case ProjectSupportType.MSTest:
-                        // Let them know about System.Web while we're here
-                        if (MSBuildHelpers.IsProjectReferencingSystemWeb(root))
-                        {
-                            Console.WriteLine($"'{root.FullPath}' references System.Web, which is unsupported on .NET Core. You may have significant work remaining after conversion.");
-                        }
-                        return true;
-                    case ProjectSupportType.Unsupported:
-                    default:
+                case ProjectSupportType.LegacyWeb:
+                    Console.WriteLine($"'{root.FullPath}' is a legacy web project and/or reference System.Web. Legacy Web projects and System.Web are unsupported on .NET Core. You will need to rewrite your application or find a way to not depend on System.Web to convert this project.");
+                    return false;
+                case ProjectSupportType.CodedUITest:
+                    Console.WriteLine($"'{root.FullPath}' is a coded UI test. Coded UI tests are deprecated and not convertable to .NET Core.");
+                    return false;
+                case ProjectSupportType.UnknownTestProject:
+                    Console.WriteLine($"'{root.FullPath}' has invalid Project Type Guids for test projects and is not supported.");
+                    return false;
+                case ProjectSupportType.UnsupportedTestType:
+                    Console.WriteLine($"'{root.FullPath}' is an unsupported MSTest test type. Only Unit Tests are supported.");
+                    return false;
+                case ProjectSupportType.Desktop:
+                case ProjectSupportType.MSTest:
+                    return true;
+                case ProjectSupportType.Unsupported:
+                default:
+                    if (MSBuildHelpers.HasProjectTypeGuidsNode(root))
+                    {
                         var allSupportedProjectTypeGuids = DesktopFacts.KnownSupportedDesktopProjectTypeGuids.Select(ptg => ptg.ToString());
                         var allReadProjectTypeGuids = MSBuildHelpers.GetAllProjectTypeGuids(root);
                         Console.WriteLine($"{root.FullPath} is an unsupported project type. Not all project type guids are supported.");
                         PrintGuidMessage(allSupportedProjectTypeGuids, allReadProjectTypeGuids);
                         return false;
+                    }
+                    else
+                    {
+                        return true;
+                    }
                 }
-            }
-
-            // assume its supported
-            return true;
 
             static void PrintGuidMessage(IEnumerable<string> allSupportedProjectTypeGuids, IEnumerable<string> allReadProjectTypeGuids)
             {
@@ -292,7 +289,8 @@ static void PrintGuidMessage(IEnumerable<string> allSupportedProjectTypeGuids, I
 
             static ProjectSupportType GetProjectSupportType(MSBuildProjectRootElement root)
             {
-                if (root.PropertyGroups.Any(pg => pg.Properties.Any(ProjectPropertyHelpers.IsLegacyWebProjectTypeGuidsProperty)))
+                if (root.PropertyGroups.Any(pg => pg.Properties.Any(ProjectPropertyHelpers.IsLegacyWebProjectTypeGuidsProperty))
+                    || root.ItemGroups.Any(ig => ig.Items.Any(ProjectItemHelpers.IsReferencingSystemWeb)))
                 {
                     return ProjectSupportType.LegacyWeb;
                 }