Merge pull request #1831 from JoeRobich/add-project-information

Add ProjectCapablity to ProjectConfigurationMessage
OmniSharp · Jun 10, 2020 · 8bba43d · 8bba43d
2 parents b9e417f + 350d58d
commit 8bba43d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/src/OmniSharp.Abstractions/Eventing/IEventEmitterExtensions.cs b/src/OmniSharp.Abstractions/Eventing/IEventEmitterExtensions.cs
@@ -49,6 +49,7 @@ public static void UnresolvedDepdendencies(this IEventEmitter emitter, string pr
                                               HashedString projectId,
                                               HashedString sessionId,
                                               int outputKind,
+                                              IEnumerable<string> projectCapabilities,
                                               IEnumerable<string> targetFrameworks,
                                               HashedString sdkVersion,
                                               IEnumerable<HashedString> references,
@@ -57,6 +58,7 @@ public static void UnresolvedDepdendencies(this IEventEmitter emitter, string pr
         {
             var projectConfiguration = new ProjectConfigurationMessage()
             {
+                ProjectCapabilities = projectCapabilities,
                 TargetFrameworks = targetFrameworks,
                 SdkVersion = sdkVersion.Value,
                 OutputKind = outputKind,

diff --git a/src/OmniSharp.Abstractions/Models/Events/ProjectConfigurationMessage.cs b/src/OmniSharp.Abstractions/Models/Events/ProjectConfigurationMessage.cs
@@ -8,6 +8,7 @@ public class ProjectConfigurationMessage
         public string ProjectId { get; set; }
         public string SessionId { get; set; }
         public int OutputKind { get; set; }
+        public IEnumerable<string> ProjectCapabilities { get; set; }
         public IEnumerable<string> TargetFrameworks { get; set; }
         public string SdkVersion { get; set; }
         public IEnumerable<string> References { get; set; }

diff --git a/src/OmniSharp.MSBuild/ProjectFile/ItemNames.cs b/src/OmniSharp.MSBuild/ProjectFile/ItemNames.cs
@@ -8,6 +8,7 @@ internal static class ItemNames
         public const string Content = nameof(Content);
         public const string EditorConfigFiles = nameof(EditorConfigFiles);
         public const string PackageReference = nameof(PackageReference);
+        public const string ProjectCapability = nameof(ProjectCapability);
         public const string ProjectReference = nameof(ProjectReference);
         public const string ReferencePath = nameof(ReferencePath);
     }

diff --git a/src/OmniSharp.MSBuild/ProjectLoadListener.cs b/src/OmniSharp.MSBuild/ProjectLoadListener.cs
@@ -41,6 +41,7 @@ public void ProjectLoaded(ProjectLoadedEventArgs args)
                 var targetFrameworks = GetTargetFrameworks(args.ProjectInstance);
                 var sdkVersion = GetSdkVersion(args);
                 var outputKind = GetOutputKind(args);
+                var projectCapabilities = GetProjectCapabilities(args.ProjectInstance);
 
                 if (args.References == null)
                 {
@@ -50,7 +51,7 @@ public void ProjectLoaded(ProjectLoadedEventArgs args)
                 var hashedReferences = GetHashedReferences(args);
                 var (hashedFileExtensions, fileCounts) = GetUniqueHashedFileExtensionsAndCounts(args);
 
-                _eventEmitter.ProjectInformation(projectId, sessionId, (int)outputKind, targetFrameworks, sdkVersion, hashedReferences, hashedFileExtensions, fileCounts);
+                _eventEmitter.ProjectInformation(projectId, sessionId, (int)outputKind, projectCapabilities, targetFrameworks, sdkVersion, hashedReferences, hashedFileExtensions, fileCounts);
             }
             catch (Exception ex)
             {
@@ -105,6 +106,11 @@ private static IEnumerable<HashedString> GetHashedReferences(ProjectLoadedEventA
             return referenceNames.Select(_referenceHashingAlgorithm.HashInput);
         }
 
+        private IEnumerable<string> GetProjectCapabilities(ProjectInstance projectInstance)
+        {
+            return projectInstance.GetItems(ItemNames.ProjectCapability).Select(item => item.ToString());
+        }
+
         // Internal for testing
         internal static IEnumerable<string> GetTargetFrameworks(ProjectInstance projectInstance)
         {

diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs
@@ -200,6 +200,20 @@ public async Task The_output_kind_is_emitted()
             }
         }
 
+        [Fact]
+        public async Task The_correct_project_capablities_is_emitted()
+        {
+            // Arrange
+            var emitter = new ProjectLoadTestEventEmitter();
+
+            using (var testProject = await TestAssets.Instance.GetTestProjectAsync("NetCore31Project"))
+            using (var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory)))
+            {
+                Assert.Single(emitter.ReceivedMessages);
+                Assert.Equal("GenerateDocumentationFile CSharp Managed ReferencesFolder LanguageService RelativePathDerivedDefaultNamespace AssemblyReferences COMReferences ProjectReferences SharedProjectReferences OutputGroups AllTargetOutputGroups VisualStudioWellKnownOutputGroups SingleFileGenerators DeclaredSourceItems UserSourceItems BuildWindowsDesktopTarget CrossPlatformExecutable Pack", string.Join(" ", emitter.ReceivedMessages[0].ProjectCapabilities));
+            }
+        }
+
         [Fact]
         public async Task The_correct_sdk_version_is_emitted()
         {