Uses VS toolchain for SDK .NET Framework projects (resolves #23)

phmonte · Oct 24, 2017 · 8ccd90e · 8ccd90e
1 parent e17e820
commit 8ccd90e
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/src/Buildalyzer/PathHelperFactory.cs b/src/Buildalyzer/PathHelperFactory.cs
@@ -22,9 +22,24 @@ public static IPathHelper GetPathHelper(string projectPath, XDocument projectDoc
             XElement projectElement = projectDocument.GetDescendants("Project").FirstOrDefault();
             if (projectElement != null)
             {
-                // Use .NET Core SDK if a SDK attribute
-                if (projectElement.GetAttributeValue("Sdk") != null)
+                // Does this project use the SDK?
+                // Check for an SDK attribute on the project element
+                // If no <Project> attribute, check for a SDK import (see https://github.com/Microsoft/msbuild/issues/1493)
+                if (projectElement.GetAttributeValue("Sdk") != null
+                    || projectElement.GetDescendants("Import").Any(x => x.GetAttributeValue("Sdk") != null))
                 {
+                    // Use the Framework tools if this project targets .NET Framework ("net" followed by a digit)
+                    // https://docs.microsoft.com/en-us/dotnet/standard/frameworks
+                    string targetFramework = projectElement.GetDescendants("TargetFramework").FirstOrDefault()?.Value;
+                    if(targetFramework != null
+                        && targetFramework.StartsWith("net", StringComparison.OrdinalIgnoreCase)
+                        && targetFramework.Length > 3
+                        && char.IsDigit(targetFramework[4]))
+                    {
+                        return new FrameworkPathHelper();
+                    }
+
+                    // Otherwise use the .NET Core SDK
                     return new CorePathHelper(projectPath);
                 }
 
@@ -33,13 +48,6 @@ public static IPathHelper GetPathHelper(string projectPath, XDocument projectDoc
                 {
                     return new FrameworkPathHelper();
                 }
-
-                // If no <Project> attribute, check for a SDK import
-                // See https://github.com/Microsoft/msbuild/issues/1493
-                if (projectElement.GetDescendants("Import").Any(x => x.GetAttributeValue("Sdk") != null))
-                {
-                    return new CorePathHelper(projectPath);
-                }
             }
 
             throw new InvalidOperationException("Unrecognized project file format");