diff --git a/CHANGELOG.md b/CHANGELOG.md
index f96cff4497..6daa20bb07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All changes to the project will be documented in this file.
* Added support for `WarningsNotAsErrors` in csproj files ([#1681](https://github.com/OmniSharp/omnisharp-roslyn/issues/1681), PR: [#1784](https://github.com/OmniSharp/omnisharp-roslyn/pull/1784))
* Improved MSBuild scoring system ([#1783](https://github.com/OmniSharp/omnisharp-roslyn/issues/1783), PR: [#1797](https://github.com/OmniSharp/omnisharp-roslyn/pull/1797))
* Updated OmniSharp.Extensions.LanguageServer to `0.14.2` to fix synchronisation (PR: [#1791](https://github.com/OmniSharp/omnisharp-roslyn/pull/1791))
+* Update to Roslyn `3.7.0-2.20269.10` (PR:[#1804](https://github.com/OmniSharp/omnisharp-roslyn/pull/1804))
## [1.35.1] - 2020-05-04
* Fixed not supported exception when trying to decompile a BCL assembly on Mono. For now we do not try to resolve implementation assembly from a ref assembly (PR: [#1767](https://github.com/OmniSharp/omnisharp-roslyn/pull/1767))
diff --git a/build/Packages.props b/build/Packages.props
index 9fc3372b39..69f25056a0 100644
--- a/build/Packages.props
+++ b/build/Packages.props
@@ -5,7 +5,7 @@
16.5.0
5.2.0
- 3.6.0-4.20228.5
+ 3.7.0-2.20269.10
2.4.0
diff --git a/src/OmniSharp.Abstractions/Configuration.cs b/src/OmniSharp.Abstractions/Configuration.cs
index 228ab121e1..c56a7fffa3 100644
--- a/src/OmniSharp.Abstractions/Configuration.cs
+++ b/src/OmniSharp.Abstractions/Configuration.cs
@@ -4,7 +4,7 @@ internal static class Configuration
{
public static bool ZeroBasedIndices = false;
- public const string RoslynVersion = "3.6.0.0";
+ public const string RoslynVersion = "3.7.0.0";
public const string RoslynPublicKeyToken = "31bf3856ad364e35";
public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features");
diff --git a/src/OmniSharp.Http.Driver/app.config b/src/OmniSharp.Http.Driver/app.config
index f32d6fd390..c05782a564 100644
--- a/src/OmniSharp.Http.Driver/app.config
+++ b/src/OmniSharp.Http.Driver/app.config
@@ -7,15 +7,15 @@
-
+
-
+
-
+
@@ -34,7 +34,7 @@
-
+
diff --git a/src/OmniSharp.Roslyn/MetadataExternalSourceService.cs b/src/OmniSharp.Roslyn/MetadataExternalSourceService.cs
index be7aefc00e..a99ac95812 100644
--- a/src/OmniSharp.Roslyn/MetadataExternalSourceService.cs
+++ b/src/OmniSharp.Roslyn/MetadataExternalSourceService.cs
@@ -56,7 +56,7 @@ public MetadataExternalSourceService(IAssemblyLoader loader) : base(loader)
var topLevelSymbol = symbol.GetTopLevelContainingNamedType();
var temporaryDocument = metadataProject.AddDocument(fileName, string.Empty);
- var service = _csharpMetadataAsSourceService.CreateInstance(temporaryDocument.Project.LanguageServices);
+ var service = _csharpMetadataAsSourceService.CreateInstance();
var method = _csharpMetadataAsSourceService.GetMethod(AddSourceToAsync);
var documentTask = method.Invoke>(service, new object[] { temporaryDocument, await metadataProject.GetCompilationAsync(), topLevelSymbol, cancellationToken });
diff --git a/src/OmniSharp.Shared/Utilities/ReflectionExtensions.cs b/src/OmniSharp.Shared/Utilities/ReflectionExtensions.cs
index 024193b959..47fd31ff7c 100644
--- a/src/OmniSharp.Shared/Utilities/ReflectionExtensions.cs
+++ b/src/OmniSharp.Shared/Utilities/ReflectionExtensions.cs
@@ -110,7 +110,12 @@ public static object CreateInstance(this Lazy lazyType, params object[] ar
throw new ArgumentNullException(nameof(lazyType));
}
- return Activator.CreateInstance(lazyType.Value, args);
+ return Activator.CreateInstance(
+ lazyType.Value,
+ BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance,
+ binder: null,
+ args,
+ culture: null);
}
public static T CreateInstance(this Type type) where T : class
@@ -173,7 +178,7 @@ public static T InvokeStatic(this Lazy lazyType, string methodName, obj
}
return method.InvokeStatic(args);
- }
+ }
public static T InvokeStatic(this Lazy lazyMethodInfo, object[] args)
{
diff --git a/src/OmniSharp.Stdio.Driver/app.config b/src/OmniSharp.Stdio.Driver/app.config
index f32d6fd390..c05782a564 100644
--- a/src/OmniSharp.Stdio.Driver/app.config
+++ b/src/OmniSharp.Stdio.Driver/app.config
@@ -7,15 +7,15 @@
-
+
-
+
-
+
@@ -34,7 +34,7 @@
-
+
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/EditorConfigFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/EditorConfigFacts.cs
index c1370b5dc5..ac0722888c 100644
--- a/tests/OmniSharp.Roslyn.CSharp.Tests/EditorConfigFacts.cs
+++ b/tests/OmniSharp.Roslyn.CSharp.Tests/EditorConfigFacts.cs
@@ -282,7 +282,7 @@ public Foo(string som$$ething)
var getResponse = await getRequestHandler.Handle(getRequest);
Assert.NotNull(getResponse.CodeActions);
- Assert.Contains(getResponse.CodeActions, f => f.Name == "Create and initialize field 'xxx_something'");
+ Assert.Contains(getResponse.CodeActions, f => f.Name == "Create and assign field 'xxx_something'");
}
}
@@ -324,7 +324,7 @@ public Foo(string something)
Line = point.Line,
Column = point.Offset,
FileName = testFile.FileName,
- Identifier = "Create and initialize field 'xxx_something'",
+ Identifier = "Create and assign field 'xxx_something'",
WantsTextChanges = false,
WantsAllCodeActionOperations = true,
Buffer = testFile.Content.Code
diff --git a/tests/app.config b/tests/app.config
index 6f6c733fe9..bad493b48d 100644
--- a/tests/app.config
+++ b/tests/app.config
@@ -7,15 +7,15 @@
-
+
-
+
-
+