Merge pull request #1337 from DustinCampbell/fix-vs-msbuild-discovery

Fix VS MSBuild discovery
OmniSharp · Nov 14, 2018 · 0496b7e · 0496b7e
2 parents 9592f57 + c52cf79
commit 0496b7e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/OmniSharp.Host/MSBuild/Discovery/Providers/VisualStudioInstanceProvider.cs b/src/OmniSharp.Host/MSBuild/Discovery/Providers/VisualStudioInstanceProvider.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Immutable;
+using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Microsoft.Extensions.Logging;
@@ -68,7 +69,9 @@ public override ImmutableArray<MSBuildInstance> GetInstances()
                         continue;
                     }
 
-                    var toolsPath = FindMSBuildToolsPath(installPath);
+                    var msbuildPath = Path.Combine(installPath, "MSBuild");
+
+                    var toolsPath = FindMSBuildToolsPath(msbuildPath);
                     if (toolsPath != null)
                     {
                         builder.Add(