From 9c4051feed3d1ef5992db5f4ac7ead143ed15206 Mon Sep 17 00:00:00 2001 From: Dustin Campbell Date: Thu, 25 May 2017 09:57:15 -0700 Subject: [PATCH 1/2] Ensure that the MSBuild project system adds projects with the .csproj extension, even if they have a different GUID --- src/OmniSharp.MSBuild/MSBuildProjectSystem.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/OmniSharp.MSBuild/MSBuildProjectSystem.cs b/src/OmniSharp.MSBuild/MSBuildProjectSystem.cs index e769bb9d7d..fdf031b2c8 100644 --- a/src/OmniSharp.MSBuild/MSBuildProjectSystem.cs +++ b/src/OmniSharp.MSBuild/MSBuildProjectSystem.cs @@ -160,7 +160,8 @@ private IEnumerable GetProjectPathsFromSolution(string solutionFilePath) continue; } - if (project.Kind == ProjectKind.CSharpProject) + if (project.Kind == ProjectKind.CSharpProject || + Path.GetExtension(projectFilePath) == ".csproj") { result.Add(projectFilePath); } From 7d1dd371d0f088e4b71de53a11b17f577ebc074d Mon Sep 17 00:00:00 2001 From: Dustin Campbell Date: Thu, 25 May 2017 12:31:27 -0700 Subject: [PATCH 2/2] Check with '.csproj' extension with case-insensitive match --- src/OmniSharp.MSBuild/MSBuildProjectSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OmniSharp.MSBuild/MSBuildProjectSystem.cs b/src/OmniSharp.MSBuild/MSBuildProjectSystem.cs index fdf031b2c8..0232b0c482 100644 --- a/src/OmniSharp.MSBuild/MSBuildProjectSystem.cs +++ b/src/OmniSharp.MSBuild/MSBuildProjectSystem.cs @@ -161,7 +161,7 @@ private IEnumerable GetProjectPathsFromSolution(string solutionFilePath) } if (project.Kind == ProjectKind.CSharpProject || - Path.GetExtension(projectFilePath) == ".csproj") + string.Equals(Path.GetExtension(projectFilePath), ".csproj", StringComparison.OrdinalIgnoreCase)) { result.Add(projectFilePath); }