Skip to content

Commit 4bcb0d6

Browse files
JoeRobichJoeRobich
authored
Update Roslyn to 4.14.0-3.25168.13 (#2664)
2 parents 9b86af5 + fd3a7e3 commit 4bcb0d6

File tree

9 files changed

+81
-72
lines changed

9 files changed

+81
-72
lines changed

‎Directory.Packages.props

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
66

77
<OmniSharpExtensionsPackageVersion>0.19.9</OmniSharpExtensionsPackageVersion>
8-
<MicrosoftExtensionPackageVersion>8.0.0</MicrosoftExtensionPackageVersion>
8+
<MicrosoftExtensionPackageVersion>9.0.0</MicrosoftExtensionPackageVersion>
9+
<MicrosoftBaseCommonLibraryVersion>9.0.0</MicrosoftBaseCommonLibraryVersion>
910
<MicrosoftTestPackageVersion>17.8.0</MicrosoftTestPackageVersion>
1011
<MSBuildPackageVersion>17.3.2</MSBuildPackageVersion>
11-
<NuGetPackageVersion>6.13.0-rc.95</NuGetPackageVersion>
12-
<RoslynPackageVersion>4.13.0-3.24620.4</RoslynPackageVersion>
12+
<NuGetPackageVersion>6.14.0-preview.1.45</NuGetPackageVersion>
13+
<RoslynPackageVersion>4.14.0-3.25168.13</RoslynPackageVersion>
1314
<XunitPackageVersion>2.6.1</XunitPackageVersion>
1415
</PropertyGroup>
1516

@@ -43,7 +44,7 @@
4344
<PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp" Version="$(RoslynPackageVersion)" />
4445
<PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp" Version="$(RoslynPackageVersion)" />
4546

46-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
47+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionPackageVersion)" />
4748
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionPackageVersion)" />
4849
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionPackageVersion)" />
4950
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionPackageVersion)" />
@@ -55,7 +56,7 @@
5556
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionPackageVersion)" />
5657
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionPackageVersion)" />
5758
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionPackageVersion)" />
58-
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
59+
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionPackageVersion)" />
5960
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionPackageVersion)" />
6061

6162
<PackageVersion Include="Microsoft.Build.Locator" Version="1.6.10" />
@@ -82,14 +83,14 @@
8283

8384
<PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.1.8" />
8485

85-
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
86-
<PackageVersion Include="System.ComponentModel.Composition" Version="8.0.0" />
87-
<PackageVersion Include="System.Composition" Version="8.0.0" />
88-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
86+
<PackageVersion Include="System.Collections.Immutable" Version="$(MicrosoftBaseCommonLibraryVersion)" />
87+
<PackageVersion Include="System.ComponentModel.Composition" Version="$(MicrosoftBaseCommonLibraryVersion)" />
88+
<PackageVersion Include="System.Composition" Version="$(MicrosoftBaseCommonLibraryVersion)" />
89+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(MicrosoftBaseCommonLibraryVersion)" />
8990
<PackageVersion Include="System.Memory" Version="4.5.5" />
90-
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
91-
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
92-
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
91+
<PackageVersion Include="System.Reflection.Metadata" Version="$(MicrosoftBaseCommonLibraryVersion)" />
92+
<PackageVersion Include="System.Text.Json" Version="$(MicrosoftBaseCommonLibraryVersion)" />
93+
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="$(MicrosoftBaseCommonLibraryVersion)" />
9394
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
9495

9596
<PackageVersion Include="System.Reactive" Version="6.0.0" />

‎build/Settings.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

44
<PropertyGroup>
5-
<LangVersion>12.0</LangVersion>
5+
<LangVersion>Preview</LangVersion>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
88
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
99
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
10+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
1011
<NoWarn>NU1701;NU5104</NoWarn>
1112
<IsPackable>false</IsPackable>
1213
<Authors>OmniSharp Contributors</Authors>

‎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 = "4.13.0.0";
7+
public const string RoslynVersion = "4.14.0.0";
88
public const string RoslynPublicKeyToken = "31bf3856ad364e35";
99

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

