Use the real MSBuild version during discovery

OmniSharp · Aug 6, 2020 · 2bfebbc · 2bfebbc
1 parent 96600de
commit 2bfebbc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/src/OmniSharp.Host/MSBuild/Discovery/Providers/MonoInstanceProvider.cs b/src/OmniSharp.Host/MSBuild/Discovery/Providers/MonoInstanceProvider.cs
@@ -103,16 +103,21 @@ public override ImmutableArray<MSBuildInstance> GetInstances()
             var localMSBuildPath = FindLocalMSBuildDirectory();
             if (localMSBuildPath != null)
             {
+                microsoftBuildPath = Path.Combine(localMSBuildPath, "Current", "Bin", "Microsoft.Build.dll");
+
                 var localRoslynPath = Path.Combine(localMSBuildPath, "Current", "Bin", "Roslyn");
                 propertyOverrides.Add("CscToolPath", localRoslynPath);
                 propertyOverrides.Add("CscToolExe", "csc.exe");
             }
 
+            var msbuildVersionInfo = FileVersionInfo.GetVersionInfo(microsoftBuildPath);
+            var version = Version.Parse(msbuildVersionInfo.ProductVersion);
+
             return ImmutableArray.Create(
                 new MSBuildInstance(
                     nameof(DiscoveryType.Mono),
                     toolsPath,
-                    new Version(16, 4),
+                    version,
                     DiscoveryType.Mono,
                     propertyOverrides.ToImmutable()));
         }

diff --git a/src/OmniSharp.Host/MSBuild/Discovery/Providers/StandAloneInstanceProvider.cs b/src/OmniSharp.Host/MSBuild/Discovery/Providers/StandAloneInstanceProvider.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Immutable;
+using System.Diagnostics;
 using System.IO;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Utilities;
@@ -25,6 +26,10 @@ public override ImmutableArray<MSBuildInstance> GetInstances()
             var toolsPath = Path.Combine(extensionsPath, "Current", "Bin");
             var roslynPath = Path.Combine(toolsPath, "Roslyn");
 
+            var microsoftBuildPath = Path.Combine(toolsPath, "Microsoft.Build.dll");
+            var msbuildVersionInfo = FileVersionInfo.GetVersionInfo(microsoftBuildPath);
+            var version = Version.Parse(msbuildVersionInfo.ProductVersion);
+
             var propertyOverrides = ImmutableDictionary.CreateBuilder<string, string>(StringComparer.OrdinalIgnoreCase);
 
             if (PlatformHelper.IsMono)
@@ -46,7 +51,7 @@ public override ImmutableArray<MSBuildInstance> GetInstances()
                 new MSBuildInstance(
                     nameof(DiscoveryType.StandAlone),
                     toolsPath,
-                    new Version(16, 4), // we now ship with embedded MsBuild 16.4
+                    version,
                     DiscoveryType.StandAlone,
                     propertyOverrides.ToImmutable(),
                     setMSBuildExePathVariable: true));

diff --git a/src/OmniSharp.Host/MSBuild/Discovery/Providers/UserOverrideInstanceProvider.cs b/src/OmniSharp.Host/MSBuild/Discovery/Providers/UserOverrideInstanceProvider.cs
@@ -2,6 +2,8 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Immutable;
+using System.Diagnostics;
+using System.IO;
 
 namespace OmniSharp.MSBuild.Discovery.Providers
 {
@@ -22,12 +24,16 @@ public override ImmutableArray<MSBuildInstance> GetInstances()
                 return ImmutableArray<MSBuildInstance>.Empty;
             }
 
+            var microsoftBuildPath = Path.Combine(_options.MSBuildPath, "Microsoft.Build.dll");
+            var msbuildVersionInfo = FileVersionInfo.GetVersionInfo(microsoftBuildPath);
+            var version = Version.Parse(msbuildVersionInfo.ProductVersion);
+
             var builder = ImmutableArray.CreateBuilder<MSBuildInstance>();
             builder.Add(
                 new MSBuildInstance(
                     _options.Name ?? $"Overridden MSBuild from {_options.MSBuildPath}",
                     _options.MSBuildPath,
-                    new Version(99, 0),
+                    version,
                     DiscoveryType.UserOverride,
                     _options.PropertyOverrides?.ToImmutableDictionary()));
             return builder.ToImmutable();