Update Roslyn for Preview 7

CHANGELOG.md

@@ -27,7 +27,7 @@ All changes to the project will be documented in this file.
     }
     ```
 * Fixed a regression on declaration name completion (PR: [#1520](https://github.com/OmniSharp/omnisharp-roslyn/pull/1520))
-* Update to Roslyn `3.2.0-beta4-19319-04` (PR: [#1527](https://github.com/OmniSharp/omnisharp-roslyn/pull/1527))
+* Update to Roslyn `3.2.0-beta4-19326-12` (PR: [#1534](https://github.com/OmniSharp/omnisharp-roslyn/pull/1534))
 * Added snippets support in LSP mode (PR: [#1422](https://github.com/OmniSharp/omnisharp-roslyn/pull/1422))
 * Fixed renaming in LSP mode (PR: [#1423](https://github.com/OmniSharp/omnisharp-roslyn/pull/1423))
 

build.cake

@@ -607,14 +607,7 @@ Task("Build")
 {
     try
     {
-        if (Platform.Current.IsWindows)
-        {
-            BuildWithDotNetCli(env, configuration);
-        }
-        else
-        {
-            BuildWithMSBuild(env, configuration);
-        }
+        BuildWithDotNetCli(env, configuration);
     }
     catch
     {

build/Packages.props

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <MSBuildPackageVersion>16.0.461</MSBuildPackageVersion>
     <NuGetPackageVersion>5.0.0</NuGetPackageVersion>
-    <RoslynPackageVersion>3.2.0-beta4-19319-04</RoslynPackageVersion>
+    <RoslynPackageVersion>3.2.0-beta4-19326-12</RoslynPackageVersion>
     <XunitPackageVersion>2.4.0</XunitPackageVersion>
   </PropertyGroup>
 

src/OmniSharp.Roslyn.CSharp/Services/Formatting/EditorConfig/EditorConfigOptionsApplier.cs

@@ -76,7 +76,7 @@ internal static (IOption, OptionStorageLocation, MethodInfo) GetOptionWithStorag
                 ? option.StorageLocations.FirstOrDefault(IsEditorConfigStorage)
                 : null;
 
-            var tryGetOptionMethod = editorConfigStorage?.GetType().GetMethod("TryGetOption");
+            var tryGetOptionMethod = editorConfigStorage?.GetType().GetMethod("TryGetOption", new[] { typeof(IReadOnlyDictionary<string, string>), typeof(Type), typeof(object).MakeByRefType() });
             return (option, editorConfigStorage, tryGetOptionMethod);
         }
 
@@ -89,10 +89,10 @@ internal static bool TryGetConventionValue((IOption, OptionStorageLocation, Meth
             var (option, editorConfigStorage, tryGetOptionMethod) = optionWithStorage;
             value = null;
 
-            var args = new object[] { option, adjustedConventions, option.Type, value };
+            var args = new object[] { adjustedConventions, option.Type, value };
 
             var isOptionPresent = (bool)tryGetOptionMethod.Invoke(editorConfigStorage, args);
-            value = args[3];
+            value = args[2];
 
             return isOptionPresent;
         }

src/OmniSharp.Roslyn.CSharp/Workers/Intellisense/SnippetGenerator.cs

@@ -73,7 +73,7 @@ private void RenderMethodSymbol(IMethodSymbol methodSymbol)
                     _sb.Append(arg);
                     RenderSnippetEndMarker();
 
-                    if (arg != last)
+                    if (!Equals(arg, last))
                     {
                         _sb.Append(", ");
                     }
@@ -107,7 +107,7 @@ private void RenderParameters(IMethodSymbol methodSymbol)
                     _sb.Append(parameter.ToDisplayString(_format));
                     RenderSnippetEndMarker();
 
-                    if (parameter != last)
+                    if (!Equals(parameter, last))
                     {
                         _sb.Append(", ");
                     }
@@ -127,7 +127,7 @@ private IEnumerable<ISymbol> NonInferredTypeArguments(IMethodSymbol methodSymbol
             {
                 var arg = typeArguments[i];
                 var param = typeParameters[i];
-                if (arg == param)
+                if (Equals(arg, param))
                 {
                     // this type parameter has not been resolved
                     nonInferredTypeArguments.Add(arg);

src/OmniSharp.Roslyn/Extensions/SymbolExtensions.cs

@@ -207,7 +207,7 @@ internal static INamedTypeSymbol GetTopLevelContainingNamedType(this ISymbol sym
         {
             // Traverse up until we find a named type that is parented by the namespace
             var topLevelNamedType = symbol;
-            while (topLevelNamedType.ContainingSymbol != symbol.ContainingNamespace ||
+            while (!Equals(topLevelNamedType.ContainingSymbol, symbol.ContainingNamespace) ||
                 topLevelNamedType.Kind != SymbolKind.NamedType)
             {
                 topLevelNamedType = topLevelNamedType.ContainingSymbol;

tests/OmniSharp.Roslyn.CSharp.Tests/CustomRoslynAnalyzerFacts.cs

@@ -71,6 +71,8 @@ public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
 
             public override void Initialize(AnalysisContext context)
             {
+                context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
+                context.EnableConcurrentExecution();
                 context.RegisterSymbolAction(AnalyzeSymbol, SymbolKind.NamedType);
             }