‎tests/OmniSharp.Cake.Tests/CodeActionsV2Facts.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public void Whatever()
6969
("System.Text.RegularExpressions.Regex", CodeActionKind.QuickFix),
7070
("Extract method", CodeActionKind.RefactorExtract),
7171
("Extract local function", CodeActionKind.RefactorExtract),
72+
("Use expression body for method", CodeActionKind.Refactor),
7273
("Introduce local for 'Regex.Match(\"foo\", \"bar\")'", CodeActionKind.Refactor),
7374
("Introduce parameter for 'Regex.Match(\"foo\", \"bar\")' -> and update call sites directly", CodeActionKind.Refactor),
7475
("Introduce parameter for 'Regex.Match(\"foo\", \"bar\")' -> into extracted method to invoke at call sites", CodeActionKind.Refactor),

‎tests/OmniSharp.Lsp.Tests/OmniSharpCodeActionHandlerFacts.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ public void Whatever()
146146
"Generate type 'Console' -> Generate nested class 'Console'",
147147
"Extract local function",
148148
"Extract method",
149+
"Use expression body for method",
149150
"Introduce local for 'Console.Write(\"should be using System;\")'"
150151
}
151152
: new List<string>
@@ -168,6 +169,7 @@ public void Whatever()
168169
"Generate type 'Console' -> Generate nested class 'Console'",
169170
"Extract local function",
170171
"Extract method",
172+
"Use expression body for method",
171173
"Introduce local for 'Console.Write(\"should be using System;\")'"
172174
};
173175

‎tests/OmniSharp.Lsp.Tests/OmnisharpCompletionHandlerFacts.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ public static void Test(this object o)
339339

340340
[Theory]
341341
[InlineData("dummy.cs")]
342-
[InlineData("dummy.csx")]
342+
// [InlineData("dummy.csx")] - Skipping for being flaky
343343
public async Task UsingsAddedInOrder(string filename)
344344
{
345345

@@ -944,8 +944,8 @@ public class Derived : Base
944944
Assert.Equal(4, item.TextEdit.TextEdit.Range.Start.Character);
945945
Assert.Equal(8, item.TextEdit.TextEdit.Range.End.Line);
946946
Assert.Equal(13, item.TextEdit.TextEdit.Range.End.Character);
947-
Assert.Equal("public override string Prop => throw new NotImplementedException();", item.TextEdit.TextEdit.NewText);
948-
Assert.Equal(InsertTextFormat.PlainText, item.InsertTextFormat);
947+
Assert.Equal("public override string Prop => throw new NotImplementedException()$0;", item.TextEdit.TextEdit.NewText);
948+
Assert.Equal(InsertTextFormat.Snippet, item.InsertTextFormat);
949949
Assert.Equal("override Prop", item.FilterText);
950950
}
951951

‎tests/OmniSharp.Roslyn.CSharp.Tests/CodeActionsV2Facts.cs

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -124,50 +124,54 @@ public void Whatever()
124124

125125
var refactorings = await FindRefactoringNamesAsync(code, roslynAnalyzersEnabled);
126126

