Merge pull request #2502 from dibarbet/report_old_style_csproj

Report to the client if the project being loaded is sdk style
OmniSharp · Feb 3, 2023 · 7299d08 · 7299d08
2 parents d6ef83d + 9cf0ffb
commit 7299d08
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/src/OmniSharp.Abstractions/Eventing/IEventEmitterExtensions.cs b/src/OmniSharp.Abstractions/Eventing/IEventEmitterExtensions.cs
@@ -54,7 +54,8 @@ public static void ProjectInformation(this IEventEmitter emitter,
                                               HashedString sdkVersion,
                                               IEnumerable<HashedString> references,
                                               IEnumerable<HashedString> fileExtensions,
-                                              IEnumerable<int> fileCounts)
+                                              IEnumerable<int> fileCounts,
+                                              bool sdkStyleProject)
         {
             var projectConfiguration = new ProjectConfigurationMessage()
             {
@@ -66,7 +67,8 @@ public static void ProjectInformation(this IEventEmitter emitter,
                 SessionId = sessionId.Value,
                 References = references.Select(hashed => hashed.Value),
                 FileExtensions = fileExtensions.Select(hashed => hashed.Value),
-                FileCounts = fileCounts
+                FileCounts = fileCounts,
+                SdkStyleProject = sdkStyleProject
             };
 
             emitter.Emit(

diff --git a/src/OmniSharp.Abstractions/Models/Events/ProjectConfigurationMessage.cs b/src/OmniSharp.Abstractions/Models/Events/ProjectConfigurationMessage.cs
@@ -14,5 +14,6 @@ public class ProjectConfigurationMessage
         public IEnumerable<string> References { get; set; }
         public IEnumerable<string> FileExtensions { get; set; }
         public IEnumerable<int> FileCounts { get; set; }
+        public bool SdkStyleProject { get; set; }
     }
 }
diff --git a/src/OmniSharp.MSBuild/ProjectLoadListener.cs b/src/OmniSharp.MSBuild/ProjectLoadListener.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Composition;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using Microsoft.Build.Execution;
@@ -51,14 +52,27 @@ public void ProjectLoaded(ProjectLoadedEventArgs args)
                 var hashedReferences = GetHashedReferences(args);
                 var (hashedFileExtensions, fileCounts) = GetUniqueHashedFileExtensionsAndCounts(args);
 
-                _eventEmitter.ProjectInformation(projectId, sessionId, (int)outputKind, projectCapabilities, targetFrameworks, sdkVersion, hashedReferences, hashedFileExtensions, fileCounts);
+                var sdkStyleProject = IsSdkStyleProject(args);
+                _eventEmitter.ProjectInformation(projectId, sessionId, (int)outputKind, projectCapabilities, targetFrameworks, sdkVersion, hashedReferences, hashedFileExtensions, fileCounts, sdkStyleProject);
             }
             catch (Exception ex)
             {
                 _logger.LogError("Unexpected exception got thrown from project load listener: " + ex);
             }
         }
 
+        private static bool IsSdkStyleProject(ProjectLoadedEventArgs args)
+        {
+            // To see if a project is an SDK style project we check for either of two things
+            //   1.  If it has a TargetFramework / TargetFrameworks property.  This isn't fully complete
+            //       as this property could come from a different props file
+            //   2.  If it imports an SDK.  This can be defined multiple ways in the project file, but
+            //       we can look at the resolved imports after evaluation to see if any are SDK based.
+            bool hasTargetFrameworkProperty = args.Project.Properties.Any(property => property.Name is "TargetFramework" or "TargetFrameworks");
+            bool importsSdk = args.Project.Imports.Any(import => import.SdkResult != null);
+            return hasTargetFrameworkProperty || importsSdk;
+        }
+
         private static (IEnumerable<HashedString> Extensions, IEnumerable<int> Counts) GetUniqueHashedFileExtensionsAndCounts(ProjectLoadedEventArgs args)
         {
             var contentFiles = args.ProjectInstance