Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change the way to look for the default MSBuild instance #1349

Merged
merged 10 commits into from
Jan 22, 2019
+279 −27
Merged

Change the way to look for the default MSBuild instance #1349

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f57ff28
Add check for dotnet sdk resolvers dll
Nov 27, 2018
ee25164
Merge branch 'master' into fix/1340
johnnyasantoss Dec 5, 2018
e09ba29
Merge branch 'master' into fix/1340
johnnyasantoss Dec 6, 2018
51dae03
Merge branch 'master' into fix/1340
johnnyasantoss Dec 10, 2018
90d43f7
Change the way to find the default instance
Dec 11, 2018
f8e5369
PR fixes
Dec 12, 2018
5434efe
Merge branch 'master' into fix/1340
johnnyasantoss Dec 12, 2018
8c129ec
Code style changes
Dec 12, 2018
cb9f8d2
Make clearer that invalid versions should not be picked
Dec 18, 2018
6e32721
Merge branch 'master' into fix/1340
johnnyasantoss Jan 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/OmniSharp.Host/MSBuild/Discovery/Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Microsoft.Extensions.Logging;
using System.IO;
using Microsoft.Extensions.Logging;

namespace OmniSharp.MSBuild.Discovery
{
Expand All @@ -18,7 +19,9 @@ public static void RegisterDefaultInstance(this IMSBuildLocator msbuildLocator,
else
{
instanceToRegister = instance;
break;

if (instance.HasDotNetSdksResolvers())
johnnyasantoss marked this conversation as resolved.
Show resolved Hide resolved
break;
}
}

Expand All @@ -42,6 +45,19 @@ public static void RegisterDefaultInstance(this IMSBuildLocator msbuildLocator,
}


public static bool HasDotNetSdksResolvers(this MSBuildInstance instance)
{
const string dotnetSdkResolver = "Microsoft.DotNet.MSBuildSdkResolver";
return File.Exists(
Path.Combine(
instance.MSBuildPath,
"SdkResolvers",
dotnetSdkResolver,
dotnetSdkResolver + ".dll"
)
);
}

public static bool IsInvalidVisualStudio(this MSBuildInstance instance)
// MSBuild from Visual Studio 2017 RTM cannot be used.
=> instance.Version.Major == 15
Expand Down