127-
var expected = roslynAnalyzersEnabled ? new List<(string Name, string CodeActionKind)>
128-
{
129-
("Fix formatting", CodeActionKind.QuickFix),
130-
("using System;", CodeActionKind.QuickFix),
127+
var expected = roslynAnalyzersEnabled
128+
? new List<(string Name, string CodeActionKind)>
129+
{
130+
("Fix formatting", CodeActionKind.QuickFix),
131+
("using System;", CodeActionKind.QuickFix),
131132
#if NETCOREAPP
132-
("using Internal;", CodeActionKind.QuickFix),
133-
("Fully qualify 'Console' -> Internal.Console", CodeActionKind.QuickFix),
134-
("Fully qualify 'Console' -> System.Console", CodeActionKind.QuickFix),
133+
("using Internal;", CodeActionKind.QuickFix),
134+
("Fully qualify 'Console' -> Internal.Console", CodeActionKind.QuickFix),
135+
("Fully qualify 'Console' -> System.Console", CodeActionKind.QuickFix),
135136
#else
136-
("System.Console", CodeActionKind.QuickFix),
137+
("System.Console", CodeActionKind.QuickFix),
137138
#endif
138-
("Generate variable 'Console' -> Generate property 'Console'", CodeActionKind.QuickFix),
139-
("Generate variable 'Console' -> Generate field 'Console'", CodeActionKind.QuickFix),
140-
("Generate variable 'Console' -> Generate read-only field 'Console'", CodeActionKind.QuickFix),
141-
("Generate variable 'Console' -> Generate local 'Console'", CodeActionKind.QuickFix),
142-
("Generate variable 'Console' -> Generate parameter 'Console'", CodeActionKind.QuickFix),
143-
("Generate type 'Console' -> Generate class 'Console' in new file", CodeActionKind.QuickFix),
144-
("Generate type 'Console' -> Generate class 'Console'", CodeActionKind.QuickFix),
145-
("Generate type 'Console' -> Generate nested class 'Console'", CodeActionKind.QuickFix),
146-
("Extract local function", CodeActionKind.RefactorExtract),
147-
("Extract method", CodeActionKind.RefactorExtract),
148-
("Introduce local for 'Console.Write(\"should be using System;\")'", CodeActionKind.Refactor)
149-
} : new List<(string Name, string CodeActionKind)>
150-
{
151-
("using System;", CodeActionKind.QuickFix),
139+
("Generate variable 'Console' -> Generate property 'Console'", CodeActionKind.QuickFix),
140+
("Generate variable 'Console' -> Generate field 'Console'", CodeActionKind.QuickFix),
141+
("Generate variable 'Console' -> Generate read-only field 'Console'", CodeActionKind.QuickFix),
142+
("Generate variable 'Console' -> Generate local 'Console'", CodeActionKind.QuickFix),
143+
("Generate variable 'Console' -> Generate parameter 'Console'", CodeActionKind.QuickFix),
144+
("Generate type 'Console' -> Generate class 'Console' in new file", CodeActionKind.QuickFix),
145+
("Generate type 'Console' -> Generate class 'Console'", CodeActionKind.QuickFix),
146+
("Generate type 'Console' -> Generate nested class 'Console'", CodeActionKind.QuickFix),
147+
("Extract local function", CodeActionKind.RefactorExtract),
148+
("Extract method", CodeActionKind.RefactorExtract),
149+
("Use expression body for method", CodeActionKind.Refactor),
150+
("Introduce local for 'Console.Write(\"should be using System;\")'", CodeActionKind.Refactor)
151+
}
152+
: new List<(string Name, string CodeActionKind)>
153+
{
154+
("using System;", CodeActionKind.QuickFix),
152155
#if NETCOREAPP
153-
("using Internal;", CodeActionKind.QuickFix),
154-
("Fully qualify 'Console' -> Internal.Console", CodeActionKind.QuickFix),
155-
("Fully qualify 'Console' -> System.Console", CodeActionKind.QuickFix),
156+
("using Internal;", CodeActionKind.QuickFix),
157+
("Fully qualify 'Console' -> Internal.Console", CodeActionKind.QuickFix),
158+
("Fully qualify 'Console' -> System.Console", CodeActionKind.QuickFix),
156159
#else
157-
("System.Console", CodeActionKind.QuickFix),
160+
("System.Console", CodeActionKind.QuickFix),
158161
#endif
159-
("Generate variable 'Console' -> Generate property 'Console'", CodeActionKind.QuickFix),
160-
("Generate variable 'Console' -> Generate field 'Console'", CodeActionKind.QuickFix),
161-
("Generate variable 'Console' -> Generate read-only field 'Console'", CodeActionKind.QuickFix),
162-
("Generate variable 'Console' -> Generate local 'Console'", CodeActionKind.QuickFix),
163-
("Generate variable 'Console' -> Generate parameter 'Console'", CodeActionKind.QuickFix),
164-
("Generate type 'Console' -> Generate class 'Console' in new file", CodeActionKind.QuickFix),
165-
("Generate type 'Console' -> Generate class 'Console'", CodeActionKind.QuickFix),
166-
("Generate type 'Console' -> Generate nested class 'Console'", CodeActionKind.QuickFix),
167-
("Extract local function", CodeActionKind.RefactorExtract),
168-
("Extract method", CodeActionKind.RefactorExtract),
169-
("Introduce local for 'Console.Write(\"should be using System;\")'", CodeActionKind.Refactor)
170-
};
162+
("Generate variable 'Console' -> Generate property 'Console'", CodeActionKind.QuickFix),
163+
("Generate variable 'Console' -> Generate field 'Console'", CodeActionKind.QuickFix),
164+
("Generate variable 'Console' -> Generate read-only field 'Console'", CodeActionKind.QuickFix),
165+
("Generate variable 'Console' -> Generate local 'Console'", CodeActionKind.QuickFix),
166+
("Generate variable 'Console' -> Generate parameter 'Console'", CodeActionKind.QuickFix),
167+
("Generate type 'Console' -> Generate class 'Console' in new file", CodeActionKind.QuickFix),
168+
("Generate type 'Console' -> Generate class 'Console'", CodeActionKind.QuickFix),
169+
("Generate type 'Console' -> Generate nested class 'Console'", CodeActionKind.QuickFix),
170+
("Extract local function", CodeActionKind.RefactorExtract),
171+
("Extract method", CodeActionKind.RefactorExtract),
172+
("Use expression body for method", CodeActionKind.Refactor),
173+
("Introduce local for 'Console.Write(\"should be using System;\")'", CodeActionKind.Refactor)
174+
};
171175
AssertEx.Equal(expected.OrderBy(x => x.Name), refactorings.OrderBy(x => x.Name));
172176
}
173177

