Skip to content

Commit 91671d1

Browse files
committed
Update Roslyn version
1 parent 04859f0 commit 91671d1

2 files changed

Lines changed: 9 additions & 26 deletions

File tree

src/OmniSharp.Abstractions/Configuration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ internal static class Configuration
44
{
55
public static bool ZeroBasedIndices = false;
66

7-
public const string RoslynVersion = "5.3.0.0";
7+
public const string RoslynVersion = "5.6.0.0";
88
public const string RoslynPublicKeyToken = "31bf3856ad364e35";
99

1010
public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features");

src/OmniSharp.MSBuild/MSBuildHelpers.cs

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Reflection;
33
using System.Text;
4-
using OmniSharp.Utilities;
54

65
namespace OmniSharp.MSBuild
76
{
@@ -11,15 +10,21 @@ internal static class MSBuildHelpers
1110

1211
private static Type s_BuildEnvironmentHelperType;
1312
private static Type s_BuildEnvironmentType;
14-
private static Type s_VisualStudioLocationHelperType;
1513

1614
static MSBuildHelpers()
1715
{
1816
s_MicrosoftBuildAssembly = Assembly.Load(new AssemblyName("Microsoft.Build"));
1917

2018
s_BuildEnvironmentHelperType = s_MicrosoftBuildAssembly.GetType("Microsoft.Build.Shared.BuildEnvironmentHelper");
2119
s_BuildEnvironmentType = s_MicrosoftBuildAssembly.GetType("Microsoft.Build.Shared.BuildEnvironment");
22-
s_VisualStudioLocationHelperType = s_MicrosoftBuildAssembly.GetType("Microsoft.Build.Shared.VisualStudioLocationHelper");
20+
21+
if (s_BuildEnvironmentHelperType is null)
22+
{
23+
s_MicrosoftBuildAssembly = Assembly.Load(new AssemblyName("Microsoft.Build.Framework"));
24+
25+
s_BuildEnvironmentHelperType = s_MicrosoftBuildAssembly.GetType("Microsoft.Build.Shared.BuildEnvironmentHelper");
26+
s_BuildEnvironmentType = s_MicrosoftBuildAssembly.GetType("Microsoft.Build.Shared.BuildEnvironment");
27+
}
2328
}
2429

2530
public static string GetBuildEnvironmentInfo()
@@ -65,27 +70,5 @@ private static object GetPropertyValue(string name, object instance, Type type,
6570
var propInfo = type.GetProperty(name, bindingFlags);
6671
return propInfo.GetMethod.Invoke(instance, null);
6772
}
68-
69-
public static bool CanInitializeVisualStudioBuildEnvironment()
70-
{
71-
if (!PlatformHelper.IsWindows)
72-
{
73-
return false;
74-
}
75-
76-
// Call Microsoft.Build.Shared.BuildEnvironmentHelper.Initialze(...), which attempts to compute a build environment..
77-
var initializeMethod = s_BuildEnvironmentHelperType.GetMethod("Initialize", BindingFlags.NonPublic | BindingFlags.Static);
78-
var buildEnvironment = initializeMethod.Invoke(null, null);
79-
80-
if (buildEnvironment == null)
81-
{
82-
return false;
83-
}
84-
85-
var mode = GetPropertyValue("Mode", buildEnvironment, s_BuildEnvironmentType, BindingFlags.NonPublic | BindingFlags.Instance);
86-
87-
// return mode?.ToString() == "VisualStudio";
88-
return false;
89-
}
9073
}
9174
}

0 commit comments

Comments
 (0)