diff --git a/NuGet.Config b/NuGet.Config
index 9c189cf33e..37da301375 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -5,6 +5,5 @@
-
diff --git a/build/Packages.props b/build/Packages.props
index 69f86e17c7..74f2b70627 100644
--- a/build/Packages.props
+++ b/build/Packages.props
@@ -45,8 +45,8 @@
1.0.31
4.6.0
4.3.0
- 2.3.0-beta4-build3722
- 2.3.0-beta4-build3722
+ 2.3.0-rc1-build3809
+ 2.3.0-rc1-build3809
diff --git a/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs b/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs
index 463abba4e6..5bb839a662 100644
--- a/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs
+++ b/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs
@@ -63,7 +63,7 @@ public async Task RunXunitTestWithSimilarName()
testFramework: "xunit",
shouldPass: true);
- Assert.Equal(1, response.Results.Length);
+ Assert.Single(response.Results);
}
[Fact]
diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectFileInfoTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectFileInfoTests.cs
index 3c3367b7aa..a551bf96e5 100644
--- a/tests/OmniSharp.MSBuild.Tests/ProjectFileInfoTests.cs
+++ b/tests/OmniSharp.MSBuild.Tests/ProjectFileInfoTests.cs
@@ -47,7 +47,7 @@ public async Task HelloWorld_has_correct_property_values()
Assert.NotNull(projectFileInfo);
Assert.Equal(projectFilePath, projectFileInfo.FilePath);
- Assert.Equal(1, projectFileInfo.TargetFrameworks.Length);
+ Assert.Single(projectFileInfo.TargetFrameworks);
Assert.Equal("netcoreapp1.0", projectFileInfo.TargetFrameworks[0]);
Assert.Equal("bin/Debug/netcoreapp1.0/", projectFileInfo.OutputPath.Replace('\\', '/'));
Assert.Equal(3, projectFileInfo.SourceFiles.Length); // Program.cs, AssemblyInfo.cs, AssemblyAttributes.cs
@@ -67,7 +67,7 @@ public async Task HelloWorldSlim_has_correct_property_values()
Assert.NotNull(projectFileInfo);
Assert.Equal(projectFilePath, projectFileInfo.FilePath);
- Assert.Equal(1, projectFileInfo.TargetFrameworks.Length);
+ Assert.Single(projectFileInfo.TargetFrameworks);
Assert.Equal("netcoreapp1.0", projectFileInfo.TargetFrameworks[0]);
Assert.Equal("bin/Debug/netcoreapp1.0/", projectFileInfo.OutputPath.Replace('\\', '/'));
Assert.Equal(3, projectFileInfo.SourceFiles.Length); // Program.cs, AssemblyInfo.cs, AssemblyAttributes.cs
diff --git a/tests/OmniSharp.MSBuild.Tests/SolutionParsingTests.cs b/tests/OmniSharp.MSBuild.Tests/SolutionParsingTests.cs
index 59e8f98347..8d95aaeb9a 100644
--- a/tests/OmniSharp.MSBuild.Tests/SolutionParsingTests.cs
+++ b/tests/OmniSharp.MSBuild.Tests/SolutionParsingTests.cs
@@ -212,7 +212,7 @@ public void SolutionFile_Parse_simple_solution_with_different_spacing()
Assert.Null(solution.VisualStudioVersion);
- Assert.Equal(1, solution.Projects.Length);
+ Assert.Single(solution.Projects);
Assert.Equal("{ Project GUID}", solution.Projects[0].ProjectTypeGuid);
Assert.Equal("Project name", solution.Projects[0].ProjectName);
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/BufferManagerFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/BufferManagerFacts.cs
index 8d7a165fcc..ff1bc90030 100644
--- a/tests/OmniSharp.Roslyn.CSharp.Tests/BufferManagerFacts.cs
+++ b/tests/OmniSharp.Roslyn.CSharp.Tests/BufferManagerFacts.cs
@@ -25,18 +25,18 @@ public async Task UpdateBufferIgnoresVoidRequests()
using (var host = CreateOmniSharpHost(new TestFile("test.cs", "class C {}")))
{
Assert.Equal(2, host.Workspace.CurrentSolution.Projects.Count());
- Assert.Equal(1, host.Workspace.CurrentSolution.Projects.ElementAt(0).Documents.Count());
- Assert.Equal(1, host.Workspace.CurrentSolution.Projects.ElementAt(1).Documents.Count());
+ Assert.Single(host.Workspace.CurrentSolution.Projects.ElementAt(0).Documents);
+ Assert.Single(host.Workspace.CurrentSolution.Projects.ElementAt(1).Documents);
await host.Workspace.BufferManager.UpdateBufferAsync(new Request() { });
Assert.Equal(2, host.Workspace.CurrentSolution.Projects.Count());
- Assert.Equal(1, host.Workspace.CurrentSolution.Projects.ElementAt(0).Documents.Count());
- Assert.Equal(1, host.Workspace.CurrentSolution.Projects.ElementAt(1).Documents.Count());
+ Assert.Single(host.Workspace.CurrentSolution.Projects.ElementAt(0).Documents);
+ Assert.Single(host.Workspace.CurrentSolution.Projects.ElementAt(1).Documents);
await host.Workspace.BufferManager.UpdateBufferAsync(new Request() { FileName = "", Buffer = "enum E {}" });
Assert.Equal(2, host.Workspace.CurrentSolution.Projects.Count());
- Assert.Equal(1, host.Workspace.CurrentSolution.Projects.ElementAt(0).Documents.Count());
- Assert.Equal(1, host.Workspace.CurrentSolution.Projects.ElementAt(1).Documents.Count());
+ Assert.Single(host.Workspace.CurrentSolution.Projects.ElementAt(0).Documents);
+ Assert.Single(host.Workspace.CurrentSolution.Projects.ElementAt(1).Documents);
}
}
@@ -47,7 +47,7 @@ public async Task UpdateBufferIgnoresFilePathsThatDontMatchAProjectPath()
await workspace.BufferManager.UpdateBufferAsync(new Request() { FileName = Path.Combine("some", " path.cs"), Buffer = "enum E {}" });
var documents = workspace.GetDocuments(Path.Combine("some", "path.cs"));
- Assert.Equal(0, documents.Count());
+ Assert.Empty(documents);
}
[Fact]
@@ -110,13 +110,13 @@ public async Task UpdateBufferFindsProjectBasedOnNearestPath()
await workspace.BufferManager.UpdateBufferAsync(new Request() { FileName = Path.Combine("src", "root", "bar.cs"), Buffer = "enum E {}" });
var documents = workspace.GetDocuments(Path.Combine("src", "root", "bar.cs"));
- Assert.Equal(1, documents.Count());
+ Assert.Single(documents);
Assert.Equal(Path.Combine("src", "root", "foo.csproj"), documents.ElementAt(0).Project.FilePath);
Assert.Equal(2, documents.ElementAt(0).Project.Documents.Count());
await workspace.BufferManager.UpdateBufferAsync(new Request() { FileName = Path.Combine("src", "root", "foo", "bar", "nested", "paths", "dance.cs"), Buffer = "enum E {}" });
documents = workspace.GetDocuments(Path.Combine("src", "root", "foo", "bar", "nested", "paths", "dance.cs"));
- Assert.Equal(1, documents.Count());
+ Assert.Single(documents);
Assert.Equal(Path.Combine("src", "root", "foo", "bar", "insane.csproj"), documents.ElementAt(0).Project.FilePath);
Assert.Equal(2, documents.ElementAt(0).Project.Documents.Count());
}
@@ -177,7 +177,7 @@ private static OmniSharpWorkspace GetWorkspaceWithProjects()
Assert.Equal(4, workspace.CurrentSolution.Projects.Count());
foreach (var project in workspace.CurrentSolution.Projects)
{
- Assert.Equal(1, project.Documents.Count());
+ Assert.Single(project.Documents);
}
return workspace;
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/DiagnosticsFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/DiagnosticsFacts.cs
index d68f9ca381..044067f4f6 100644
--- a/tests/OmniSharp.Roslyn.CSharp.Tests/DiagnosticsFacts.cs
+++ b/tests/OmniSharp.Roslyn.CSharp.Tests/DiagnosticsFacts.cs
@@ -27,7 +27,7 @@ public async Task CodeCheckSpecifiedFileOnly()
var requestHandler = GetRequestHandler(host);
var quickFixes = await requestHandler.Handle(new CodeCheckRequest() { FileName = "a.cs" });
- Assert.Equal(1, quickFixes.QuickFixes.Count());
+ Assert.Single(quickFixes.QuickFixes);
Assert.Equal("a.cs", quickFixes.QuickFixes.First().FileName);
}
}
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/DiagnosticsV2Facts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/DiagnosticsV2Facts.cs
index ff34b4ea6f..9b20adcee0 100644
--- a/tests/OmniSharp.Roslyn.CSharp.Tests/DiagnosticsV2Facts.cs
+++ b/tests/OmniSharp.Roslyn.CSharp.Tests/DiagnosticsV2Facts.cs
@@ -38,11 +38,11 @@ public async Task CodeCheckSpecifiedFileOnly(string filename)
await emitter.Emitted;
- Assert.Equal(1, messages.Count);
+ Assert.Single(messages);
var message = messages.First();
- Assert.Equal(1, message.Results.Count());
+ Assert.Single(message.Results);
var result = message.Results.First();
- Assert.Equal(1, result.QuickFixes.Count());
+ Assert.Single(result.QuickFixes);
Assert.Equal(filename, result.FileName);
}
}
@@ -67,16 +67,16 @@ public async Task CheckAllFiles(string filename1, string filename2)
await emitter.Emitted;
- Assert.Equal(1, messages.Count);
+ Assert.Single(messages);
var message = messages.First();
Assert.Equal(2, message.Results.Count());
var a = message.Results.First(x => x.FileName == filename1);
- Assert.Equal(1, a.QuickFixes.Count());
+ Assert.Single(a.QuickFixes);
Assert.Equal(filename1, a.FileName);
var b = message.Results.First(x => x.FileName == filename2);
- Assert.Equal(1, b.QuickFixes.Count());
+ Assert.Single(b.QuickFixes);
Assert.Equal(filename2, b.FileName);
}
}
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/FindReferencesFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/FindReferencesFacts.cs
index 689960c4ec..d266aebea0 100644
--- a/tests/OmniSharp.Roslyn.CSharp.Tests/FindReferencesFacts.cs
+++ b/tests/OmniSharp.Roslyn.CSharp.Tests/FindReferencesFacts.cs
@@ -134,7 +134,7 @@ public FooConsumer()
}";
var usages = await FindUsagesAsync(code, excludeDefinition: true);
- Assert.Equal(1, usages.QuickFixes.Count());
+ Assert.Single(usages.QuickFixes);
}
[Fact]
@@ -224,7 +224,7 @@ public Foo Clone() {
};
var usages = await FindUsagesAsync(testFiles, onlyThisFile: true);
- Assert.Equal(1, usages.QuickFixes.Count());
+ Assert.Single(usages.QuickFixes);
Assert.Equal("a.cs", usages.QuickFixes.ElementAt(0).FileName);
}
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/GoToFileFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/GoToFileFacts.cs
index 4007cee7f7..7b8e93745f 100644
--- a/tests/OmniSharp.Roslyn.CSharp.Tests/GoToFileFacts.cs
+++ b/tests/OmniSharp.Roslyn.CSharp.Tests/GoToFileFacts.cs
@@ -36,7 +36,7 @@ public async Task ReturnsEmptyResponseForEmptyWorskpace()
{
var files = await GetFilesAsync();
- Assert.Equal(0, files.Length);
+ Assert.Empty(files);
}
private async Task GetFilesAsync(params TestFile[] testFiles)
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/GoToRegionFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/GoToRegionFacts.cs
index 9673b134c5..9baac164a5 100644
--- a/tests/OmniSharp.Roslyn.CSharp.Tests/GoToRegionFacts.cs
+++ b/tests/OmniSharp.Roslyn.CSharp.Tests/GoToRegionFacts.cs
@@ -52,7 +52,7 @@ public async Task DoesNotFindRegionsInFileWithoutRegions()
const string source = @"public class Fo$$o{}";
var regions = await GetRegionsAsync(source);
- Assert.Equal(0, regions.Length);
+ Assert.Empty(regions);
}
private async Task GetRegionsAsync(string source)
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/RenameFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/RenameFacts.cs
index 705bedeed8..2071a06c4d 100644
--- a/tests/OmniSharp.Roslyn.CSharp.Tests/RenameFacts.cs
+++ b/tests/OmniSharp.Roslyn.CSharp.Tests/RenameFacts.cs
@@ -169,7 +169,7 @@ public class Bar {
var changes = result.Changes.ToArray();
Assert.Equal(2, changes.Length);
- Assert.Equal(1, changes[0].Changes.Count());
+ Assert.Single(changes[0].Changes);
Assert.Null(changes[0].Buffer);
Assert.Equal("xxx", changes[0].Changes.First().NewText);
@@ -200,7 +200,7 @@ public async Task Rename_DoesTheRightThingWhenDocumentIsNotFound()
var changes = result.Changes.ToArray();
- Assert.Equal(1, changes.Length);
+ Assert.Single(changes);
Assert.Equal(testFile.FileName, changes[0].FileName);
}
}
@@ -221,7 +221,7 @@ public static void Main()
var testFile = new TestFile("test.cs", fileContent);
var result = await PerformRename(testFile, "foo");
- Assert.Equal(0, result.Changes.Count());
+ Assert.Empty(result.Changes);
Assert.NotNull(result.ErrorMessage);
}
@@ -243,7 +243,7 @@ public void Main(bool aBool$$ean)
var changes = result.Changes.ToArray();
- Assert.Equal(1, changes.Length);
+ Assert.Single(changes);
Assert.Equal(testFile.FileName, changes[0].FileName);
Assert.Equal(2, changes[0].Changes.Count());
}
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/SignatureHelpFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/SignatureHelpFacts.cs
index ab1da96d8a..f1442774c6 100644
--- a/tests/OmniSharp.Roslyn.CSharp.Tests/SignatureHelpFacts.cs
+++ b/tests/OmniSharp.Roslyn.CSharp.Tests/SignatureHelpFacts.cs
@@ -99,11 +99,11 @@ public static void Main(){
}";
var actual = await GetSignatureHelp(source);
- Assert.Equal(1, actual.Signatures.Count());
+ Assert.Single(actual.Signatures);
Assert.Equal(0, actual.ActiveParameter);
Assert.Equal(0, actual.ActiveSignature);
Assert.Equal("NewGuid", actual.Signatures.ElementAt(0).Name);
- Assert.Equal(0, actual.Signatures.ElementAt(0).Parameters.Count());
+ Assert.Empty(actual.Signatures.ElementAt(0).Parameters);
}
[Fact]
@@ -120,7 +120,7 @@ pubic static Foo(bool b, int n = 1234)
}
}";
var actual = await GetSignatureHelp(source);
- Assert.Equal(1, actual.Signatures.Count());
+ Assert.Single(actual.Signatures);
Assert.Equal(0, actual.ActiveParameter);
Assert.Equal(0, actual.ActiveSignature);
@@ -395,8 +395,8 @@ public bool B(this Program p, int n)
}";
var actual = await GetSignatureHelp(source);
- Assert.Equal(1, actual.Signatures.Count());
- Assert.Equal(1, actual.Signatures.ElementAt(actual.ActiveSignature).Parameters.Count());
+ Assert.Single(actual.Signatures);
+ Assert.Single(actual.Signatures.ElementAt(actual.ActiveSignature).Parameters);
Assert.Equal("n", actual.Signatures.ElementAt(actual.ActiveSignature).Parameters.ElementAt(0).Name);
}
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/SnippetFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/SnippetFacts.cs
index dddd8e876e..977f0b738f 100644
--- a/tests/OmniSharp.Roslyn.CSharp.Tests/SnippetFacts.cs
+++ b/tests/OmniSharp.Roslyn.CSharp.Tests/SnippetFacts.cs
@@ -327,7 +327,7 @@ public MyClass1()
}";
var completions = await FindCompletionsAsync(filename, source, wantSnippet: true);
- Assert.Equal(1, completions.Count());
+ Assert.Single(completions);
ContainsSnippet("Colors$0", completions);
}
@@ -348,7 +348,7 @@ public MyClass1()
}";
var completions = await FindCompletionsAsync(filename, source, wantSnippet: true);
- Assert.Equal(1, completions.Count());
+ Assert.Single(completions);
ContainsSnippet("TickChanged$0 : TickHandler", completions);
}
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/StructureFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/StructureFacts.cs
index ea5bd72bd8..abc793cff3 100644
--- a/tests/OmniSharp.Roslyn.CSharp.Tests/StructureFacts.cs
+++ b/tests/OmniSharp.Roslyn.CSharp.Tests/StructureFacts.cs
@@ -25,7 +25,7 @@ public async Task SimpleClass()
var nodes = await GetStructureAsync(source);
- Assert.Equal(1, nodes.Length);
+ Assert.Single(nodes);
Assert.Equal("Far", nodes[0].Location.Text);
Assert.Equal(SyntaxKind.ClassDeclaration.ToString(), nodes.First().Kind);
}
@@ -43,7 +43,7 @@ public void M() { }
var nodes = await GetStructureAsync(source);
- Assert.Equal(1, nodes.Length);
+ Assert.Single(nodes);
Assert.Equal("Far", nodes[0].Location.Text);
Assert.Equal(SyntaxKind.ClassDeclaration.ToString(), nodes[0].Kind);
@@ -66,7 +66,7 @@ public async Task SimpleInterface()
var nodes = await GetStructureAsync(source);
- Assert.Equal(1, nodes.Length);
+ Assert.Single(nodes);
Assert.Equal("Far", nodes[0].Location.Text);
Assert.Equal(SyntaxKind.InterfaceDeclaration.ToString(), nodes[0].Kind);
}
diff --git a/tests/OmniSharp.Tests/MarkupCodeFacts.cs b/tests/OmniSharp.Tests/MarkupCodeFacts.cs
index 604465a84b..a94e8b280e 100644
--- a/tests/OmniSharp.Tests/MarkupCodeFacts.cs
+++ b/tests/OmniSharp.Tests/MarkupCodeFacts.cs
@@ -18,7 +18,7 @@ public void NoMarkupHasNoPositionAndNoSpans()
Assert.Throws(() => { var _ = markupCode.Position; });
var spans = markupCode.GetSpans();
- Assert.Equal(0, spans.Count);
+ Assert.Empty(spans);
}
[Fact]
@@ -63,7 +63,7 @@ public void EmptySpanAtStart()
Assert.Equal("class C { }", markupCode.Code);
var spans = markupCode.GetSpans();
- Assert.Equal(1, spans.Count);
+ Assert.Single(spans);
Assert.Equal(TextSpan.FromBounds(0, 0), spans[0]);
}
@@ -76,7 +76,7 @@ public void EmptySpanAtEnd()
Assert.Equal("class C { }", markupCode.Code);
var spans = markupCode.GetSpans();
- Assert.Equal(1, spans.Count);
+ Assert.Single(spans);
Assert.Equal(TextSpan.FromBounds(markupCode.Code.Length, markupCode.Code.Length), spans[0]);
}
@@ -89,7 +89,7 @@ public void SpanAroundAllCode()
Assert.Equal("class C { }", markupCode.Code);
var spans = markupCode.GetSpans();
- Assert.Equal(1, spans.Count);
+ Assert.Single(spans);
Assert.Equal(TextSpan.FromBounds(0, markupCode.Code.Length), spans[0]);
var spanText = markupCode.Code.Substring(spans[0].Start, spans[0].Length);
@@ -105,7 +105,7 @@ public void SpanAroundInnerCode()
Assert.Equal("class C { }", markupCode.Code);
var spans = markupCode.GetSpans();
- Assert.Equal(1, spans.Count);
+ Assert.Single(spans);
Assert.Equal(TextSpan.FromBounds(4, 9), spans[0]);
var spanText = markupCode.Code.Substring(spans[0].Start, spans[0].Length);
@@ -121,7 +121,7 @@ public void EmptyNamedSpanAtStart()
Assert.Equal("class C { }", markupCode.Code);
var spans = markupCode.GetSpans("test");
- Assert.Equal(1, spans.Count);
+ Assert.Single(spans);
Assert.Equal(TextSpan.FromBounds(0, 0), spans[0]);
}
@@ -134,7 +134,7 @@ public void EmptyNamedSpanAtEnd()
Assert.Equal("class C { }", markupCode.Code);
var spans = markupCode.GetSpans("test");
- Assert.Equal(1, spans.Count);
+ Assert.Single(spans);
Assert.Equal(TextSpan.FromBounds(markupCode.Code.Length, markupCode.Code.Length), spans[0]);
}
@@ -147,7 +147,7 @@ public void NamedSpanAroundAllCode()
Assert.Equal("class C { }", markupCode.Code);
var spans = markupCode.GetSpans("test");
- Assert.Equal(1, spans.Count);
+ Assert.Single(spans);
Assert.Equal(TextSpan.FromBounds(0, markupCode.Code.Length), spans[0]);
var spanText = markupCode.Code.Substring(spans[0].Start, spans[0].Length);
@@ -163,7 +163,7 @@ public void NamedSpanAroundInnerCode()
Assert.Equal("class C { }", markupCode.Code);
var spans = markupCode.GetSpans("test");
- Assert.Equal(1, spans.Count);
+ Assert.Single(spans);
Assert.Equal(TextSpan.FromBounds(4, 9), spans[0]);
var spanText = markupCode.Code.Substring(spans[0].Start, spans[0].Length);
@@ -219,14 +219,14 @@ public void NestedNamedSpansWithDifferentNames()
Assert.Equal("class C { }", markupCode.Code);
var spans1 = markupCode.GetSpans("test1");
- Assert.Equal(1, spans1.Count);
+ Assert.Single(spans1);
Assert.Equal(TextSpan.FromBounds(0, markupCode.Code.Length), spans1[0]);
var spanText1 = markupCode.Code.Substring(spans1[0].Start, spans1[0].Length);
Assert.Equal("class C { }", spanText1);
var spans2 = markupCode.GetSpans("test2");
- Assert.Equal(1, spans2.Count);
+ Assert.Single(spans2);
Assert.Equal(TextSpan.FromBounds(4, 9), spans2[0]);
var spanText2 = markupCode.Code.Substring(spans2[0].Start, spans2[0].Length);
diff --git a/tools/packages.config b/tools/packages.config
index 675464b39a..37c9a8f58d 100644
--- a/tools/packages.config
+++ b/tools/packages.config
@@ -3,5 +3,5 @@
-
+