‎tests/OmniSharp.Roslyn.CSharp.Tests/CompletionFacts.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,8 +1358,8 @@ public class Derived : Base
13581358
Assert.Equal(4, item.TextEdit.StartColumn);
13591359
Assert.Equal(8, item.TextEdit.EndLine);
13601360
Assert.Equal(13, item.TextEdit.EndColumn);
1361-
Assert.Equal("public override string Prop => throw new NotImplementedException();", item.TextEdit.NewText);
1362-
Assert.Equal(InsertTextFormat.PlainText, item.InsertTextFormat);
1361+
Assert.Equal("public override string Prop => throw new NotImplementedException()$0;", item.TextEdit.NewText);
1362+
Assert.Equal(InsertTextFormat.Snippet, item.InsertTextFormat);
13631363
Assert.Equal("override Prop", item.FilterText);
13641364
}
13651365

@@ -2219,20 +2219,20 @@ public static void Main()
22192219
[InlineData("dummy.csx")]
22202220
public async Task TestOverrideWithTrailingWhitespacePrior(string filename)
22212221
{
2222-
const string input = @"
2223-
namespace N
2224-
{
2225-
internal class C
2226-
{
2227-
// The trailing tabs on the previous line and the next line are integral to this bug
2228-
2229-
override $$
2230-
public C()
2231-
{
2232-
}
2233-
}
2234-
}
2235-
";
2222+
string input = $$"""
2223+
namespace N
2224+
{
2225+
internal class C
2226+
{{{'\t'}}
2227+
// The trailing tabs on the previous line and the next line are integral to this bug
2228+
{{'\t'}}
2229+
override $$
2230+
public C()
2231+
{
2232+
}
2233+
}
2234+
}
2235+
""";
22362236

22372237
var completions = await FindCompletionsAsync(filename, input, SharedOmniSharpTestHost);
22382238

‎tests/OmniSharp.Roslyn.CSharp.Tests/FindReferencesFacts.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ public class Foo
549549
Assert.Null(exception);
550550
}
551551

552-
[Fact]
552+
[Fact(Skip = "Need Roslyn EA for the TestGeneratorReference")]
553553
public async Task ReturnsGeneratedReferences()
554554
{
555555
const string Source = @"

0 commit comments

Comments
 (0)