From c52cf79e100849b8d47f24fbc048795ff519609b Mon Sep 17 00:00:00 2001
From: Dustin Campbell <dustin@teamcampbell.org>
Date: Wed, 14 Nov 2018 12:34:43 -0800
Subject: [PATCH] Fix VS MSBuild discovery

My recent change to support VS MSBuild discovery for future versions of VS accidentally broke VS
discovery altogether be leaving "MSBuild" out of the path. Oops!
---
 .../Discovery/Providers/VisualStudioInstanceProvider.cs      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/OmniSharp.Host/MSBuild/Discovery/Providers/VisualStudioInstanceProvider.cs b/src/OmniSharp.Host/MSBuild/Discovery/Providers/VisualStudioInstanceProvider.cs
index 7ae0792482..57a764efa3 100644
--- 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(