diff --git a/CHANGELOG.md b/CHANGELOG.md
index db87395622..1322be9074 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
# Changelog
All changes to the project will be documented in this file.
+## [1.39.5] - not yet released
+* Update to Roslyn `4.6.0-3.23153.5` (PR:[#2511](https://github.com/OmniSharp/omnisharp-roslyn/pull/2511))
+
## [1.39.4] - 2023-01-18
* Disable snippets in sync completion (PR: [#2497](https://github.com/OmniSharp/omnisharp-roslyn/pull/2497))
diff --git a/build/Packages.props b/build/Packages.props
index 3b3e58d619..1cef69ccd1 100644
--- a/build/Packages.props
+++ b/build/Packages.props
@@ -6,7 +6,7 @@
17.4.1
17.3.1
6.4.0-preview.1.53
- 4.5.0-2.22527.10
+ 4.6.0-3.23153.5
2.4.1
diff --git a/src/OmniSharp.Abstractions/Configuration.cs b/src/OmniSharp.Abstractions/Configuration.cs
index 7c05a8844c..bbf725618c 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 = "4.5.0.0";
+ public const string RoslynVersion = "4.6.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 245d100fff..4db76b59d6 100644
--- a/src/OmniSharp.Http.Driver/app.config
+++ b/src/OmniSharp.Http.Driver/app.config
@@ -7,23 +7,31 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
diff --git a/src/OmniSharp.LanguageServerProtocol/app.config b/src/OmniSharp.LanguageServerProtocol/app.config
index 97f01c3667..cf6a6217d0 100644
--- a/src/OmniSharp.LanguageServerProtocol/app.config
+++ b/src/OmniSharp.LanguageServerProtocol/app.config
@@ -7,23 +7,31 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Refactoring/RunFixAllCodeActionService.cs b/src/OmniSharp.Roslyn.CSharp/Services/Refactoring/RunFixAllCodeActionService.cs
index f04b9a8db9..68999640df 100644
--- a/src/OmniSharp.Roslyn.CSharp/Services/Refactoring/RunFixAllCodeActionService.cs
+++ b/src/OmniSharp.Roslyn.CSharp/Services/Refactoring/RunFixAllCodeActionService.cs
@@ -173,7 +173,7 @@ private async Task FixSpecificDiagnosticIdAsync(Document document, str
document.Project,
codeFixProvider,
roslynScope,
- action.EquivalenceKey,
+ action?.EquivalenceKey,
ImmutableArray.Create(diagnosticId),
_fixAllDiagnosticProvider,
_ => codeActionOptions,
diff --git a/src/OmniSharp.Roslyn/OmniSharpTextLoader.cs b/src/OmniSharp.Roslyn/OmniSharpTextLoader.cs
index bff71242ce..f4a8b2f77f 100644
--- a/src/OmniSharp.Roslyn/OmniSharpTextLoader.cs
+++ b/src/OmniSharp.Roslyn/OmniSharpTextLoader.cs
@@ -26,7 +26,7 @@ public OmniSharpTextLoader(string filePath)
this._filePath = filePath;
}
- public override Task LoadTextAndVersionAsync(Workspace workspace, DocumentId documentId, CancellationToken cancellationToken)
+ public override Task LoadTextAndVersionAsync(LoadTextOptions options, CancellationToken cancellationToken)
{
var prevLastWriteTime = File.GetLastWriteTimeUtc(_filePath);
diff --git a/src/OmniSharp.Roslyn/OmniSharpWorkspace.cs b/src/OmniSharp.Roslyn/OmniSharpWorkspace.cs
index c3be40bc63..075d5de6df 100644
--- a/src/OmniSharp.Roslyn/OmniSharpWorkspace.cs
+++ b/src/OmniSharp.Roslyn/OmniSharpWorkspace.cs
@@ -509,10 +509,7 @@ public DelegatingTextLoader(Document fromDocument)
_fromDocument = fromDocument ?? throw new ArgumentNullException(nameof(fromDocument));
}
- public override async Task LoadTextAndVersionAsync(
- Workspace workspace,
- DocumentId documentId,
- CancellationToken cancellationToken)
+ public override async Task LoadTextAndVersionAsync(LoadTextOptions options, CancellationToken cancellationToken)
{
var sourceText = await _fromDocument.GetTextAsync();
var version = await _fromDocument.GetTextVersionAsync();
diff --git a/src/OmniSharp.Stdio.Driver/app.config b/src/OmniSharp.Stdio.Driver/app.config
index 245d100fff..4db76b59d6 100644
--- a/src/OmniSharp.Stdio.Driver/app.config
+++ b/src/OmniSharp.Stdio.Driver/app.config
@@ -7,23 +7,31 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
diff --git a/tests/OmniSharp.Lsp.Tests/OmnisharpCompletionHandlerFacts.cs b/tests/OmniSharp.Lsp.Tests/OmnisharpCompletionHandlerFacts.cs
index 7d8f0f810d..4d5133dd80 100644
--- a/tests/OmniSharp.Lsp.Tests/OmnisharpCompletionHandlerFacts.cs
+++ b/tests/OmniSharp.Lsp.Tests/OmnisharpCompletionHandlerFacts.cs
@@ -283,7 +283,7 @@ public async Task ImportCompletion_OnLine0(string filename)
await EnableImportCompletion();
var completions = await FindCompletionsWithImportedAsync(filename, input);
- var resolved = await ResolveCompletionAsync(completions.Items.Last(c => c.TextEdit.TextEdit.NewText == "Console"));
+ var resolved = await ResolveCompletionAsync(completions.Items.First(c => c.TextEdit.TextEdit.NewText == "Console"));
Assert.Single(resolved.AdditionalTextEdits);
var additionalEdit = resolved.AdditionalTextEdits.First();
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/CompletionFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/CompletionFacts.cs
index 9d2fc512b9..44d693526a 100644
--- a/tests/OmniSharp.Roslyn.CSharp.Tests/CompletionFacts.cs
+++ b/tests/OmniSharp.Roslyn.CSharp.Tests/CompletionFacts.cs
@@ -299,7 +299,7 @@ public async Task ImportCompletion_OnLine0(string filename, bool useAsyncComplet
using var host = useAsyncCompletion ? GetAsyncCompletionAndImportCompletionHost() : GetImportCompletionHost();
var completions = await FindCompletionsWithImportedAsync(filename, input, host);
- var resolved = await ResolveCompletionAsync(completions.Items.Last(c => c.TextEdit.NewText == "Console"), host);
+ var resolved = await ResolveCompletionAsync(completions.Items.First(c => c.TextEdit.NewText == "Console"), host);
Assert.Single(resolved.Item.AdditionalTextEdits);
var additionalEdit = resolved.Item.AdditionalTextEdits[0];
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/CustomRoslynAnalyzerFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/CustomRoslynAnalyzerFacts.cs
index 922f993c53..83e8be56d4 100644
--- a/tests/OmniSharp.Roslyn.CSharp.Tests/CustomRoslynAnalyzerFacts.cs
+++ b/tests/OmniSharp.Roslyn.CSharp.Tests/CustomRoslynAnalyzerFacts.cs
@@ -42,7 +42,9 @@ public override ImmutableArray GetAnalyzersForAllLanguages()
}
[DiagnosticAnalyzer(LanguageNames.CSharp)]
+#pragma warning disable RS1036 // Specify analyzer banned API enforcement setting
public class TestDiagnosticAnalyzer : DiagnosticAnalyzer
+#pragma warning restore RS1036 // Specify analyzer banned API enforcement setting
{
public TestDiagnosticAnalyzer(string id, bool isEnabledByDefault)
{
diff --git a/tests/app.config b/tests/app.config
index d07754e1d6..53b48f3aa8 100644
--- a/tests/app.config
+++ b/tests/app.config
@@ -7,23 +7,31 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+