From dd64c2a6250a3fa63deb29acb61b003ed37eccc3 Mon Sep 17 00:00:00 2001 From: Youssef1313 Date: Tue, 4 May 2021 12:31:15 +0000 Subject: [PATCH 01/24] Handle CData and avoid normalizing code --- .../QuickInfo/SemanticQuickInfoSourceTests.cs | 48 +++++++++++++++++++ ...ctDocumentationCommentFormattingService.cs | 17 +++++-- ...ervice.AbstractSymbolDescriptionBuilder.cs | 4 +- 3 files changed, 64 insertions(+), 5 deletions(-) diff --git a/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs b/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs index 76b55b3a69915..a9e094a7b9b7e 100644 --- a/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs +++ b/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs @@ -7291,5 +7291,53 @@ void M2() }", MainDescription($"({FeaturesResources.local_variable}) string? x")); } + + [WorkItem(53135, "https://github.com/dotnet/roslyn/issues/53135")] + [Fact, Trait(Traits.Feature, Traits.Features.QuickInfo)] + public async Task TestDocumentationCData() + { + var markup = +@"using I$$ = IGoo; +/// +/// summary for interface IGoo +/// y = null; +/// ]]> +/// +interface IGoo { }"; + + await TestAsync(markup, + MainDescription("interface IGoo"), + Documentation(@"summary for interface IGoo + + +List y = null; +")); + } + + [WorkItem(37503, "https://github.com/dotnet/roslyn/issues/37503")] + [Fact, Trait(Traits.Feature, Traits.Features.QuickInfo)] + public async Task DoNotNormalizeWhitespaceForCode() + { + var markup = +@"using I$$ = IGoo; +/// +/// Normalize this, but Not this +/// +/// line 1 +/// line 2 +/// +/// +interface IGoo { }"; + + await TestAsync(markup, + MainDescription("interface IGoo"), + Documentation(@"Normalize this, but Not this + + +line 1 +line 2 +")); + } } } diff --git a/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs b/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs index c75ab279f6540..7ad88a6ac00f9 100644 --- a/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs +++ b/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Text; +using System.Text.RegularExpressions; using System.Threading; using System.Xml; using System.Xml.Linq; @@ -102,10 +103,12 @@ public void AppendSingleSpace() public void AppendString(string s) { EmitPendingChars(); - - Builder.Add(new TaggedText(TextTags.Text, s, Style, NavigationTarget.target, NavigationTarget.hint)); + Builder.Add(new TaggedText(TextTags.Text, NormalizeLineEndings(s), Style, NavigationTarget.target, NavigationTarget.hint)); _anyNonWhitespaceSinceLastPara = true; + + static string NormalizeLineEndings(string input) => Regex.Replace(input, "(? parts) @@ -305,8 +308,9 @@ public ImmutableArray Format(string rawXmlText, ISymbol symbol, Sema private static void AppendTextFromNode(FormatterState state, XNode node, Compilation compilation) { - if (node.NodeType == XmlNodeType.Text) + if (node.NodeType is XmlNodeType.Text or XmlNodeType.CDATA) { + // cast is safe since XCData inherits XText AppendTextFromTextNode(state, (XText)node); } @@ -550,6 +554,13 @@ private static string TrimCrefPrefix(string value) private static void AppendTextFromTextNode(FormatterState state, XText element) { var rawText = element.Value; + if (state.Style == TaggedTextStyle.Code) + { + // Don't normalize code. + state.AppendString(rawText); + return; + } + var builder = new StringBuilder(rawText.Length); // Normalize the whitespace. diff --git a/src/Features/Core/Portable/LanguageServices/SymbolDisplayService/AbstractSymbolDisplayService.AbstractSymbolDescriptionBuilder.cs b/src/Features/Core/Portable/LanguageServices/SymbolDisplayService/AbstractSymbolDisplayService.AbstractSymbolDescriptionBuilder.cs index 265ba16820196..e798a3ae49cb0 100644 --- a/src/Features/Core/Portable/LanguageServices/SymbolDisplayService/AbstractSymbolDisplayService.AbstractSymbolDescriptionBuilder.cs +++ b/src/Features/Core/Portable/LanguageServices/SymbolDisplayService/AbstractSymbolDisplayService.AbstractSymbolDescriptionBuilder.cs @@ -169,11 +169,11 @@ private void AddDocumentationContent(ISymbol symbol) _documentationMap.Add( SymbolDescriptionGroups.Documentation, - symbol.GetDocumentationParts(_semanticModel, _position, formatter, CancellationToken).ToImmutableArray()); + symbol.GetDocumentationParts(_semanticModel, _position, formatter, CancellationToken)); _documentationMap.Add( SymbolDescriptionGroups.RemarksDocumentation, - symbol.GetRemarksDocumentationParts(_semanticModel, _position, formatter, CancellationToken).ToImmutableArray()); + symbol.GetRemarksDocumentationParts(_semanticModel, _position, formatter, CancellationToken)); AddReturnsDocumentationParts(symbol, formatter); AddValueDocumentationParts(symbol, formatter); From 718b0fce4e4ee7377a35f10623e14d66a11ae845 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Tue, 4 May 2021 13:24:53 +0200 Subject: [PATCH 02/24] Test CDATA for metadata-as-source Add test case for #22431 --- .../MetadataAsSource/MetadataAsSourceTests.cs | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/EditorFeatures/Test/MetadataAsSource/MetadataAsSourceTests.cs b/src/EditorFeatures/Test/MetadataAsSource/MetadataAsSourceTests.cs index cb59f140b4de9..fc2368f442f1f 100644 --- a/src/EditorFeatures/Test/MetadataAsSource/MetadataAsSourceTests.cs +++ b/src/EditorFeatures/Test/MetadataAsSource/MetadataAsSourceTests.cs @@ -3087,5 +3087,33 @@ public class TestType var metadataAsSourceFile = await context.GenerateSourceAsync(navigationSymbol); TestContext.VerifyResult(metadataAsSourceFile, expected); } + + [WorkItem(22431, "https://github.com/dotnet/roslyn/issues/22431")] + [Fact, Trait(Traits.Feature, Traits.Features.MetadataAsSource)] + public async Task TestCDATAComment() + { + var source = @" +public enum BinaryOperatorKind +{ + /// + /// Represents the operator. + /// + LeftShift = 0x8, +} +"; + var symbolName = "BinaryOperatorKind.LeftShift"; + var expectedCS = $@"#region {FeaturesResources.Assembly} ReferencedAssembly, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null +// {CodeAnalysisResources.InMemoryAssembly} +#endregion + +public enum BinaryOperatorKind +{{ + // + // {FeaturesResources.Summary_colon} + // Represents the '<<' operator. + [|LeftShift|] = 8 +}}"; + await GenerateAndVerifySourceAsync(source, symbolName, LanguageNames.CSharp, expectedCS, includeXmlDocComments: true); + } } } From c3ce061d73fa204810e52d2acb988f2b6c6ce5d3 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Tue, 4 May 2021 15:28:59 +0200 Subject: [PATCH 03/24] Fix test --- .../CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs | 4 ++-- .../Test/DocCommentFormatting/DocCommentFormattingTests.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs b/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs index a9e094a7b9b7e..9eca90494d966 100644 --- a/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs +++ b/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs @@ -7332,11 +7332,11 @@ interface IGoo { }"; await TestAsync(markup, MainDescription("interface IGoo"), - Documentation(@"Normalize this, but Not this + Documentation(@"Normalize this, but Not this line 1 -line 2 +line 2 ")); } } diff --git a/src/EditorFeatures/Test/DocCommentFormatting/DocCommentFormattingTests.cs b/src/EditorFeatures/Test/DocCommentFormatting/DocCommentFormattingTests.cs index 9a23741881b7d..493350792e834 100644 --- a/src/EditorFeatures/Test/DocCommentFormatting/DocCommentFormattingTests.cs +++ b/src/EditorFeatures/Test/DocCommentFormatting/DocCommentFormattingTests.cs @@ -50,7 +50,7 @@ public void ExampleAndCodeTags() results in p's having the value (2,8). "; - var expected = "This method changes the point's location by the given x- and y-offsets. For example:\r\n\r\nPoint p = new Point(3,5); p.Translate(-1,3);\r\n\r\nresults in p's having the value (2,8)."; + var expected = "This method changes the point's location by the given x- and y-offsets. For example:\r\n\r\n\r\n Point p = new Point(3,5);\r\n p.Translate(-1,3);\r\n\r\nresults in p's having the value (2,8)."; TestFormat(comment, expected); } From e5c261a979074bc1f2516ed5d3eb80d688e6b5fd Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Tue, 4 May 2021 18:04:11 +0200 Subject: [PATCH 04/24] Fix test --- .../Test/DocCommentFormatting/DocCommentFormattingTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EditorFeatures/Test/DocCommentFormatting/DocCommentFormattingTests.cs b/src/EditorFeatures/Test/DocCommentFormatting/DocCommentFormattingTests.cs index 493350792e834..af3ee37780565 100644 --- a/src/EditorFeatures/Test/DocCommentFormatting/DocCommentFormattingTests.cs +++ b/src/EditorFeatures/Test/DocCommentFormatting/DocCommentFormattingTests.cs @@ -50,7 +50,7 @@ public void ExampleAndCodeTags() results in p's having the value (2,8). "; - var expected = "This method changes the point's location by the given x- and y-offsets. For example:\r\n\r\n\r\n Point p = new Point(3,5);\r\n p.Translate(-1,3);\r\n\r\nresults in p's having the value (2,8)."; + var expected = "This method changes the point's location by the given x- and y-offsets. For example:\r\n\r\n\r\n Point p = new Point(3,5);\r\n p.Translate(-1,3);\r\n \r\n\r\nresults in p's having the value (2,8)."; TestFormat(comment, expected); } From c0e6992d412cfed82911a5cdaa42e9a598aa84eb Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Tue, 4 May 2021 18:13:12 +0200 Subject: [PATCH 05/24] Add comment --- .../AbstractDocumentationCommentFormattingService.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs b/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs index 7ad88a6ac00f9..922301885f09f 100644 --- a/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs +++ b/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs @@ -107,6 +107,9 @@ public void AppendString(string s) _anyNonWhitespaceSinceLastPara = true; + // This regex replaces `\n`s that are not preceded by `\r` with `\r\n`. + // This is because XText.Value returns a string contaning `\n` as the line endings, causing + // the end result to have mixed line-endings. So normalize everything to `\r\n`. static string NormalizeLineEndings(string input) => Regex.Replace(input, "(? Date: Tue, 4 May 2021 17:16:25 +0000 Subject: [PATCH 06/24] Address feedback --- .../IntellisenseQuickInfoBuilderTests_Code.vb | 112 ++++++++++++++++++ ...ctDocumentationCommentFormattingService.cs | 7 +- 2 files changed, 115 insertions(+), 4 deletions(-) create mode 100644 src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb diff --git a/src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb b/src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb new file mode 100644 index 0000000000000..7f1ea255e3509 --- /dev/null +++ b/src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb @@ -0,0 +1,112 @@ +' Licensed to the .NET Foundation under one or more agreements. +' The .NET Foundation licenses this file to you under the MIT license. +' See the LICENSE file in the project root for more information. + +Imports Microsoft.CodeAnalysis.Classification +Imports Microsoft.CodeAnalysis.Test.Utilities.QuickInfo +Imports Microsoft.VisualStudio.Core.Imaging +Imports Microsoft.VisualStudio.Imaging +Imports Microsoft.VisualStudio.Text.Adornments + +Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense + Public Class IntellisenseQuickInfoBuilderTests_Code + Inherits AbstractIntellisenseQuickInfoBuilderTests + + Public Async Function QuickInfoForXmlCodeElementWithCDATA() As Task + Dim workspace = + + + + class MyClass { + /// <summary> + /// summary for MyClass + /// <code><![CDATA[ + /// List<string> y = null; + /// ]]></code> + /// </summary> + void MyMethod() { + MyM$$ethod(); + } + } + + + + + Dim intellisenseQuickInfo = Await GetQuickInfoItemAsync(workspace, LanguageNames.CSharp) + + Dim expected = New ContainerElement( + ContainerElementStyle.Stacked Or ContainerElementStyle.VerticalPadding, + New ContainerElement( + ContainerElementStyle.Stacked, + New ContainerElement( + ContainerElementStyle.Wrapped, + New ImageElement(New ImageId(KnownImageIds.ImageCatalogGuid, KnownImageIds.MethodPrivate)), + New ClassifiedTextElement( + New ClassifiedTextRun(ClassificationTypeNames.Keyword, "void"), + New ClassifiedTextRun(ClassificationTypeNames.WhiteSpace, " "), + New ClassifiedTextRun(ClassificationTypeNames.ClassName, "MyClass", navigationAction:=Sub() Return, "MyClass"), + New ClassifiedTextRun(ClassificationTypeNames.Punctuation, "."), + New ClassifiedTextRun(ClassificationTypeNames.MethodName, "MyMethod", navigationAction:=Sub() Return, "void MyClass.MyMethod()"), + New ClassifiedTextRun(ClassificationTypeNames.Punctuation, "("), + New ClassifiedTextRun(ClassificationTypeNames.Punctuation, ")"))), + New ClassifiedTextElement( + New ClassifiedTextRun(ClassificationTypeNames.Text, "summary for MyClass"))), + New ClassifiedTextElement( + New ClassifiedTextRun(ClassificationTypeNames.Text, "\r\nList y = null;\r\n", ClassifiedTextRunStyle.UseClassificationFont))) + + ToolTipAssert.EqualContent(expected, intellisenseQuickInfo.Item) + End Function + + + Public Async Function QuickInfoForXmlCodeElement() As Task + Dim workspace = + + + + class MyClass { + /// <summary> + /// Normalize this, but <c>Not this</c> + /// <code> + /// line 1 + /// line 2 + /// </code> + /// Extra text after code. + /// </summary> + void MyMethod() { + MyM$$ethod(); + } + } + + + + + Dim intellisenseQuickInfo = Await GetQuickInfoItemAsync(workspace, LanguageNames.CSharp) + + Dim expected = New ContainerElement( + ContainerElementStyle.Stacked Or ContainerElementStyle.VerticalPadding, + New ContainerElement( + ContainerElementStyle.Stacked, + New ContainerElement( + ContainerElementStyle.Wrapped, + New ImageElement(New ImageId(KnownImageIds.ImageCatalogGuid, KnownImageIds.MethodPrivate)), + New ClassifiedTextElement( + New ClassifiedTextRun(ClassificationTypeNames.Keyword, "void"), + New ClassifiedTextRun(ClassificationTypeNames.WhiteSpace, " "), + New ClassifiedTextRun(ClassificationTypeNames.ClassName, "MyClass", navigationAction:=Sub() Return, "MyClass"), + New ClassifiedTextRun(ClassificationTypeNames.Punctuation, "."), + New ClassifiedTextRun(ClassificationTypeNames.MethodName, "MyMethod", navigationAction:=Sub() Return, "void MyClass.MyMethod()"), + New ClassifiedTextRun(ClassificationTypeNames.Punctuation, "("), + New ClassifiedTextRun(ClassificationTypeNames.Punctuation, ")"))), + New ClassifiedTextElement( + New ClassifiedTextRun(ClassificationTypeNames.Text, "Normalize this, but"), + New ClassifiedTextRun(ClassificationTypeNames.WhiteSpace, " "), + New ClassifiedTextRun(ClassificationTypeNames.Text, "Not this", ClassifiedTextRunStyle.UseClassificationFont))), + New ClassifiedTextElement( + New ClassifiedTextRun(ClassificationTypeNames.Text, "\r\nline 1\r\nline 2\r\n", ClassifiedTextRunStyle.UseClassificationFont)), + New ClassifiedTextElement( + New ClassifiedTextRun(ClassificationTypeNames.Text, "Extra text after code."))) + + ToolTipAssert.EqualContent(expected, intellisenseQuickInfo.Item) + End Function + End Class +End Namespace diff --git a/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs b/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs index 922301885f09f..f9e7db48893e7 100644 --- a/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs +++ b/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs @@ -107,11 +107,10 @@ public void AppendString(string s) _anyNonWhitespaceSinceLastPara = true; - // This regex replaces `\n`s that are not preceded by `\r` with `\r\n`. - // This is because XText.Value returns a string contaning `\n` as the line endings, causing + // XText.Value returns a string with `\n` as the line endings, causing // the end result to have mixed line-endings. So normalize everything to `\r\n`. - static string NormalizeLineEndings(string input) => Regex.Replace(input, "(? input.Replace("\n", "\r\n"); } public void AppendParts(IEnumerable parts) From c3a86c866aecdbc7fb3f922becd58e3abdc642f1 Mon Sep 17 00:00:00 2001 From: Youssef1313 Date: Tue, 4 May 2021 18:27:00 +0000 Subject: [PATCH 07/24] Fix --- .../IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb b/src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb index 7f1ea255e3509..f62e79096a702 100644 --- a/src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb +++ b/src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb @@ -52,7 +52,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense New ClassifiedTextElement( New ClassifiedTextRun(ClassificationTypeNames.Text, "summary for MyClass"))), New ClassifiedTextElement( - New ClassifiedTextRun(ClassificationTypeNames.Text, "\r\nList y = null;\r\n", ClassifiedTextRunStyle.UseClassificationFont))) + New ClassifiedTextRun(ClassificationTypeNames.Text, $"{vbCrLf}List y = null;{vbCrLf}", ClassifiedTextRunStyle.UseClassificationFont))) ToolTipAssert.EqualContent(expected, intellisenseQuickInfo.Item) End Function @@ -102,7 +102,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense New ClassifiedTextRun(ClassificationTypeNames.WhiteSpace, " "), New ClassifiedTextRun(ClassificationTypeNames.Text, "Not this", ClassifiedTextRunStyle.UseClassificationFont))), New ClassifiedTextElement( - New ClassifiedTextRun(ClassificationTypeNames.Text, "\r\nline 1\r\nline 2\r\n", ClassifiedTextRunStyle.UseClassificationFont)), + New ClassifiedTextRun(ClassificationTypeNames.Text, $"{vbCrLf}line 1{vbCrLf}line 2{vbCrLf}", ClassifiedTextRunStyle.UseClassificationFont)), New ClassifiedTextElement( New ClassifiedTextRun(ClassificationTypeNames.Text, "Extra text after code."))) From e01d57a3688c737d53f49ec821217e23e5f857e7 Mon Sep 17 00:00:00 2001 From: Youssef1313 Date: Mon, 10 May 2021 20:41:11 +0200 Subject: [PATCH 08/24] Fix code normalization --- .../CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs | 8 ++------ .../DocCommentFormatting/DocCommentFormattingTests.cs | 2 +- .../IntellisenseQuickInfoBuilderTests_Code.vb | 4 ++-- .../AbstractDocumentationCommentFormattingService.cs | 4 ++-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs b/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs index 9eca90494d966..6ed1327cecb48 100644 --- a/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs +++ b/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs @@ -7310,9 +7310,7 @@ await TestAsync(markup, MainDescription("interface IGoo"), Documentation(@"summary for interface IGoo - -List y = null; -")); +List y = null;")); } [WorkItem(37503, "https://github.com/dotnet/roslyn/issues/37503")] @@ -7334,10 +7332,8 @@ await TestAsync(markup, MainDescription("interface IGoo"), Documentation(@"Normalize this, but Not this - line 1 -line 2 -")); +line 2")); } } } diff --git a/src/EditorFeatures/Test/DocCommentFormatting/DocCommentFormattingTests.cs b/src/EditorFeatures/Test/DocCommentFormatting/DocCommentFormattingTests.cs index af3ee37780565..3d8d8e9e73134 100644 --- a/src/EditorFeatures/Test/DocCommentFormatting/DocCommentFormattingTests.cs +++ b/src/EditorFeatures/Test/DocCommentFormatting/DocCommentFormattingTests.cs @@ -50,7 +50,7 @@ public void ExampleAndCodeTags() results in p's having the value (2,8). "; - var expected = "This method changes the point's location by the given x- and y-offsets. For example:\r\n\r\n\r\n Point p = new Point(3,5);\r\n p.Translate(-1,3);\r\n \r\n\r\nresults in p's having the value (2,8)."; + var expected = "This method changes the point's location by the given x- and y-offsets. For example:\r\n\r\n Point p = new Point(3,5);\r\n p.Translate(-1,3);\r\n \r\n\r\nresults in p's having the value (2,8)."; TestFormat(comment, expected); } diff --git a/src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb b/src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb index f62e79096a702..f70756d83e01a 100644 --- a/src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb +++ b/src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb @@ -52,7 +52,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense New ClassifiedTextElement( New ClassifiedTextRun(ClassificationTypeNames.Text, "summary for MyClass"))), New ClassifiedTextElement( - New ClassifiedTextRun(ClassificationTypeNames.Text, $"{vbCrLf}List y = null;{vbCrLf}", ClassifiedTextRunStyle.UseClassificationFont))) + New ClassifiedTextRun(ClassificationTypeNames.Text, "List y = null;", ClassifiedTextRunStyle.UseClassificationFont))) ToolTipAssert.EqualContent(expected, intellisenseQuickInfo.Item) End Function @@ -102,7 +102,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense New ClassifiedTextRun(ClassificationTypeNames.WhiteSpace, " "), New ClassifiedTextRun(ClassificationTypeNames.Text, "Not this", ClassifiedTextRunStyle.UseClassificationFont))), New ClassifiedTextElement( - New ClassifiedTextRun(ClassificationTypeNames.Text, $"{vbCrLf}line 1{vbCrLf}line 2{vbCrLf}", ClassifiedTextRunStyle.UseClassificationFont)), + New ClassifiedTextRun(ClassificationTypeNames.Text, $"line 1{vbCrLf}line 2", ClassifiedTextRunStyle.UseClassificationFont)), New ClassifiedTextElement( New ClassifiedTextRun(ClassificationTypeNames.Text, "Extra text after code."))) diff --git a/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs b/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs index f9e7db48893e7..e6bc63a95d2fe 100644 --- a/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs +++ b/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs @@ -558,8 +558,8 @@ private static void AppendTextFromTextNode(FormatterState state, XText element) var rawText = element.Value; if (state.Style == TaggedTextStyle.Code) { - // Don't normalize code. - state.AppendString(rawText); + // Don't normalize code from middle. Only trim leading/trailing new lines. + state.AppendString(rawText.Trim('\n')); return; } From 69ad011d480c2a63b622f36cd7f3295740ef15d3 Mon Sep 17 00:00:00 2001 From: Youssef1313 Date: Wed, 12 May 2021 10:05:07 +0200 Subject: [PATCH 09/24] Address feedback --- .../QuickInfo/SemanticQuickInfoSourceTests.cs | 4 ++-- .../Core/Implementation/IntelliSense/Helpers.cs | 3 ++- .../IntellisenseQuickInfoBuilderTests_Code.vb | 7 ++++--- src/Features/Core/Portable/Common/TaggedTextStyle.cs | 12 ++++++------ .../AbstractDocumentationCommentFormattingService.cs | 9 ++++++--- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs b/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs index 6ed1327cecb48..f9b4955a984ce 100644 --- a/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs +++ b/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs @@ -7320,7 +7320,7 @@ public async Task DoNotNormalizeWhitespaceForCode() var markup = @"using I$$ = IGoo; /// -/// Normalize this, but Not this +/// Normalize this, and Also this /// /// line 1 /// line 2 @@ -7330,7 +7330,7 @@ interface IGoo { }"; await TestAsync(markup, MainDescription("interface IGoo"), - Documentation(@"Normalize this, but Not this + Documentation(@"Normalize this, and Also this line 1 line 2")); diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/Helpers.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/Helpers.cs index 73f0cc055a92c..dfdea659d9424 100644 --- a/src/EditorFeatures/Core/Implementation/IntelliSense/Helpers.cs +++ b/src/EditorFeatures/Core/Implementation/IntelliSense/Helpers.cs @@ -218,7 +218,8 @@ private static ClassifiedTextRunStyle GetClassifiedTextRunStyle(TaggedTextStyle result |= ClassifiedTextRunStyle.Underline; } - if ((style & TaggedTextStyle.Code) == TaggedTextStyle.Code) + if ((style & TaggedTextStyle.Code) == TaggedTextStyle.Code || + (style & TaggedTextStyle.InlineCode) == TaggedTextStyle.InlineCode) { result |= ClassifiedTextRunStyle.UseClassificationFont; } diff --git a/src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb b/src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb index f70756d83e01a..25d531e754130 100644 --- a/src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb +++ b/src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Code.vb @@ -65,7 +65,8 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense class MyClass { /// <summary> - /// Normalize this, but <c>Not this</c> + /// Normalize this, <c>and also + /// this</c> /// <code> /// line 1 /// line 2 @@ -98,9 +99,9 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense New ClassifiedTextRun(ClassificationTypeNames.Punctuation, "("), New ClassifiedTextRun(ClassificationTypeNames.Punctuation, ")"))), New ClassifiedTextElement( - New ClassifiedTextRun(ClassificationTypeNames.Text, "Normalize this, but"), + New ClassifiedTextRun(ClassificationTypeNames.Text, "Normalize this,"), New ClassifiedTextRun(ClassificationTypeNames.WhiteSpace, " "), - New ClassifiedTextRun(ClassificationTypeNames.Text, "Not this", ClassifiedTextRunStyle.UseClassificationFont))), + New ClassifiedTextRun(ClassificationTypeNames.Text, "and also this", ClassifiedTextRunStyle.UseClassificationFont))), New ClassifiedTextElement( New ClassifiedTextRun(ClassificationTypeNames.Text, $"line 1{vbCrLf}line 2", ClassifiedTextRunStyle.UseClassificationFont)), New ClassifiedTextElement( diff --git a/src/Features/Core/Portable/Common/TaggedTextStyle.cs b/src/Features/Core/Portable/Common/TaggedTextStyle.cs index cf7a756e86aad..47ad576361b88 100644 --- a/src/Features/Core/Portable/Common/TaggedTextStyle.cs +++ b/src/Features/Core/Portable/Common/TaggedTextStyle.cs @@ -2,8 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#nullable disable - using System; namespace Microsoft.CodeAnalysis @@ -13,12 +11,14 @@ internal enum TaggedTextStyle { None = 0, - Strong = 0x1, + Strong = 1 << 0, + + Emphasis = 1 << 1, - Emphasis = 0x2, + Underline = 1 << 2, - Underline = 0x4, + Code = 1 << 3, - Code = 0x8, + InlineCode = 1 << 4, } } diff --git a/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs b/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs index e6bc63a95d2fe..4d71632233ed6 100644 --- a/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs +++ b/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs @@ -360,9 +360,12 @@ private static void AppendTextFromNode(FormatterState state, XNode node, Compila return; } - else if (name == DocumentationCommentXmlNames.CElementName - || name == DocumentationCommentXmlNames.CodeElementName - || name == "tt") + else if (name is DocumentationCommentXmlNames.CElementName or "tt") + { + needPopStyle = true; + state.PushStyle(TaggedTextStyle.InlineCode); + } + else if (name == DocumentationCommentXmlNames.CodeElementName) { needPopStyle = true; state.PushStyle(TaggedTextStyle.Code); From b6159fc5441dae5804b683d6d4cb64fad29ad787 Mon Sep 17 00:00:00 2001 From: Youssef1313 Date: Wed, 12 May 2021 21:06:18 +0200 Subject: [PATCH 10/24] Address feedback --- .../Core/Implementation/IntelliSense/Helpers.cs | 3 +-- src/Features/Core/Portable/Common/TaggedTextStyle.cs | 2 +- .../AbstractDocumentationCommentFormattingService.cs | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/Helpers.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/Helpers.cs index dfdea659d9424..73f0cc055a92c 100644 --- a/src/EditorFeatures/Core/Implementation/IntelliSense/Helpers.cs +++ b/src/EditorFeatures/Core/Implementation/IntelliSense/Helpers.cs @@ -218,8 +218,7 @@ private static ClassifiedTextRunStyle GetClassifiedTextRunStyle(TaggedTextStyle result |= ClassifiedTextRunStyle.Underline; } - if ((style & TaggedTextStyle.Code) == TaggedTextStyle.Code || - (style & TaggedTextStyle.InlineCode) == TaggedTextStyle.InlineCode) + if ((style & TaggedTextStyle.Code) == TaggedTextStyle.Code) { result |= ClassifiedTextRunStyle.UseClassificationFont; } diff --git a/src/Features/Core/Portable/Common/TaggedTextStyle.cs b/src/Features/Core/Portable/Common/TaggedTextStyle.cs index 47ad576361b88..4440b13bb3434 100644 --- a/src/Features/Core/Portable/Common/TaggedTextStyle.cs +++ b/src/Features/Core/Portable/Common/TaggedTextStyle.cs @@ -19,6 +19,6 @@ internal enum TaggedTextStyle Code = 1 << 3, - InlineCode = 1 << 4, + PreserveWhitespace = 1 << 4, } } diff --git a/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs b/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs index 4d71632233ed6..a4a6f6f1b1fb3 100644 --- a/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs +++ b/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs @@ -363,7 +363,7 @@ private static void AppendTextFromNode(FormatterState state, XNode node, Compila else if (name is DocumentationCommentXmlNames.CElementName or "tt") { needPopStyle = true; - state.PushStyle(TaggedTextStyle.InlineCode); + state.PushStyle(TaggedTextStyle.Code | TaggedTextStyle.PreserveWhitespace); } else if (name == DocumentationCommentXmlNames.CodeElementName) { @@ -559,7 +559,7 @@ private static string TrimCrefPrefix(string value) private static void AppendTextFromTextNode(FormatterState state, XText element) { var rawText = element.Value; - if (state.Style == TaggedTextStyle.Code) + if ((state.Style & TaggedTextStyle.PreserveWhitespace) == TaggedTextStyle.PreserveWhitespace) { // Don't normalize code from middle. Only trim leading/trailing new lines. state.AppendString(rawText.Trim('\n')); From 636bc29aa612cfcc5eea1a830f6a69e017a8ec26 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Wed, 12 May 2021 21:08:05 +0200 Subject: [PATCH 11/24] Fix --- .../AbstractDocumentationCommentFormattingService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs b/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs index a4a6f6f1b1fb3..d3622f8f951fb 100644 --- a/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs +++ b/src/Features/Core/Portable/DocumentationComments/AbstractDocumentationCommentFormattingService.cs @@ -363,12 +363,12 @@ private static void AppendTextFromNode(FormatterState state, XNode node, Compila else if (name is DocumentationCommentXmlNames.CElementName or "tt") { needPopStyle = true; - state.PushStyle(TaggedTextStyle.Code | TaggedTextStyle.PreserveWhitespace); + state.PushStyle(TaggedTextStyle.Code); } else if (name == DocumentationCommentXmlNames.CodeElementName) { needPopStyle = true; - state.PushStyle(TaggedTextStyle.Code); + state.PushStyle(TaggedTextStyle.Code | TaggedTextStyle.PreserveWhitespace); } else if (name == "em" || name == "i") { From 57278e7dcbf7bffb310e8b14105f657f0fdbab78 Mon Sep 17 00:00:00 2001 From: Andrew Hall Date: Thu, 17 Jun 2021 16:36:05 -0700 Subject: [PATCH 12/24] dotnet-format -w Roslyn.sln --- ...atchFolderAndNamespaceDiagnosticAnalyzer.cs | 6 +++--- .../Helpers/UseExpressionBodyHelper.cs | 2 +- .../CSharpUsePatternCombinatorsAnalyzer.cs | 2 +- ...mentToExpressionCodeFixProvider.Rewriter.cs | 2 +- ...CSharpRemoveUnusedMembersCodeFixProvider.cs | 4 ++-- .../AbstractOrderModifiersCodeFixProvider.cs | 4 ++-- ...alExpressionForAssignmentCodeFixProvider.cs | 4 ++-- ...AccessibilityModifiersDiagnosticAnalyzer.vb | 2 +- ...opulateSwitchStatementDiagnosticAnalyzer.vb | 2 +- ...UnnecessaryParenthesesDiagnosticAnalyzer.vb | 10 +++++----- ...sicSimplifyConditionalDiagnosticAnalyzer.vb | 4 ++-- ...cUseCompoundAssignmentDiagnosticAnalyzer.vb | 2 +- .../QualifyMemberAccessTests.vb | 2 +- .../UseIsNullCheckForReferenceEqualsTests.vb | 2 +- .../Analyzers/Formatting/FormatterHelper.cs | 2 +- .../Portable/Binder/Binder_Deconstruct.cs | 2 +- .../Portable/Binder/Binder_Expressions.cs | 10 +++++----- .../CSharp/Portable/Binder/Binder_Flags.cs | 2 +- .../Portable/Binder/Binder_QueryErrors.cs | 2 +- .../Portable/Binder/Binder_XmlNameAttribute.cs | 2 +- .../Portable/Binder/ExecutableCodeBinder.cs | 8 ++++---- .../Binder/ExpressionListVariableBinder.cs | 4 ++-- .../Binder/ExpressionVariableBinder.cs | 2 +- .../Binder/ExpressionVariableFinder.cs | 4 ++-- .../CSharp/Portable/Binder/ForLoopBinder.cs | 2 +- .../Portable/Binder/LocalBinderFactory.cs | 6 +++--- .../CSharp/Portable/Binder/LockBinder.cs | 2 +- .../Portable/Binder/MethodArgumentInfo.cs | 2 +- .../Portable/Binder/ScriptLocalScopeBinder.cs | 2 +- .../Binder/Semantics/Conversions/Conversion.cs | 8 ++++---- .../Semantics/Conversions/TypeConversions.cs | 4 ++-- .../Conversions/UserDefinedConversions.cs | 2 +- .../UserDefinedExplicitConversions.cs | 2 +- .../Portable/Binder/SimpleLocalScopeBinder.cs | 4 ++-- .../CSharp/Portable/Binder/TypeofBinder.cs | 2 +- .../CSharp/Portable/Binder/WhileBinder.cs | 4 ++-- .../BoundTree/BoundDiscardExpression.cs | 2 +- .../Portable/BoundTree/BoundExpression.cs | 2 +- .../Portable/BoundTree/BoundTreeRewriter.cs | 4 ++-- .../Portable/BoundTree/BoundTreeVisitors.cs | 4 ++-- .../CSharp/Portable/BoundTree/Formatting.cs | 4 ++-- .../OutDeconstructVarPendingInference.cs | 2 +- .../BoundTree/VariablePendingInference.cs | 8 ++++---- .../Compilation/LexicalOrderSymbolComparer.cs | 2 +- .../MemberSemanticModel.NodeMapBuilder.cs | 6 +++--- .../Portable/Compilation/QueryClauseInfo.cs | 2 +- .../Compilation/SyntaxAndDeclarationManager.cs | 2 +- .../CSharp/Portable/Compilation/TypeInfo.cs | 2 +- ...ocumentationCommentIDVisitor.PartVisitor.cs | 2 +- .../PEDocumentationCommentUtils.cs | 2 +- .../EditAndContinue/CSharpSymbolMatcher.cs | 10 +++++----- .../Emitter/Model/AssemblyReference.cs | 4 ++-- .../Emitter/Model/CustomModifierAdapter.cs | 2 +- .../Model/GenericTypeInstanceReference.cs | 8 ++++---- .../Model/SourceAssemblySymbolAdapter.cs | 2 +- ...alizedGenericNestedTypeInstanceReference.cs | 4 ++-- .../Model/SpecializedNestedTypeReference.cs | 2 +- .../Model/TypeParameterSymbolAdapter.cs | 6 +++--- .../Portable/Emitter/NoPia/EmbeddedEvent.cs | 2 +- .../Portable/Emitter/NoPia/EmbeddedField.cs | 4 ++-- .../Emitter/NoPia/EmbeddedParameter.cs | 8 ++++---- .../Emitter/NoPia/EmbeddedTypeParameter.cs | 4 ++-- .../Emitter/NoPia/EmbeddedTypesManager.cs | 2 +- .../FlowAnalysis/DataFlowsOutWalker.cs | 4 ++-- .../DefiniteAssignment.LocalFunctions.cs | 2 +- .../FlowAnalysis/EmptyStructTypeCache.cs | 2 +- .../Portable/FlowAnalysis/FlowAnalysisPass.cs | 2 +- .../Portable/FlowAnalysis/ReadWriteWalker.cs | 4 ++-- .../FlowAnalysis/VariablesDeclaredWalker.cs | 2 +- .../LambdaCapturedVariable.cs | 2 +- .../SynthesizedClosureMethod.cs | 4 ++-- .../Instrumentation/DebugInfoInjector.cs | 6 +++--- ...tateMachineRewriter.IteratorFinallyFrame.cs | 2 +- ...StateMachineRewriter.YieldsInTryAnalysis.cs | 2 +- .../IteratorMethodToStateMachineRewriter.cs | 8 ++++---- .../LocalRewriter/DynamicSiteContainer.cs | 2 +- .../LocalRewriter/LocalRewriter_Call.cs | 2 +- .../LocalRewriter/LocalRewriter_DoStatement.cs | 2 +- .../LocalRewriter/LocalRewriter_Event.cs | 2 +- .../LocalRewriter/LocalRewriter_IfStatement.cs | 2 +- ..._ObjectOrCollectionInitializerExpression.cs | 6 +++--- .../LocalRewriter/LocalRewriter_Range.cs | 6 +++--- .../LocalRewriter/LocalRewriter_StackAlloc.cs | 2 +- .../LocalRewriter_StringInterpolation.cs | 2 +- .../LocalRewriter_TupleCreationExpression.cs | 4 ++-- .../LocalRewriter_WhileStatement.cs | 2 +- .../Lowering/SynthesizedSubmissionFields.cs | 2 +- .../CSharp/Portable/Parser/Blender.Cursor.cs | 2 +- .../CSharp/Portable/Parser/LexerCache.cs | 2 +- .../Portable/Parser/Lexer_StringLiteral.cs | 4 ++-- .../SourceGeneration/CSharpGeneratorDriver.cs | 2 +- .../AnonymousType.SynthesizedMethodBase.cs | 2 +- .../Symbols/Attributes/AttributeData.cs | 6 +++--- .../Symbols/Attributes/SourceAttributeData.cs | 4 ++-- .../Portable/Symbols/ConstantValueUtils.cs | 2 +- .../Portable/Symbols/ConstraintsHelper.cs | 2 +- .../CSharp/Portable/Symbols/ErrorTypeSymbol.cs | 2 +- .../Symbols/Metadata/PE/PEEventSymbol.cs | 8 ++++---- .../Metadata/PE/PEGlobalNamespaceSymbol.cs | 10 +++++----- .../Symbols/Metadata/PE/PENamedTypeSymbol.cs | 2 +- .../Symbols/Metadata/PE/PENamespaceSymbol.cs | 4 ++-- .../Metadata/PE/PENestedNamespaceSymbol.cs | 2 +- .../Symbols/Metadata/PE/TupleTypeDecoder.cs | 4 ++-- .../Portable/Symbols/MethodSymbolExtensions.cs | 8 ++++---- .../Portable/Symbols/MissingModuleSymbol.cs | 4 ++-- .../Portable/Symbols/MissingNamespaceSymbol.cs | 2 +- .../Symbols/NonMissingAssemblySymbol.cs | 2 +- .../Symbols/OverriddenOrHiddenMembersResult.cs | 2 +- .../Portable/Symbols/PointerTypeSymbol.cs | 2 +- .../Portable/Symbols/ReferenceManager.cs | 5 ++--- .../Retargeting/RetargetingAssemblySymbol.cs | 8 ++++---- .../Retargeting/RetargetingEventSymbol.cs | 8 ++++---- .../Retargeting/RetargetingFieldSymbol.cs | 2 +- .../Retargeting/RetargetingNamespaceSymbol.cs | 6 +++--- .../Retargeting/RetargetingSymbolTranslator.cs | 2 +- .../RetargetingTypeParameterSymbol.cs | 4 ++-- .../Symbols/SignatureOnlyMethodSymbol.cs | 4 ++-- .../Symbols/Source/CustomModifierUtils.cs | 4 ++-- .../Symbols/Source/SourceEventSymbol.cs | 8 ++++---- .../Symbols/Source/SourceMemberFieldSymbol.cs | 8 ++++---- .../Source/SourceNamedTypeSymbol_Bases.cs | 4 ++-- .../Portable/Symbols/SubstitutedFieldSymbol.cs | 2 +- .../Portable/Symbols/SymbolCompletionState.cs | 4 ++-- .../Portable/Symbols/SymbolDistinguisher.cs | 4 ++-- .../Synthesized/SynthesizedContainer.cs | 2 +- .../SynthesizedEmbeddedAttributeSymbol.cs | 6 +++--- .../SynthesizedEnumValueFieldSymbol.cs | 2 +- .../Synthesized/SynthesizedFieldSymbolBase.cs | 2 +- .../SynthesizedInteractiveInitializerMethod.cs | 4 ++-- .../SynthesizedIntrinsicOperatorSymbol.cs | 2 +- .../Symbols/SynthesizedNamespaceSymbol.cs | 4 ++-- .../Symbols/Tuples/TupleFieldSymbol.cs | 2 +- .../Symbols/Wrapped/WrappedParameterSymbol.cs | 2 +- .../Portable/Syntax/EventDeclarationSyntax.cs | 2 +- .../Syntax/IndexerDeclarationSyntax.cs | 2 +- .../SyntaxToken.SyntaxLiteral.cs | 2 +- .../Syntax/PropertyDeclarationSyntax.cs | 2 +- .../Emit/Attributes/AttributeTests_Embedded.cs | 2 +- .../Attributes/AttributeTests_IsUnmanaged.cs | 6 +++--- .../AttributeTests_ReadOnlyStruct.cs | 4 ++-- .../Attributes/EmitTestStrongNameProvider.cs | 2 +- .../Attributes/WellKnownAttributesTestBase.cs | 6 +++--- .../Test/Emit/CodeGen/CodeGenCapturing.cs | 12 ++++++------ .../Test/Emit/CodeGen/CodeGenIterators.cs | 2 +- .../Test/Emit/CodeGen/CodeGenOperators.cs | 4 ++-- .../Test/Emit/CodeGen/CodeGenTupleTest.cs | 2 +- .../CSharp/Test/Emit/CodeGen/EventTests.cs | 4 ++-- .../Test/Emit/CodeGen/FixedSizeBufferTests.cs | 4 ++-- .../Test/Emit/CodeGen/WinMdDelegateTests.cs | 8 ++++---- .../Test/Emit/Emit/DeterministicTests.cs | 6 +++--- .../DynamicInstrumentationTests.cs | 2 +- .../Test/Emit/Emit/EmitCustomModifiers.cs | 2 +- .../CSharp/Test/Emit/Emit/EmitErrorTests.cs | 4 ++-- .../CSharp/Test/Emit/Emit/EndToEndTests.cs | 8 ++++---- .../CSharp/Test/Emit/Emit/ResourceTests.cs | 2 +- .../CSharp/Test/Emit/PrivateProtected.cs | 4 ++-- .../IOperationTests_ISymbolInitializer.cs | 2 +- .../IOperationTests_InvalidExpression.cs | 2 +- .../IOperationTests_InvalidStatement.cs | 2 +- .../Diagnostics/OperationAnalyzerTests.cs | 2 +- .../Test/Semantic/FlowAnalysis/StructTests.cs | 2 +- .../Semantic/Semantics/AwaitExpressionTests.cs | 2 +- .../Semantic/Semantics/BetterCandidates.cs | 6 +++--- .../Test/Semantic/Semantics/BindingTests.cs | 2 +- .../Test/Semantic/Semantics/DynamicTests.cs | 8 ++++---- .../Semantics/ExpressionBodiedMemberTests.cs | 2 +- .../Test/Semantic/Semantics/FuzzTests.cs | 2 +- .../Test/Semantic/Semantics/ImportsTests.cs | 2 +- .../Semantics/InteractiveUsingTests.cs | 2 +- .../Semantic/Semantics/InterpolationTests.cs | 2 +- .../Test/Semantic/Semantics/IteratorTests.cs | 10 +++++----- .../Semantic/Semantics/LocalFunctionTests.cs | 6 +++--- .../Semantics/MemberResolutionResultTests.cs | 2 +- .../Test/Semantic/Semantics/NameLengthTests.cs | 4 ++-- .../Test/Semantic/Semantics/NameOfTests.cs | 4 ++-- .../Test/Semantic/Semantics/OperatorTests.cs | 4 ++-- .../Test/Semantic/Semantics/OutVarTests.cs | 4 ++-- .../Semantics/OverloadResolutionPerfTests.cs | 4 ++-- .../Semantics/OverloadResolutionTestBase.cs | 10 +++++----- .../Semantics/PatternMatchingTestBase.cs | 2 +- .../Semantics/PatternMatchingTests_Global.cs | 2 +- .../Semantic/Semantics/PropertyAccessTests.cs | 4 ++-- .../Semantic/Semantics/ReadOnlyStructsTests.cs | 2 +- .../Semantics/RefExtensionMethodsTests.cs | 2 +- .../Semantics/RefLocalsAndReturnsTests.cs | 10 +++++----- .../Test/Semantic/Semantics/StructsTests.cs | 2 +- .../Test/Semantic/Semantics/SwitchTests.cs | 2 +- .../Semantic/Semantics/SyntaxTreeRootTests.cs | 6 +++--- .../Semantics/TargetTypedDefaultTests.cs | 4 ++-- .../Test/Semantic/Semantics/TypeOfTests.cs | 2 +- .../Semantic/Semantics/WarningVersionTests.cs | 2 +- .../Symbol/Compilation/CompilationAPITests.cs | 6 +++--- .../Symbol/Compilation/QueryClauseInfoTests.cs | 2 +- .../Symbols/AnonymousTypesSymbolTests.cs | 6 +++--- .../Symbol/Symbols/ExtensionMethodTests.cs | 2 +- .../Symbols/Metadata/PE/BaseTypeResolution.cs | 6 +++--- .../Symbols/Metadata/PE/LoadingEvents.cs | 4 ++-- .../Symbols/Metadata/PE/LoadingFields.cs | 4 ++-- .../Symbols/Metadata/PE/LoadingIndexers.cs | 2 +- .../Symbols/Metadata/PE/LoadingMethods.cs | 4 ++-- .../Test/Symbol/Symbols/Retargeting/NoPia.cs | 2 +- .../Retargeting/RetargetCustomAttributes.cs | 2 +- .../Retargeting/RetargetCustomModifiers.cs | 4 ++-- .../Symbols/Retargeting/RetargetingTests.cs | 2 +- .../Symbol/Symbols/Source/BaseClassTests.cs | 2 +- .../Test/Symbol/Symbols/Source/EventTests.cs | 4 ++-- .../Source/ExpressionBodiedPropertyTests.cs | 4 ++-- .../Test/Symbol/Symbols/Source/MethodTests.cs | 2 +- .../Symbol/Symbols/Source/PropertyTests.cs | 4 ++-- .../Symbol/Symbols/Source/UsingAliasTests.cs | 2 +- .../Symbol/Symbols/SymbolExtensionTests.cs | 2 +- .../Test/Symbol/Symbols/TypedConstantTests.cs | 2 +- .../DiagnosticTest.MockSyntaxTree.cs | 6 +++--- .../Syntax/LexicalAndXml/XmlDocCommentTests.cs | 4 ++-- .../Test/Syntax/Parsing/AsyncParsingTests.cs | 2 +- .../Test/Syntax/Parsing/CrefParsingTests.cs | 4 ++-- .../Parsing/LocalFunctionParsingTests.cs | 2 +- .../Syntax/Parsing/ParserRegressionTests.cs | 6 +++--- .../Test/Syntax/Parsing/ReadOnlyStructs.cs | 2 +- .../Test/Syntax/Parsing/RefReadonlyTests.cs | 2 +- .../CSharp/Test/Syntax/Parsing/RefStructs.cs | 2 +- .../StackAllocInitializerParsingTests.cs | 2 +- .../Test/Syntax/Parsing/ValueTupleTests.cs | 2 +- .../Test/Syntax/Syntax/ChildSyntaxListTests.cs | 2 +- .../Test/Syntax/Syntax/SyntaxFactoryTests.cs | 2 +- .../Test/Syntax/Syntax/SyntaxListTests.cs | 6 +++--- .../Syntax/SyntaxNodeOrTokenListTests.cs | 2 +- .../Test/Syntax/Syntax/SyntaxNodeTests.cs | 2 +- .../Syntax/Syntax/SyntaxNormalizerTests.cs | 2 +- .../Test/Syntax/Syntax/SyntaxTokenListTests.cs | 2 +- .../Syntax/Syntax/SyntaxTriviaListTests.cs | 2 +- .../Test/WinRT/CodeGen/WinRTCollectionTests.cs | 4 ++-- .../Test/WinRT/Metadata/WinMdEventTests.cs | 4 ++-- .../Test/WinRT/Metadata/WinMdMetadataTests.cs | 8 ++------ .../Core/CodeAnalysisTest/CommonSyntaxTests.cs | 2 +- .../CommonTypedConstantTests.cs | 6 +++--- .../CodeAnalysisTest/CryptoBlobParserTests.cs | 2 +- ...SuppressMessageTargetSymbolResolverTests.cs | 4 ++-- .../Core/CodeAnalysisTest/EmbeddedTextTests.cs | 8 ++++---- .../SpecializedCollectionsTests.cs | 2 +- .../InternalUtilities/StreamExtensionsTests.cs | 4 ++-- .../AssemblyMetadataTests.cs | 2 +- .../FusionAssemblyIdentityTests.cs | 2 +- .../FusionAssemblyPortabilityPolicy.cs | 4 ++-- .../MetadataReferenceTests.cs | 2 +- .../MetadataReferences/ModuleMetadataTests.cs | 4 ++-- .../CodeAnalysisTest/SourceFileResolverTest.cs | 4 ++-- .../CodeAnalysisTest/Text/StringTextTest.cs | 10 +++++----- .../CodeAnalysisTest/VersionHelperTests.cs | 2 +- .../Core/CodeAnalysisTest/Win32Res.cs | 6 +++--- .../Core/CommandLine/BuildProtocol.cs | 2 +- .../Core/CommandLine/CompilerServerLogger.cs | 2 +- src/Compilers/Core/CommandLine/ConsoleUtil.cs | 2 +- src/Compilers/Core/MSBuildTask/Csc.cs | 2 +- .../Core/MSBuildTask/ManagedCompiler.cs | 4 ++-- .../Core/MSBuildTask/RCWForCurrentContext.cs | 2 +- src/Compilers/Core/MSBuildTask/Utilities.cs | 4 ++-- src/Compilers/Core/MSBuildTask/Vbc.cs | 6 +++--- .../Core/MSBuildTaskTests/CscTests.cs | 6 +++--- .../Core/MSBuildTaskTests/MiscTests.cs | 6 +++--- .../Core/MSBuildTaskTests/TargetTests.cs | 2 +- .../TestUtilities/MSBuildUtil.cs | 4 ++-- .../Core/Portable/CodeGen/ArrayMembers.cs | 4 ++-- .../Portable/CodeGen/CompilationTestData.cs | 6 +++--- .../Portable/CodeGen/PermissionSetAttribute.cs | 10 +++++----- ...tchIntegralJumpTableEmitter.SwitchBucket.cs | 2 +- .../Collections/IdentifierCollection.cs | 2 +- .../Portable/Collections/UnionCollection.cs | 4 ++-- .../Portable/CommandLine/TouchedFileLogger.cs | 2 +- .../Compilation/PreprocessingSymbolInfo.cs | 2 +- .../Core/Portable/Compilation/SymbolInfo.cs | 2 +- src/Compilers/Core/Portable/CvtRes.cs | 6 +++--- .../Metadata/MetadataAdapterBase.cs | 2 +- .../Metadata/SymWriterMetadataAdapter.cs | 4 ++-- .../DiaSymReader/Utilities/ComMemoryStream.cs | 4 ++-- .../Core/Portable/Diagnostic/DiagnosticBag.cs | 2 +- .../Core/Portable/Diagnostic/DiagnosticInfo.cs | 2 +- .../Core/Portable/Diagnostic/XmlLocation.cs | 6 +++--- .../Core/Portable/Emit/AnonymousTypeValue.cs | 2 +- .../Portable/Emit/DebugDocumentsBuilder.cs | 2 +- .../EditAndContinue/DeltaMetadataWriter.cs | 4 ++-- .../Emit/EditAndContinue/SymbolChanges.cs | 6 +++--- .../Emit/NoPia/CommonEmbeddedMethod.cs | 2 +- .../Portable/Emit/NoPia/CommonEmbeddedType.cs | 6 +++--- .../Emit/NoPia/CommonEmbeddedTypeParameter.cs | 2 +- .../Emit/NoPia/EmbeddedTypesManager.cs | 6 +++--- .../Core/Portable/Emit/NoPia/VtblGap.cs | 2 +- .../Core/Portable/Emit/SemanticEdit.cs | 2 +- .../FileSystem/RelativePathResolver.cs | 2 +- .../InternalUtilities/AssemblyIdentityUtils.cs | 2 +- .../InternalUtilities/BlobBuildingStream.cs | 2 +- .../InternalUtilities/EncodingExtensions.cs | 2 +- .../Portable/InternalUtilities/EnumField.cs | 2 +- .../InternalUtilities/IsExternalInit.cs | 2 +- .../Portable/InternalUtilities/JsonWriter.cs | 2 +- .../Portable/InternalUtilities/OneOrMany.cs | 2 +- .../InternalUtilities/SpanUtilities.cs | 2 +- .../InternalUtilities/TextKeyedCache.cs | 4 ++-- .../Core/Portable/MemberDescriptor.cs | 2 +- .../MetadataTypeCodeExtensions.cs | 2 +- .../Core/Portable/MetadataReader/PEAssembly.cs | 2 +- .../MetadataReference/AssemblyMetadata.cs | 4 ++-- .../MetadataReferenceProperties.cs | 2 +- .../PortableExecutableReference.cs | 4 ++-- .../MetadataReference/ReferenceDirective.cs | 2 +- ...uilder.ConditionalAccessOperationTracker.cs | 2 +- .../Operations/Operation.Enumerable.cs | 8 ++++---- .../Core/Portable/Operations/Operation.cs | 2 +- .../Portable/Operations/OperationMapBuilder.cs | 2 +- src/Compilers/Core/Portable/OutputKind.cs | 2 +- .../Portable/PEWriter/DebugSourceDocument.cs | 6 +++--- .../Core/Portable/PEWriter/DebugSourceInfo.cs | 4 ++-- .../Portable/PEWriter/ExtendedPEBuilder.cs | 2 +- .../PEWriter/ITypeReferenceExtensions.cs | 2 +- .../Core/Portable/PEWriter/MetadataVisitor.cs | 6 +++--- .../Portable/PEWriter/PooledBlobBuilder.cs | 2 +- .../Core/Portable/PEWriter/ReferenceIndexer.cs | 2 +- .../Portable/PEWriter/ReferenceIndexerBase.cs | 2 +- .../Portable/PEWriter/TypeNameSerializer.cs | 4 ++-- .../Core/Portable/ResourceDescription.cs | 8 ++++---- .../Core/Portable/RuleSet/RuleSetProcessor.cs | 2 +- .../Portable/Serialization/ObjectReader.cs | 2 +- .../Portable/Serialization/ObjectWriter.cs | 2 +- .../Portable/StrongName/CryptoBlobParser.cs | 4 ++-- .../Portable/SymbolDisplay/FormattedSymbol.cs | 4 ++-- .../Symbols/Attributes/AttributeDescription.cs | 2 +- .../CommonAssemblyWellKnownAttributeData.cs | 2 +- .../Symbols/Attributes/CustomAttributesBag.cs | 2 +- .../MarshalPseudoCustomAttributeData.cs | 4 ++-- .../Core/Portable/Symbols/IModuleSymbol.cs | 2 +- .../SyntaxList.WithLotsOfChildren.cs | 2 +- .../Syntax/InternalSyntax/SyntaxNodeCache.cs | 3 +-- .../Core/Portable/Syntax/LineDirectiveMap.cs | 2 +- src/Compilers/Core/Portable/Text/LargeText.cs | 2 +- src/Compilers/Core/Portable/TreeDumper.cs | 2 +- .../Core/Rebuild/MetadataCompilationOptions.cs | 4 ++-- .../CompilationOptionsReaderTests.cs | 6 +++--- .../Core/RebuildTest/RoundTripUtil.cs | 4 ++-- .../VBCSCompiler/AnalyzerConsistencyChecker.cs | 4 ++-- .../VBCSCompiler/BuildServerController.cs | 6 +++--- .../Server/VBCSCompiler/CompletionData.cs | 4 ++-- .../VBCSCompiler/NamedPipeClientConnection.cs | 4 ++-- .../Server/VBCSCompiler/ServerDispatcher.cs | 4 ++-- .../Server/VBCSCompiler/VBCSCompiler.cs | 2 +- .../VBCSCompilerTests/BuildClientTests.cs | 17 ++++++++--------- .../ClientConnectionHandlerTests.cs | 8 ++++---- .../VBCSCompilerTests/CompilerServerApiTest.cs | 10 +++++----- .../VBCSCompilerTests/NamedPipeTestUtil.cs | 2 +- .../Server/VBCSCompilerTests/ServerUtil.cs | 7 +++---- .../TestableClientConnectionHost.cs | 2 +- .../TestableCompilerServerHost.cs | 2 +- .../TouchedFileLoggingTests.cs | 8 ++++---- .../VBCSCompilerServerTests.cs | 6 +++--- src/Compilers/Shared/CoreClrShim.cs | 2 +- .../Core/Diagnostics/DiagnosticDescription.cs | 6 +++--- .../Diagnostics/TrackingDiagnosticAnalyzer.cs | 2 +- .../Test/Core/MarkedSource/MarkupTestFile.cs | 2 +- .../Test/Core/Metadata/ILBuilderVisualizer.cs | 6 +++--- src/Compilers/Test/Core/Mocks/MoqExtensions.cs | 2 +- .../CoreClr/CoreCLRRuntimeEnvironment.cs | 2 +- .../Test/Core/Syntax/SourceUtilities.cs | 2 +- src/Compilers/Test/Core/TargetFrameworkUtil.cs | 2 +- .../Test/Core/TempFiles/DisposableFile.cs | 2 +- src/Compilers/Test/Core/TempFiles/TempFile.cs | 6 +++--- src/Compilers/Test/Core/TestBase.cs | 4 ++-- .../Core/Traits/CompilerTraitDiscoverer.cs | 2 +- src/Compilers/Test/Core/Win32Res.cs | 4 ++-- .../Utilities/CSharp/BasicCompilationUtils.cs | 2 +- .../Utilities/CSharp/CompilationTestUtils.cs | 18 +++++++++--------- .../Test/Utilities/CSharp/TestOptions.cs | 2 +- .../VisualBasic/ParserTestUtilities.vb | 4 ++-- .../Test/Utilities/VisualBasic/VBParser.vb | 2 +- .../Analysis/FlowAnalysis/AbstractFlowPass.vb | 2 +- .../IteratorAndAsyncCaptureWalker.vb | 2 +- .../Binding/Binder_DocumentationComments.vb | 2 +- .../Binding/DocumentationCommentBinder.vb | 2 +- .../Binding/DocumentationCommentCrefBinder.vb | 4 ++-- .../DocumentationCommentCrefBinder_Compat.vb | 2 +- ...entationCommentCrefBinder_TypeParameters.vb | 2 +- .../Binding/DocumentationCommentParamBinder.vb | 2 +- .../DocumentationCommentTypeParamBinder.vb | 2 +- .../DocumentationCommentTypeParamRefBinder.vb | 2 +- .../Portable/Binding/MemberSemanticModel.vb | 2 +- .../Portable/BoundTree/BoundLateInvocation.vb | 2 +- .../Portable/BoundTree/BoundMethodGroup.vb | 4 ++-- .../Portable/BoundTree/Statement.vb | 2 +- .../DocumentationComments/DocWriter.vb | 2 +- .../DocumentationCommentCompiler.Event.vb | 2 +- .../DocumentationCommentCompiler.Field.vb | 2 +- .../DocumentationCommentCompiler.Includes.vb | 2 +- .../DocumentationCommentCompiler.Method.vb | 2 +- .../DocumentationCommentCompiler.NamedType.vb | 2 +- .../DocumentationCommentCompiler.Namespace.vb | 2 +- .../DocumentationCommentCompiler.Property.vb | 2 +- .../DocumentationCommentCompiler.vb | 4 ++-- .../DocumentationCommentWalker.vb | 2 +- .../UnprocessedDocumentationCommentFinder.vb | 4 ++-- .../Compilation/NamespaceScopeBuilder.vb | 2 +- .../Portable/Compilation/SemanticModel.vb | 2 +- .../Compilation/SyntaxTreeSemanticModel.vb | 2 +- .../Compilation/VisualBasicDiagnosticFilter.vb | 2 +- .../PEDocumenationCommentUtils.vb | 2 +- .../Emit/NoPia/EmbeddedTypesManager.vb | 4 ++-- .../VisualBasic/Portable/Parser/ParseScan.vb | 4 ++-- .../VisualBasic/Portable/Scanner/Scanner.vb | 4 ++-- .../Portable/Semantics/AccessCheck.vb | 5 ++--- .../Symbols/AccessibilityExtensions.vb | 2 +- .../Portable/Symbols/ArrayTypeSymbol.vb | 2 +- .../Portable/Symbols/AssemblySymbol.vb | 6 +++--- .../Symbols/Attributes/PEAttributeData.vb | 2 +- .../Symbols/Attributes/SourceAttributeData.vb | 4 ++-- .../Portable/Symbols/BaseTypeAnalysis.vb | 2 +- .../Symbols/Metadata/PE/PEAssemblySymbol.vb | 2 +- .../Symbols/Metadata/PE/PEEventSymbol.vb | 2 +- .../Symbols/Metadata/PE/PEFieldSymbol.vb | 4 ++-- .../Metadata/PE/PEGlobalNamespaceSymbol.vb | 2 +- .../Symbols/Metadata/PE/PEMethodSymbol.vb | 4 ++-- .../Symbols/Metadata/PE/PENamedTypeSymbol.vb | 6 +++--- .../Metadata/PE/PENestedNamespaceSymbol.vb | 2 +- .../Symbols/Metadata/PE/PEParameterSymbol.vb | 4 ++-- .../Symbols/Metadata/PE/PEPropertySymbol.vb | 2 +- .../Metadata/PE/PETypeParameterSymbol.vb | 4 ++-- .../Portable/Symbols/NamedTypeSymbol.vb | 2 +- .../Portable/Symbols/NamespaceOrTypeSymbol.vb | 2 +- .../Portable/Symbols/NamespaceSymbol.vb | 2 +- .../Retargeting/RetargetingAssemblySymbol.vb | 6 +++--- .../Retargeting/RetargetingModuleSymbol.vb | 6 +++--- .../Retargeting/RetargetingSymbolTranslator.vb | 2 +- .../Source/SourceSimpleParameterSymbol.vb | 2 +- .../Portable/Symbols/TypeParameterSymbol.vb | 2 +- .../VisualBasic/Portable/Symbols/TypeSymbol.vb | 2 +- .../Symbols/UnsupportedMetadataTypeSymbol.vb | 2 +- .../Portable/Syntax/LambdaUtilities.vb | 2 +- .../Portable/Syntax/SyntaxFactory.vb | 4 ++-- .../Portable/Syntax/SyntaxNodeFactories.vb | 8 ++++---- .../CommandLine/CommandLineBreakingChanges.vb | 2 +- .../Test/CommandLine/SarifErrorLoggerTests.vb | 4 ++-- .../CommandLine/SarifV1ErrorLoggerTests.vb | 4 ++-- .../CommandLine/SarifV2ErrorLoggerTests.vb | 2 +- .../CommandLine/TouchedFileLoggingTests.vb | 2 +- .../Attributes/AttributeTests_Conditional.vb | 2 +- .../Attributes/AttributeTests_MarshalAs.vb | 2 +- .../Emit/Attributes/AttributeTests_Tuples.vb | 2 +- .../Test/Emit/CodeGen/CodeGenNullable.vb | 2 +- .../Test/Emit/CodeGen/CodeGenTuples.vb | 2 +- .../Test/Emit/CodeGen/CodeGenWinMdDelegates.vb | 4 ++-- .../Test/Emit/Emit/DeterministicTests.vb | 4 ++-- .../EditAndContinue/AssemblyReferencesTests.vb | 4 ++-- .../EditAndContinue/EditAndContinuePdbTests.vb | 4 ++-- .../Emit/EditAndContinue/SymbolMatcherTests.vb | 8 ++++---- .../Test/Emit/Emit/NoPiaEmbedTypes.vb | 14 +++++++------- .../VisualBasic/Test/Emit/PDB/ChecksumTests.vb | 6 +++--- .../Test/Emit/PDB/PDBConstLocalTests.vb | 2 +- .../Test/Emit/PDB/PDBLambdaTests.vb | 2 +- .../Test/Emit/PDB/PDBWinMdExpTests.vb | 2 +- .../IOperation/IOperationTests_IArgument.vb | 4 ++-- ...onTests_IArrayElementReferenceExpression.vb | 2 +- .../IOperationTests_IAwaitExpression.vb | 2 +- ...OperationTests_IBinaryOperatorExpression.vb | 2 +- ...rationTests_IBlockStatement_MethodBlocks.vb | 2 +- ...rationTests_ICompoundAssignmentOperation.vb | 4 ++-- .../IOperationTests_IConversionExpression.vb | 4 ++-- ...rationTests_IDynamicInvocationExpression.vb | 2 +- ...nTests_IDynamicMemberReferenceExpression.vb | 2 +- .../IOperation/IOperationTests_IIfStatement.vb | 2 +- ...ationTests_IInterpolatedStringExpression.vb | 2 +- ...ationTests_INoPiaObjectCreationOperation.vb | 2 +- ...OperationTests_IObjectCreationExpression.vb | 2 +- .../IOperationTests_IReturnStatement.vb | 2 +- .../IOperationTests_ITupleExpression.vb | 2 +- .../IOperationTests_ITypeOfExpression.vb | 2 +- ...IOperationTests_IUnaryOperatorExpression.vb | 2 +- .../IOperationTests_IUsingStatement.vb | 4 ++-- .../IOperationTests_IVariableDeclaration.vb | 2 +- .../IOperationTests_IWithStatement.vb | 2 +- .../IOperation/IOperationTests_TryCatch.vb | 2 +- .../Binding/Binder_Statements_Tests.vb | 2 +- .../Test/Semantic/Binding/LookupTests.vb | 2 +- .../Compilation/CompilationAPITests.vb | 2 +- .../FlowAnalysis/FlowDiagnosticTests.vb | 2 +- .../Test/Semantic/Semantics/AsyncAwait.vb | 3 +-- .../Semantic/Semantics/GetSemanticInfoTests.vb | 3 +-- .../Test/Semantic/Semantics/MethodCalls.vb | 2 +- .../Test/Semantic/Semantics/NameLengthTests.vb | 6 +++--- .../DocumentationComments/DocCommentTests.vb | 10 +++++----- .../AnonymousTypesEmittedSymbolsTests.vb | 3 +-- .../AnonymousTypesSemanticsTests.vb | 3 +-- .../SymbolsTests/AssemblyAndNamespaceTests.vb | 2 +- .../Symbol/SymbolsTests/CorLibrary/Choosing.vb | 2 +- .../InterfaceImplementationTests.vb | 2 +- .../Metadata/PE/BaseTypeResolution.vb | 2 +- .../Metadata/PE/HasUnsupportedMetadata.vb | 2 +- .../Metadata/PE/LoadCustomModifiers.vb | 4 ++-- .../Metadata/PE/LoadingAttributes.vb | 2 +- .../SymbolsTests/Metadata/PE/LoadingEvents.vb | 2 +- .../SymbolsTests/Metadata/PE/LoadingFields.vb | 2 +- .../Metadata/PE/LoadingWithEvents.vb | 2 +- .../Symbol/SymbolsTests/Metadata/PE/NoPia.vb | 2 +- ...oPiaInstantiationOfGenericClassAndStruct.vb | 2 +- .../NoPiaLocalHideAndTypeSubstitutionTests.vb | 4 ++-- .../SymbolsTests/Metadata/WinMdEventTest.vb | 3 +-- .../SymbolsTests/Metadata/WinMdTypeTests.vb | 2 +- .../MyBaseMyClassSemanticsTests.vb | 3 +-- .../Symbol/SymbolsTests/Retargeting/NoPia.vb | 4 ++-- .../Retargeting/RetargetCustomModifiers.vb | 6 +++--- .../Retargeting/RetargetingCustomAttributes.vb | 4 ++-- .../Retargeting/RetargetingTests.vb | 2 +- .../SymbolsTests/Source/BaseClassTests.vb | 2 +- .../Symbol/SymbolsTests/Source/EventTests.vb | 3 +-- .../SymbolsTests/Source/GroupClassTests.vb | 2 +- .../SymbolsTests/Source/PropertyTests.vb | 2 +- .../SymbolsTests/Source/SyntheticEntryPoint.vb | 2 +- .../SymbolsTests/WithStatementSymbolsTests.vb | 3 +-- .../Test/Syntax/Syntax/GeneratedTests.vb | 2 +- .../Test/Syntax/Syntax/SerializationTests.vb | 2 +- .../ConvertAnonymousTypeToClassTests.cs | 4 ++-- .../ProximityExpressionsGetterTests.cs | 2 +- .../EditAndContinue/ActiveStatementTests.cs | 8 ++++---- .../ExtractMethod/ExtractMethodBase.cs | 2 +- .../MakeMemberStatic/MakeMemberStaticTests.cs | 2 +- .../PullMemberUp/CSharpPullMemberUpTests.cs | 10 +++++----- .../FindDerivedSymbolsCommandHandler.cs | 4 ++-- .../FindMemberOverloadsCommandHandler.cs | 6 +++--- ...ractiveCommandContentTypeLanguageService.cs | 6 +++--- .../Interactive/InteractiveCommandHandler.cs | 10 +++++----- .../InteractiveSupportsFeatureService.cs | 6 +++--- .../InteractiveWindowResetCommand.cs | 3 +-- .../Core.Wpf/Interactive/ResetInteractive.cs | 11 +++++------ ...eviewReferenceHighlightingTaggerProvider.cs | 6 +++--- .../PreviewWarningViewTaggerProvider.cs | 6 +++--- ...VSTypeScriptFormattingInteractionService.cs | 2 +- .../VSTypeScriptEditorInlineRenameService.cs | 8 ++++---- ...VSTypeScriptFormattingInteractionService.cs | 4 ++-- .../ISendToInteractiveSubmissionProvider.cs | 2 +- .../SendToInteractiveSubmissionProvider.cs | 10 +++++----- .../Core/Undo/EditorSourceTextUndoService.cs | 4 ++-- ...isualBasicCodeRefactoringVerifier`1+Test.cs | 4 ++-- .../Diagnostics/AbstractUserDiagnosticTest.cs | 4 ++-- .../CodeFixExceptionInRegisterMethodAsync.cs | 2 +- .../EditSessionActiveStatementsTests.cs | 6 +++--- .../AbstractBaseValueTrackingTests.cs | 8 ++++---- .../GoToImplementationTests.vb | 4 ++-- .../Test2/Rename/CSharp/AliasTests.vb | 2 +- .../AbstractArgumentProviderTests`1.cs | 2 +- .../TestDiagnosticAnalyzerDriver.cs | 2 +- .../ActiveStatementTestHelpers.cs | 4 ++-- .../TextEditorFactoryExtensions.cs | 4 ++-- .../Intellisense/TestStateFactory.vb | 2 +- .../DocumentationCommentCommandHandler.vb | 2 +- .../AddFileBanner/AddFileBannerTests.vb | 2 +- .../AutomaticBraceCompletionTests.vb | 4 ++-- .../AutomaticBracketCompletionTests.vb | 4 ++-- ...erpolatedStringExpressionCompletionTests.vb | 4 ++-- .../AutomaticInterpolationCompletionTests.vb | 4 ++-- ...tomaticLessAndGreaterThanCompletionTests.vb | 4 ++-- .../AutomaticParenthesesCompletion.vb | 4 ++-- .../AutomaticStringLiteralCompletionTests.vb | 4 ++-- ...iagnosticProviderBasedUserDiagnosticTest.vb | 4 ++-- .../GenerateEndConstructTests.vb | 2 +- .../GenerateEnumMemberTests.vb | 2 +- .../GenerateEvent/GenerateEventTests.vb | 2 +- .../GenerateMethod/GenerateMethodTests.vb | 2 +- .../Diagnostics/Spellcheck/SpellcheckTests.vb | 2 +- .../VisualBasicEditAndContinueTestHelpers.vb | 6 +++--- .../StatementSyntaxExtensionTests.vb | 4 ++-- .../IntroduceUsingStatementTests.vb | 2 +- .../Binders/WithTypeArgumentsBinder.cs | 4 ++-- .../ExpressionCompiler/CSharpFrameDecoder.cs | 2 +- .../CSharpLanguageInstructionDecoder.cs | 2 +- .../ExpressionCompiler/CompilationContext.cs | 14 +++++++------- .../ExpressionCompiler/EEAssemblyBuilder.cs | 8 ++++---- .../Rewriters/CapturedVariableRewriter.cs | 4 ++-- .../Rewriters/LocalDeclarationRewriter.cs | 6 +++--- .../Rewriters/PlaceholderLocalRewriter.cs | 2 +- .../Symbols/DisplayClassInstance.cs | 2 +- .../Symbols/DisplayClassVariable.cs | 4 ++-- .../Symbols/EEDisplayClassFieldLocalSymbol.cs | 2 +- .../Symbols/ObjectIdLocalSymbol.cs | 4 ++-- .../Symbols/ReturnValueLocalSymbol.cs | 2 +- .../Symbols/SimpleTypeParameterSymbol.cs | 4 ++-- .../Source/ExpressionCompiler/SyntaxHelpers.cs | 6 +++--- .../ExpressionCompiler/AccessibilityTests.cs | 6 +++--- .../ExpressionCompilerTests.cs | 2 +- .../InstructionDecoderTests.cs | 2 +- .../Test/ResultProvider/AccessibilityTests.cs | 2 +- .../CSharpResultProviderTestBase.cs | 2 +- .../DebuggerTypeProxyAttributeTests.cs | 4 ++-- .../Test/ResultProvider/DynamicViewTests.cs | 2 +- .../Test/ResultProvider/FullNameTests.cs | 2 +- .../ResultProvider/FunctionPointerTests.cs | 4 ++-- .../Test/ResultProvider/ObjectIdTests.cs | 2 +- .../CSharp/Test/ResultProvider/TupleTests.cs | 6 +++--- .../TypeVariablesExpansionTests.cs | 2 +- .../ExpressionCompiler/AssemblyReference.cs | 4 ++-- .../ExpressionCompiler/CustomTypeInfo.cs | 4 ++-- .../ExpressionCompiler/LocalAndMethod.cs | 2 +- .../PseudoVariableUtilities.cs | 6 +++--- .../CSharp/MemberSignatureParser.cs | 2 +- .../Source/FunctionResolver/CSharp/Scanner.cs | 2 +- .../FunctionResolver/FunctionResolverBase.cs | 2 +- .../FunctionResolver/MetadataResolver.cs | 2 +- .../VisualBasic/MemberSignatureParser.cs | 2 +- .../FunctionResolver/VisualBasic/Scanner.cs | 2 +- .../Expansion/DebuggerTypeProxyExpansion.cs | 4 ++-- .../Expansion/NativeViewExpansion.cs | 2 +- .../ResultProvider/Expansion/TupleExpansion.cs | 6 +++--- .../Helpers/CustomTypeInfoTypeArgumentMap.cs | 2 +- .../ResultProvider/Helpers/ValueHelpers.cs | 4 ++-- .../ExpressionCompilerTestHelpers.cs | 5 ++--- .../NamespaceTypeDefinitionNoBase.cs | 4 ++-- .../CSharpFunctionResolverTests.cs | 4 ++-- .../FunctionResolverTestBase.cs | 4 ++-- .../Test/FunctionResolver/ParsingTestBase.cs | 4 ++-- .../VisualBasicFunctionResolverTests.cs | 2 +- .../VisualBasicParsingTests.cs | 6 +++--- .../Debugger/Engine/DkmClrModuleInstance.cs | 4 ++-- .../Test/ResultProvider/ReflectionUtilities.cs | 2 +- .../ResultProvider/ResultProviderTestBase.cs | 2 +- .../ExpressionCompiler/EEAssemblyBuilder.vb | 8 ++++---- .../VisualBasicEESymbolProvider.vb | 4 ++-- .../VisualBasicInstructionDecoder.vb | 2 +- .../Test/ExpressionCompiler/LocalsTests.vb | 2 +- .../ResultPropertiesTests.vb | 2 +- .../Test/ResultProvider/ResultsViewTests.vb | 2 +- .../Test/ResultProvider/TupleTests.vb | 2 +- .../TypeVariablesExpansionTests.vb | 2 +- ...eBaseCodeFixProvider.AddNewKeywordAction.cs | 4 ++-- .../RefKeywordRecommender.cs | 2 +- .../StringKeywordRecommender.cs | 2 +- .../Portable/Debugging/BreakpointResolver.cs | 2 +- .../Pythia/PythiaSignatureHelpProvider.cs | 4 ++-- ...AddParameterCheckCodeRefactoringProvider.cs | 2 +- .../InternalUtilities/InternalExtensions.cs | 4 ++-- .../SignatureHelp/SignatureHelpUtilities.cs | 2 +- ...harpUsePatternCombinatorsCodeFixProvider.cs | 2 +- .../Core/Portable/CodeCleanup/DiagnosticSet.cs | 2 +- .../AbstractDirectivePathCompletionProvider.cs | 8 ++++---- ...eScriptDiagnosticAnalyzerLanguageService.cs | 2 +- .../VSTypeScriptDiagnosticAnalyzerService.cs | 6 +++--- .../MetadataAsSourceFileService.cs | 2 +- ...AbstractReplaceMethodWithPropertyService.cs | 2 +- .../Portable/ValueTracking/ValueTrackedItem.cs | 2 +- .../Protocol/Handler/RequestExecutionQueue.cs | 2 +- ...ixProvider.ReplaceTokenKeywordCodeAction.vb | 2 +- .../VisualBasicRefactoringHelpersService.vb | 2 +- .../KeywordCompletionProvider.vb | 10 +++++----- .../NamedParameterCompletionProvider.vb | 10 +++++----- ...oSwitchCodeRefactoringProvider.Rewriting.vb | 2 +- .../Portable/Debugging/BreakpointResolver.vb | 2 +- .../EditAndContinue/BreakpointSpans.vb | 4 ++-- ...MethodExtractor.VisualBasicCodeGenerator.vb | 4 ++-- ...lBasicGenerateParameterizedMemberService.vb | 6 +++--- .../VisualBasicIntroduceVariableService.vb | 4 ++-- ...ualBasicReplaceMethodWithPropertyService.vb | 2 +- .../Core/InteractiveHost.LazyRemoteService.cs | 3 +-- .../InteractiveSessionReferencesTests.cs | 5 ++--- .../ObjectFormatter/CommonTypeNameFormatter.cs | 2 +- src/Scripting/Core/Script.cs | 10 +++++----- src/Scripting/Core/ScriptState.cs | 4 ++-- .../GlobalAssemblyCacheTests.cs | 4 ++-- .../MetadataShadowCopyProviderTests.cs | 15 +++++++-------- .../RuntimeMetadataReferenceResolverTests.cs | 3 +-- .../CoreTestUtilities/ScriptingTestHelpers.cs | 6 +++--- .../Reader/CustomDebugInfoUtilities.cs | 3 +-- .../PdbUtilities/Reader/PdbTestUtilities.cs | 3 +-- .../PdbUtilities/Shared/DummyMetadataImport.cs | 8 ++++---- src/Test/Perf/StackDepthTest/Program.cs | 4 ++-- src/Test/Perf/Utilities/TraceManager.cs | 4 ++-- .../FSharpDocumentHighlightsService.cs | 6 +++--- .../Editor/FSharpContentTypeLanguageService.cs | 2 +- .../Editor/FSharpEditorInlineRenameService.cs | 4 ++-- .../Editor/FSharpGoToDefinitionService.cs | 8 ++++---- .../FSharpSignatureHelpProvider.cs | 2 +- .../Structure/FSharpBlockStructureService.cs | 4 ++-- ...SharpProjectExternalErrorReporterFactory.cs | 4 ++-- .../FSharpSignatureHelpClassifierProvider.cs | 8 ++++---- .../OmniSharpBlockStructureService.cs | 2 +- src/Tools/Source/RunTests/Program.cs | 6 +++--- .../CSharpVsResetInteractiveCommand.cs | 4 ++-- .../CSharpCodeCleanupFixerProvider.cs | 4 ++-- .../LanguageService/CSharpLanguageService.cs | 2 +- .../FormattingOptionPageControl.xaml.cs | 2 +- .../Commands/ResetInteractiveTests.cs | 9 ++++----- .../Commands/TestResetInteractive.cs | 13 ++++++------- .../SettingsEditorControl.xaml.cs | 4 ++-- .../SettingsEditorPane.SearchFilter.cs | 2 +- .../AnalyzerDependencyChecker.cs | 4 ++-- .../AnalyzerDependencyConflict.cs | 2 +- .../IgnorableAssemblyNameList.cs | 2 +- .../MissingAnalyzerDependency.cs | 2 +- .../VisualStudioDiagnosticAnalyzerService.cs | 6 +++--- ...rencesTableControlEventProcessorProvider.cs | 8 ++++---- .../AbstractResetInteractiveMenuCommand.cs | 12 ++++++------ .../CSharpResetInteractiveMenuCommand.cs | 2 +- .../VisualBasicResetInteractiveMenuCommand.cs | 2 +- .../ObjectBrowser/AbstractListItemFactory.cs | 2 +- .../ObjectBrowserTaskExtensions.cs | 2 +- .../Implementation/Preview/ReferenceChange.cs | 2 +- .../PreviewPane/PreviewPane.xaml.cs | 4 ++-- .../GraphQueries/SearchGraphQuery.cs | 4 ++-- .../ProjectSystem/FileChangeTracker.cs | 2 +- .../Utilities/AutomationDelegatingListView.cs | 3 +-- .../Venus/VenusTaskExtensions.cs | 2 +- ...isualStudioWorkspaceStatusServiceFactory.cs | 3 +-- .../AbstractResetInteractiveCommand.cs | 2 +- .../Interactive/VsInteractiveWindowProvider.cs | 9 ++++----- .../Core/Def/Interactive/VsResetInteractive.cs | 5 ++--- .../ValueTrackedTreeItemViewModel.cs | 2 +- .../ValueTracking/ValueTrackingToolWindow.cs | 2 +- .../Collections/CodeElementSnapshot.cs | 2 +- .../Collections/ExternalMemberCollection.cs | 2 +- .../Collections/ExternalNamespaceCollection.cs | 2 +- .../Collections/ExternalOverloadsCollection.cs | 2 +- .../InheritsImplementsCollection.cs | 2 +- .../Collections/NamespaceCollection.cs | 2 +- .../Collections/OverloadsCollection.cs | 2 +- .../Collections/PartialTypeCollection.cs | 2 +- .../CodeModel/Collections/TypeCollection.cs | 2 +- .../AbstractExternalCodeType.cs | 2 +- .../Core/Test/ObjectBrowser/Helpers.vb | 4 ++-- .../Impl/Client/RoslynLSPClientService.cs | 4 ++-- .../CustomProtocol/LspRequestExtensions.cs | 2 +- .../CodeModel/CodeModelTestState.vb | 2 +- .../Framework/MockHierarchy.vb | 10 +++++----- .../PropertyChangedTestMonitor.vb | 2 +- .../VisualBasicCodeCleanupFixerProvider.vb | 4 ++-- .../Impl/ObjectBrowser/DescriptionBuilder.vb | 2 +- .../ObjectBrowserLibraryManager.vb | 4 ++-- .../SnippetFunctionClassName.vb | 2 +- .../SnippetFunctionSimpleTypeName.vb | 2 +- .../CodeGeneration/ParameterGenerator.cs | 3 +-- .../Extensions/SemanticModelExtensions.cs | 6 +++--- .../Formatting/FormattingTriviaTests.cs | 4 ++-- .../MSBuild/Build/ProjectBuildManager.cs | 2 +- ...ldProjectLoader.Worker_ResolveReferences.cs | 2 +- .../MSBuild/MSBuild/MSBuildProjectLoader.cs | 2 +- .../MSBuild/MSBuild/ProjectFile/Extensions.cs | 2 +- .../Core/MSBuild/MSBuild/ProjectMap.cs | 2 +- .../AbstractClassificationService.cs | 2 +- ...itorConfigDocumentOptionsProviderFactory.cs | 2 +- .../Core/Portable/Remote/RemoteHostClient.cs | 2 +- .../RenameLocation.ReferenceProcessing.cs | 6 +++--- .../Renamer.RenameSymbolDocumentAction.cs | 2 +- .../SymbolKey/SymbolKey.TupleTypeSymbolKey.cs | 2 +- .../TaskScheduler/TaskSchedulerProvider.cs | 2 +- ...aceAsynchronousOperationListenerProvider.cs | 4 ++-- .../Workspace/Solution/Checksum_Factory.cs | 4 ++-- .../LongestCommonSubsequenceTests.cs | 2 +- .../CoreTest/SolutionTests/SolutionTests.cs | 2 +- .../WorkspaceTests/GeneralWorkspaceTests.cs | 2 +- .../MSBuildTest/MSBuildWorkspaceTests.cs | 2 +- .../Remote/Core/SolutionAssetProvider.cs | 2 +- .../Host/RemoteWorkspace.SolutionCreator.cs | 8 ++++---- .../Formatting/CSharpFormattingOptions2.cs | 2 +- .../Core/Formatting/FormattingOptions2.cs | 2 +- .../Rules/Operations/FormattingOperations.cs | 2 +- .../AbstractDocumentationCommentService.cs | 2 +- .../Compiler/Core/Utilities/BKTree.cs | 2 +- .../ContextQuery/SyntaxTreeExtensions.vb | 2 +- .../Extensions/ParameterSyntaxExtensions.vb | 2 +- .../VisualBasicCodeGenerationServiceFactory.vb | 4 ++-- .../Extensions/SemanticModelExtensions.vb | 2 +- .../VisualBasicOptionsSerializationService.vb | 2 +- ...isualBasicSimplificationService.Expander.vb | 2 +- .../OrganizeImports/OrganizeImportsTests.vb | 4 ++-- .../VisualBasicExtensionsTests.vb | 4 ++-- 766 files changed, 1321 insertions(+), 1354 deletions(-) diff --git a/src/Analyzers/CSharp/Analyzers/MatchFolderAndNamespace/CSharpMatchFolderAndNamespaceDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/MatchFolderAndNamespace/CSharpMatchFolderAndNamespaceDiagnosticAnalyzer.cs index a04f3b2dd3674..2edb67c303210 100644 --- a/src/Analyzers/CSharp/Analyzers/MatchFolderAndNamespace/CSharpMatchFolderAndNamespaceDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/MatchFolderAndNamespace/CSharpMatchFolderAndNamespaceDiagnosticAnalyzer.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Analyzers.MatchFolderAndNamespace; -using Microsoft.CodeAnalysis.LanguageServices; -using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.CSharp.LanguageServices; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.LanguageServices; namespace Microsoft.CodeAnalysis.CSharp.Analyzers.MatchFolderAndNamespace { diff --git a/src/Analyzers/CSharp/Analyzers/UseExpressionBody/Helpers/UseExpressionBodyHelper.cs b/src/Analyzers/CSharp/Analyzers/UseExpressionBody/Helpers/UseExpressionBodyHelper.cs index 9326e2018065b..1ba7b5a8731b7 100644 --- a/src/Analyzers/CSharp/Analyzers/UseExpressionBody/Helpers/UseExpressionBodyHelper.cs +++ b/src/Analyzers/CSharp/Analyzers/UseExpressionBody/Helpers/UseExpressionBodyHelper.cs @@ -6,8 +6,8 @@ using System.Collections.Immutable; using Microsoft.CodeAnalysis.CodeStyle; -using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Options; #if CODE_STYLE using OptionSet = Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions; diff --git a/src/Analyzers/CSharp/Analyzers/UsePatternCombinators/CSharpUsePatternCombinatorsAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UsePatternCombinators/CSharpUsePatternCombinatorsAnalyzer.cs index d809df97b04b0..e487a7ef13230 100644 --- a/src/Analyzers/CSharp/Analyzers/UsePatternCombinators/CSharpUsePatternCombinatorsAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UsePatternCombinators/CSharpUsePatternCombinatorsAnalyzer.cs @@ -8,8 +8,8 @@ namespace Microsoft.CodeAnalysis.CSharp.UsePatternCombinators { - using static BinaryOperatorKind; using static AnalyzedPattern; + using static BinaryOperatorKind; internal static class CSharpUsePatternCombinatorsAnalyzer { diff --git a/src/Analyzers/CSharp/CodeFixes/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionCodeFixProvider.Rewriter.cs b/src/Analyzers/CSharp/CodeFixes/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionCodeFixProvider.Rewriter.cs index d66e35ee7b572..e953af7cd1059 100644 --- a/src/Analyzers/CSharp/CodeFixes/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionCodeFixProvider.Rewriter.cs +++ b/src/Analyzers/CSharp/CodeFixes/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionCodeFixProvider.Rewriter.cs @@ -9,8 +9,8 @@ using System.Linq; using Microsoft.CodeAnalysis.CSharp.Extensions; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Formatting; +using Microsoft.CodeAnalysis.Shared.Extensions; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.ConvertSwitchStatementToExpression diff --git a/src/Analyzers/CSharp/CodeFixes/RemoveUnusedMembers/CSharpRemoveUnusedMembersCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/RemoveUnusedMembers/CSharpRemoveUnusedMembersCodeFixProvider.cs index 29b238265c1d1..d3fa5f916b28f 100644 --- a/src/Analyzers/CSharp/CodeFixes/RemoveUnusedMembers/CSharpRemoveUnusedMembersCodeFixProvider.cs +++ b/src/Analyzers/CSharp/CodeFixes/RemoveUnusedMembers/CSharpRemoveUnusedMembersCodeFixProvider.cs @@ -4,13 +4,13 @@ #nullable disable +using System; using System.Collections.Generic; using System.Composition; -using Microsoft.CodeAnalysis.RemoveUnusedMembers; using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.CSharp.Syntax; -using System; using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.CodeAnalysis.RemoveUnusedMembers; namespace Microsoft.CodeAnalysis.CSharp.RemoveUnusedMembers { diff --git a/src/Analyzers/Core/CodeFixes/OrderModifiers/AbstractOrderModifiersCodeFixProvider.cs b/src/Analyzers/Core/CodeFixes/OrderModifiers/AbstractOrderModifiersCodeFixProvider.cs index 7b9f504f9b19d..304f2a9c69aac 100644 --- a/src/Analyzers/Core/CodeFixes/OrderModifiers/AbstractOrderModifiersCodeFixProvider.cs +++ b/src/Analyzers/Core/CodeFixes/OrderModifiers/AbstractOrderModifiersCodeFixProvider.cs @@ -10,12 +10,12 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CodeActions; -using Microsoft.CodeAnalysis.CodeStyle; using Microsoft.CodeAnalysis.CodeFixes; +using Microsoft.CodeAnalysis.CodeStyle; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Editing; -using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.LanguageServices; +using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Shared.Extensions; using Roslyn.Utilities; diff --git a/src/Analyzers/Core/CodeFixes/UseConditionalExpression/ForAssignment/AbstractUseConditionalExpressionForAssignmentCodeFixProvider.cs b/src/Analyzers/Core/CodeFixes/UseConditionalExpression/ForAssignment/AbstractUseConditionalExpressionForAssignmentCodeFixProvider.cs index 3d75945a9b589..737c60c1c7320 100644 --- a/src/Analyzers/Core/CodeFixes/UseConditionalExpression/ForAssignment/AbstractUseConditionalExpressionForAssignmentCodeFixProvider.cs +++ b/src/Analyzers/Core/CodeFixes/UseConditionalExpression/ForAssignment/AbstractUseConditionalExpressionForAssignmentCodeFixProvider.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Immutable; +using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -15,9 +16,8 @@ using Microsoft.CodeAnalysis.Operations; using Microsoft.CodeAnalysis.Shared.Extensions; using Roslyn.Utilities; -using static Microsoft.CodeAnalysis.UseConditionalExpression.UseConditionalExpressionHelpers; using static Microsoft.CodeAnalysis.UseConditionalExpression.UseConditionalExpressionCodeFixHelpers; -using System.Diagnostics.CodeAnalysis; +using static Microsoft.CodeAnalysis.UseConditionalExpression.UseConditionalExpressionHelpers; namespace Microsoft.CodeAnalysis.UseConditionalExpression { diff --git a/src/Analyzers/VisualBasic/Analyzers/AddAccessibilityModifiers/VisualBasicAddAccessibilityModifiersDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/AddAccessibilityModifiers/VisualBasicAddAccessibilityModifiersDiagnosticAnalyzer.vb index 16bad2c13f1e7..fb0ae4bd688f6 100644 --- a/src/Analyzers/VisualBasic/Analyzers/AddAccessibilityModifiers/VisualBasicAddAccessibilityModifiersDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/AddAccessibilityModifiers/VisualBasicAddAccessibilityModifiersDiagnosticAnalyzer.vb @@ -6,8 +6,8 @@ Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis.AddAccessibilityModifiers Imports Microsoft.CodeAnalysis.CodeStyle Imports Microsoft.CodeAnalysis.Diagnostics -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.AddAccessibilityModifiers diff --git a/src/Analyzers/VisualBasic/Analyzers/PopulateSwitch/VisualBasicPopulateSwitchStatementDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/PopulateSwitch/VisualBasicPopulateSwitchStatementDiagnosticAnalyzer.vb index 2db185505f2f2..11cab8682813c 100644 --- a/src/Analyzers/VisualBasic/Analyzers/PopulateSwitch/VisualBasicPopulateSwitchStatementDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/PopulateSwitch/VisualBasicPopulateSwitchStatementDiagnosticAnalyzer.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.PopulateSwitch +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.PopulateSwitch diff --git a/src/Analyzers/VisualBasic/Analyzers/RemoveUnnecessaryParentheses/VisualBasicRemoveUnnecessaryParenthesesDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/RemoveUnnecessaryParentheses/VisualBasicRemoveUnnecessaryParenthesesDiagnosticAnalyzer.vb index 3798b6c2baf0f..d576e8b64032d 100644 --- a/src/Analyzers/VisualBasic/Analyzers/RemoveUnnecessaryParentheses/VisualBasicRemoveUnnecessaryParenthesesDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/RemoveUnnecessaryParentheses/VisualBasicRemoveUnnecessaryParenthesesDiagnosticAnalyzer.vb @@ -2,14 +2,14 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Threading Imports Microsoft.CodeAnalysis.Diagnostics -Imports Microsoft.CodeAnalysis.VisualBasic.Precedence +Imports Microsoft.CodeAnalysis.LanguageServices +Imports Microsoft.CodeAnalysis.Precedence +Imports Microsoft.CodeAnalysis.RemoveUnnecessaryParentheses Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices +Imports Microsoft.CodeAnalysis.VisualBasic.Precedence Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.RemoveUnnecessaryParentheses -Imports Microsoft.CodeAnalysis.Precedence -Imports Microsoft.CodeAnalysis.LanguageServices -Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.RemoveUnnecessaryParentheses diff --git a/src/Analyzers/VisualBasic/Analyzers/SimplifyBooleanExpression/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/SimplifyBooleanExpression/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb index c2805bef4e2c9..3a5ebd4b07c1c 100644 --- a/src/Analyzers/VisualBasic/Analyzers/SimplifyBooleanExpression/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/SimplifyBooleanExpression/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb @@ -3,12 +3,12 @@ ' See the LICENSE file in the project root for more information. Imports System.Threading -Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.LanguageServices Imports Microsoft.CodeAnalysis.Operations Imports Microsoft.CodeAnalysis.SimplifyBooleanExpression +Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.SimplifyBooleanExpression diff --git a/src/Analyzers/VisualBasic/Analyzers/UseCompoundAssignment/VisualBasicUseCompoundAssignmentDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/UseCompoundAssignment/VisualBasicUseCompoundAssignmentDiagnosticAnalyzer.vb index a68290c891b11..d3caafc0e37ab 100644 --- a/src/Analyzers/VisualBasic/Analyzers/UseCompoundAssignment/VisualBasicUseCompoundAssignmentDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/UseCompoundAssignment/VisualBasicUseCompoundAssignmentDiagnosticAnalyzer.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.UseCompoundAssignment Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.UseCompoundAssignment diff --git a/src/Analyzers/VisualBasic/Tests/QualifyMemberAccess/QualifyMemberAccessTests.vb b/src/Analyzers/VisualBasic/Tests/QualifyMemberAccess/QualifyMemberAccessTests.vb index c7221094921ed..c0525eecddc50 100644 --- a/src/Analyzers/VisualBasic/Tests/QualifyMemberAccess/QualifyMemberAccessTests.vb +++ b/src/Analyzers/VisualBasic/Tests/QualifyMemberAccess/QualifyMemberAccessTests.vb @@ -5,8 +5,8 @@ Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.CodeStyle Imports Microsoft.CodeAnalysis.Diagnostics -Imports Microsoft.CodeAnalysis.Options Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics +Imports Microsoft.CodeAnalysis.Options Imports Microsoft.CodeAnalysis.VisualBasic.QualifyMemberAccess Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.QualifyMemberAccess diff --git a/src/Analyzers/VisualBasic/Tests/UseIsNullCheck/UseIsNullCheckForReferenceEqualsTests.vb b/src/Analyzers/VisualBasic/Tests/UseIsNullCheck/UseIsNullCheckForReferenceEqualsTests.vb index 50e67bb0389ba..803a93c157964 100644 --- a/src/Analyzers/VisualBasic/Tests/UseIsNullCheck/UseIsNullCheckForReferenceEqualsTests.vb +++ b/src/Analyzers/VisualBasic/Tests/UseIsNullCheck/UseIsNullCheckForReferenceEqualsTests.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports Microsoft.CodeAnalysis.CodeFixes -Imports Microsoft.CodeAnalysis.VisualBasic.UseIsNullCheck Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics +Imports Microsoft.CodeAnalysis.VisualBasic.UseIsNullCheck Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.UseIsNullCheck Partial Public Class UseIsNullCheckForReferenceEqualsTests diff --git a/src/CodeStyle/Core/Analyzers/Formatting/FormatterHelper.cs b/src/CodeStyle/Core/Analyzers/Formatting/FormatterHelper.cs index 070b4d752f0e1..6f0f205c273cc 100644 --- a/src/CodeStyle/Core/Analyzers/Formatting/FormatterHelper.cs +++ b/src/CodeStyle/Core/Analyzers/Formatting/FormatterHelper.cs @@ -11,8 +11,8 @@ using Microsoft.CodeAnalysis.Formatting.Rules; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using OptionSet = Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions; using static Microsoft.CodeAnalysis.Formatting.FormattingExtensions; +using OptionSet = Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions; namespace Microsoft.CodeAnalysis.Formatting { diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_Deconstruct.cs b/src/Compilers/CSharp/Portable/Binder/Binder_Deconstruct.cs index 5b22258f07e77..301e6489472a9 100644 --- a/src/Compilers/CSharp/Portable/Binder/Binder_Deconstruct.cs +++ b/src/Compilers/CSharp/Portable/Binder/Binder_Deconstruct.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Immutable; using System.Collections.Generic; +using System.Collections.Immutable; using System.Diagnostics; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs b/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs index 46158af25f769..8d1bc11fef360 100644 --- a/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs +++ b/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs @@ -4,11 +4,6 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis.Text; -using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Collections.Immutable; @@ -16,6 +11,11 @@ using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_Flags.cs b/src/Compilers/CSharp/Portable/Binder/Binder_Flags.cs index 7374ede9d1163..3f7974ebebc21 100644 --- a/src/Compilers/CSharp/Portable/Binder/Binder_Flags.cs +++ b/src/Compilers/CSharp/Portable/Binder/Binder_Flags.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.CSharp.Symbols; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Symbols; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_QueryErrors.cs b/src/Compilers/CSharp/Portable/Binder/Binder_QueryErrors.cs index 9c61b375c3c41..4d34f57311ece 100644 --- a/src/Compilers/CSharp/Portable/Binder/Binder_QueryErrors.cs +++ b/src/Compilers/CSharp/Portable/Binder/Binder_QueryErrors.cs @@ -4,13 +4,13 @@ #nullable disable +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Roslyn.Utilities; -using System; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_XmlNameAttribute.cs b/src/Compilers/CSharp/Portable/Binder/Binder_XmlNameAttribute.cs index 572ef7e0b3cb6..d1d06af7ac787 100644 --- a/src/Compilers/CSharp/Portable/Binder/Binder_XmlNameAttribute.cs +++ b/src/Compilers/CSharp/Portable/Binder/Binder_XmlNameAttribute.cs @@ -4,12 +4,12 @@ #nullable disable +using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; -using System.Collections.Generic; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/ExecutableCodeBinder.cs b/src/Compilers/CSharp/Portable/Binder/ExecutableCodeBinder.cs index 6c2d6f6e694ce..32948bfb3fca5 100644 --- a/src/Compilers/CSharp/Portable/Binder/ExecutableCodeBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/ExecutableCodeBinder.cs @@ -4,14 +4,14 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.Diagnostics; using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/ExpressionListVariableBinder.cs b/src/Compilers/CSharp/Portable/Binder/ExpressionListVariableBinder.cs index 600a75a445d68..54a0ae16700c0 100644 --- a/src/Compilers/CSharp/Portable/Binder/ExpressionListVariableBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/ExpressionListVariableBinder.cs @@ -4,12 +4,12 @@ #nullable disable +using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; -using System.Diagnostics; -using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/ExpressionVariableBinder.cs b/src/Compilers/CSharp/Portable/Binder/ExpressionVariableBinder.cs index 4f16133aa41b9..62bba9f598d41 100644 --- a/src/Compilers/CSharp/Portable/Binder/ExpressionVariableBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/ExpressionVariableBinder.cs @@ -5,12 +5,12 @@ #nullable disable using System; +using System.Collections.Generic; using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; -using System.Collections.Generic; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/ExpressionVariableFinder.cs b/src/Compilers/CSharp/Portable/Binder/ExpressionVariableFinder.cs index 1e1f691e5c28c..d103b312e2c29 100644 --- a/src/Compilers/CSharp/Portable/Binder/ExpressionVariableFinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/ExpressionVariableFinder.cs @@ -5,13 +5,13 @@ #nullable disable using System; +using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; -using System.Collections.Generic; -using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/ForLoopBinder.cs b/src/Compilers/CSharp/Portable/Binder/ForLoopBinder.cs index ee8d0623bf843..e131527da9173 100644 --- a/src/Compilers/CSharp/Portable/Binder/ForLoopBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/ForLoopBinder.cs @@ -5,12 +5,12 @@ #nullable disable using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/LocalBinderFactory.cs b/src/Compilers/CSharp/Portable/Binder/LocalBinderFactory.cs index d2a83280e672e..4c5d3825d07d2 100644 --- a/src/Compilers/CSharp/Portable/Binder/LocalBinderFactory.cs +++ b/src/Compilers/CSharp/Portable/Binder/LocalBinderFactory.cs @@ -4,13 +4,13 @@ #nullable disable +using System; +using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; -using System; -using System.Collections.Immutable; -using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/LockBinder.cs b/src/Compilers/CSharp/Portable/Binder/LockBinder.cs index e6ea4a54f0588..095aba5c38699 100644 --- a/src/Compilers/CSharp/Portable/Binder/LockBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/LockBinder.cs @@ -6,9 +6,9 @@ using System; using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; -using System.Diagnostics; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Portable/Binder/MethodArgumentInfo.cs b/src/Compilers/CSharp/Portable/Binder/MethodArgumentInfo.cs index 5e742d84d72a7..b8a2f76c02e53 100644 --- a/src/Compilers/CSharp/Portable/Binder/MethodArgumentInfo.cs +++ b/src/Compilers/CSharp/Portable/Binder/MethodArgumentInfo.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/CSharp/Portable/Binder/ScriptLocalScopeBinder.cs b/src/Compilers/CSharp/Portable/Binder/ScriptLocalScopeBinder.cs index e701dfdf57871..f08aa0353bec9 100644 --- a/src/Compilers/CSharp/Portable/Binder/ScriptLocalScopeBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/ScriptLocalScopeBinder.cs @@ -4,10 +4,10 @@ #nullable disable +using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; -using System.Collections.Immutable; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/Conversion.cs b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/Conversion.cs index afcffedc0426b..a1d1b31a9efab 100644 --- a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/Conversion.cs +++ b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/Conversion.cs @@ -2,14 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.Diagnostics; -using Microsoft.CodeAnalysis.Operations; using System.Diagnostics.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.Operations; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/TypeConversions.cs b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/TypeConversions.cs index c3906596164d8..2b32e8ee2a628 100644 --- a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/TypeConversions.cs +++ b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/TypeConversions.cs @@ -4,11 +4,11 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedConversions.cs b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedConversions.cs index 6c28f576c6119..ba7fbeb00830c 100644 --- a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedConversions.cs +++ b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedConversions.cs @@ -4,12 +4,12 @@ #nullable disable +using System.Collections.Generic; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; -using System.Collections.Generic; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedExplicitConversions.cs b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedExplicitConversions.cs index 63aa33c7cd866..052ded07bac6f 100644 --- a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedExplicitConversions.cs +++ b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedExplicitConversions.cs @@ -4,6 +4,7 @@ #nullable disable +using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; @@ -11,7 +12,6 @@ using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; -using System.Collections.Generic; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/SimpleLocalScopeBinder.cs b/src/Compilers/CSharp/Portable/Binder/SimpleLocalScopeBinder.cs index d7263e00a8711..fafdd056a56cc 100644 --- a/src/Compilers/CSharp/Portable/Binder/SimpleLocalScopeBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/SimpleLocalScopeBinder.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; using System.Collections.Immutable; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Syntax; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Portable/Binder/TypeofBinder.cs b/src/Compilers/CSharp/Portable/Binder/TypeofBinder.cs index 63e2016442af9..5ef09515c307c 100644 --- a/src/Compilers/CSharp/Portable/Binder/TypeofBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/TypeofBinder.cs @@ -5,9 +5,9 @@ #nullable disable using System.Collections.Generic; -using Microsoft.CodeAnalysis.CSharp.Syntax; using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/WhileBinder.cs b/src/Compilers/CSharp/Portable/Binder/WhileBinder.cs index d3b86d32cab06..7d74c60ebaf6e 100644 --- a/src/Compilers/CSharp/Portable/Binder/WhileBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/WhileBinder.cs @@ -4,13 +4,13 @@ #nullable disable +using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Diagnostics; -using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/BoundTree/BoundDiscardExpression.cs b/src/Compilers/CSharp/Portable/BoundTree/BoundDiscardExpression.cs index 10fd67b7c23ef..62643b81d47f3 100644 --- a/src/Compilers/CSharp/Portable/BoundTree/BoundDiscardExpression.cs +++ b/src/Compilers/CSharp/Portable/BoundTree/BoundDiscardExpression.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.CSharp.Symbols; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Symbols; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/BoundTree/BoundExpression.cs b/src/Compilers/CSharp/Portable/BoundTree/BoundExpression.cs index fe75b32d33391..e6b04409f1afd 100644 --- a/src/Compilers/CSharp/Portable/BoundTree/BoundExpression.cs +++ b/src/Compilers/CSharp/Portable/BoundTree/BoundExpression.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; -using System; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/BoundTree/BoundTreeRewriter.cs b/src/Compilers/CSharp/Portable/BoundTree/BoundTreeRewriter.cs index 402eb6e7d8336..5c86eea778a79 100644 --- a/src/Compilers/CSharp/Portable/BoundTree/BoundTreeRewriter.cs +++ b/src/Compilers/CSharp/Portable/BoundTree/BoundTreeRewriter.cs @@ -3,10 +3,10 @@ // See the LICENSE file in the project root for more information. using System.Collections.Immutable; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.PooledObjects; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/BoundTree/BoundTreeVisitors.cs b/src/Compilers/CSharp/Portable/BoundTree/BoundTreeVisitors.cs index 13778e535a28c..764e7bd72aaed 100644 --- a/src/Compilers/CSharp/Portable/BoundTree/BoundTreeVisitors.cs +++ b/src/Compilers/CSharp/Portable/BoundTree/BoundTreeVisitors.cs @@ -4,13 +4,13 @@ #nullable disable +using System; using System.Diagnostics; +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; -using System; using Roslyn.Utilities; -using System.Linq; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/BoundTree/Formatting.cs b/src/Compilers/CSharp/Portable/BoundTree/Formatting.cs index b323c0ebe9479..8fcb7d49daab6 100644 --- a/src/Compilers/CSharp/Portable/BoundTree/Formatting.cs +++ b/src/Compilers/CSharp/Portable/BoundTree/Formatting.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using System.Diagnostics; using System.Runtime.CompilerServices; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/BoundTree/OutDeconstructVarPendingInference.cs b/src/Compilers/CSharp/Portable/BoundTree/OutDeconstructVarPendingInference.cs index 4a63ad058ea2e..4fda893b1b390 100644 --- a/src/Compilers/CSharp/Portable/BoundTree/OutDeconstructVarPendingInference.cs +++ b/src/Compilers/CSharp/Portable/BoundTree/OutDeconstructVarPendingInference.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; -using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/BoundTree/VariablePendingInference.cs b/src/Compilers/CSharp/Portable/BoundTree/VariablePendingInference.cs index 4bd6f77e53aaf..4d8adcbf6bfa6 100644 --- a/src/Compilers/CSharp/Portable/BoundTree/VariablePendingInference.cs +++ b/src/Compilers/CSharp/Portable/BoundTree/VariablePendingInference.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; +using System.Collections.Generic; +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Roslyn.Utilities; -using System.Diagnostics; -using System; using Microsoft.CodeAnalysis.PooledObjects; -using System.Collections.Generic; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Compilation/LexicalOrderSymbolComparer.cs b/src/Compilers/CSharp/Portable/Compilation/LexicalOrderSymbolComparer.cs index 1173bf27a1725..0c6f8b61b1935 100644 --- a/src/Compilers/CSharp/Portable/Compilation/LexicalOrderSymbolComparer.cs +++ b/src/Compilers/CSharp/Portable/Compilation/LexicalOrderSymbolComparer.cs @@ -4,9 +4,9 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; using System.Collections.Generic; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Symbols; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.NodeMapBuilder.cs b/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.NodeMapBuilder.cs index fe0f0f661c74a..5c664aec869e9 100644 --- a/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.NodeMapBuilder.cs +++ b/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.NodeMapBuilder.cs @@ -6,13 +6,13 @@ using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; +using System.Linq; using Microsoft.CodeAnalysis.Collections; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; -using System.Diagnostics; -using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Compilation/QueryClauseInfo.cs b/src/Compilers/CSharp/Portable/Compilation/QueryClauseInfo.cs index cb270f7bcff19..2677188c9f611 100644 --- a/src/Compilers/CSharp/Portable/Compilation/QueryClauseInfo.cs +++ b/src/Compilers/CSharp/Portable/Compilation/QueryClauseInfo.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Roslyn.Utilities; using System; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Compilation/SyntaxAndDeclarationManager.cs b/src/Compilers/CSharp/Portable/Compilation/SyntaxAndDeclarationManager.cs index a3a5bbf632981..5ffeb4d90fbd9 100644 --- a/src/Compilers/CSharp/Portable/Compilation/SyntaxAndDeclarationManager.cs +++ b/src/Compilers/CSharp/Portable/Compilation/SyntaxAndDeclarationManager.cs @@ -5,9 +5,9 @@ #nullable disable using System; -using System.Diagnostics; using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; using System.Linq; using System.Threading; using Microsoft.CodeAnalysis.Collections; diff --git a/src/Compilers/CSharp/Portable/Compilation/TypeInfo.cs b/src/Compilers/CSharp/Portable/Compilation/TypeInfo.cs index 68de547a3edb6..ef88eecc890f4 100644 --- a/src/Compilers/CSharp/Portable/Compilation/TypeInfo.cs +++ b/src/Compilers/CSharp/Portable/Compilation/TypeInfo.cs @@ -4,8 +4,8 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; using System; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Portable/DocumentationComments/DocumentationCommentIDVisitor.PartVisitor.cs b/src/Compilers/CSharp/Portable/DocumentationComments/DocumentationCommentIDVisitor.PartVisitor.cs index 499395bb38b02..da1311a99ab47 100644 --- a/src/Compilers/CSharp/Portable/DocumentationComments/DocumentationCommentIDVisitor.PartVisitor.cs +++ b/src/Compilers/CSharp/Portable/DocumentationComments/DocumentationCommentIDVisitor.PartVisitor.cs @@ -4,6 +4,7 @@ #nullable disable +using System; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; @@ -14,7 +15,6 @@ using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/DocumentationComments/PEDocumentationCommentUtils.cs b/src/Compilers/CSharp/Portable/DocumentationComments/PEDocumentationCommentUtils.cs index df8a724455125..dfc0a748b1cdd 100644 --- a/src/Compilers/CSharp/Portable/DocumentationComments/PEDocumentationCommentUtils.cs +++ b/src/Compilers/CSharp/Portable/DocumentationComments/PEDocumentationCommentUtils.cs @@ -7,8 +7,8 @@ using System; using System.Globalization; using System.Threading; -using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; diff --git a/src/Compilers/CSharp/Portable/Emitter/EditAndContinue/CSharpSymbolMatcher.cs b/src/Compilers/CSharp/Portable/Emitter/EditAndContinue/CSharpSymbolMatcher.cs index 2bbe3b0900c3c..e8e6e3930c55b 100644 --- a/src/Compilers/CSharp/Portable/Emitter/EditAndContinue/CSharpSymbolMatcher.cs +++ b/src/Compilers/CSharp/Portable/Emitter/EditAndContinue/CSharpSymbolMatcher.cs @@ -2,20 +2,20 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.Emit; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Symbols; -using System.Diagnostics.CodeAnalysis; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Emit { diff --git a/src/Compilers/CSharp/Portable/Emitter/Model/AssemblyReference.cs b/src/Compilers/CSharp/Portable/Emitter/Model/AssemblyReference.cs index 4c682100fcd89..6955b1839b67d 100644 --- a/src/Compilers/CSharp/Portable/Emitter/Model/AssemblyReference.cs +++ b/src/Compilers/CSharp/Portable/Emitter/Model/AssemblyReference.cs @@ -6,11 +6,11 @@ using System; using System.Collections.Generic; +using System.Collections.Immutable; +using System.Diagnostics; using System.Reflection; using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; -using System.Diagnostics; -using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp.Emit { diff --git a/src/Compilers/CSharp/Portable/Emitter/Model/CustomModifierAdapter.cs b/src/Compilers/CSharp/Portable/Emitter/Model/CustomModifierAdapter.cs index 59381c0bd7fc5..581a2623d16ec 100644 --- a/src/Compilers/CSharp/Portable/Emitter/Model/CustomModifierAdapter.cs +++ b/src/Compilers/CSharp/Portable/Emitter/Model/CustomModifierAdapter.cs @@ -4,8 +4,8 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Emit; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.Emit; namespace Microsoft.CodeAnalysis.CSharp.Symbols diff --git a/src/Compilers/CSharp/Portable/Emitter/Model/GenericTypeInstanceReference.cs b/src/Compilers/CSharp/Portable/Emitter/Model/GenericTypeInstanceReference.cs index 6637d7d228b2b..0ebf40c89afef 100644 --- a/src/Compilers/CSharp/Portable/Emitter/Model/GenericTypeInstanceReference.cs +++ b/src/Compilers/CSharp/Portable/Emitter/Model/GenericTypeInstanceReference.cs @@ -5,14 +5,14 @@ #nullable disable using System.Collections.Generic; +using System.Collections.Immutable; +using System.Diagnostics; +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; -using System.Collections.Immutable; -using Microsoft.CodeAnalysis.Emit; -using System.Diagnostics; -using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.Emit { diff --git a/src/Compilers/CSharp/Portable/Emitter/Model/SourceAssemblySymbolAdapter.cs b/src/Compilers/CSharp/Portable/Emitter/Model/SourceAssemblySymbolAdapter.cs index 66d7ad7888bef..62c11df46ebbb 100644 --- a/src/Compilers/CSharp/Portable/Emitter/Model/SourceAssemblySymbolAdapter.cs +++ b/src/Compilers/CSharp/Portable/Emitter/Model/SourceAssemblySymbolAdapter.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Collections.Immutable; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.CSharp.Emit; +using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedGenericNestedTypeInstanceReference.cs b/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedGenericNestedTypeInstanceReference.cs index 9ce90478d3aa4..7a4c733b34b2f 100644 --- a/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedGenericNestedTypeInstanceReference.cs +++ b/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedGenericNestedTypeInstanceReference.cs @@ -5,11 +5,11 @@ #nullable disable using System.Collections.Immutable; +using System.Diagnostics; +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.PooledObjects; -using System.Diagnostics; -using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.Emit { diff --git a/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedNestedTypeReference.cs b/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedNestedTypeReference.cs index a8cb25ab27b8d..570a1c9c77bf7 100644 --- a/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedNestedTypeReference.cs +++ b/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedNestedTypeReference.cs @@ -4,9 +4,9 @@ #nullable disable +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.Emit; -using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.Emit { diff --git a/src/Compilers/CSharp/Portable/Emitter/Model/TypeParameterSymbolAdapter.cs b/src/Compilers/CSharp/Portable/Emitter/Model/TypeParameterSymbolAdapter.cs index 1cd67e481413d..404fec990fcf3 100644 --- a/src/Compilers/CSharp/Portable/Emitter/Model/TypeParameterSymbolAdapter.cs +++ b/src/Compilers/CSharp/Portable/Emitter/Model/TypeParameterSymbolAdapter.cs @@ -6,12 +6,12 @@ using System; using System.Collections.Generic; +using System.Collections.Immutable; +using System.Diagnostics; using System.Reflection.Metadata; using Microsoft.CodeAnalysis.CSharp.Emit; -using Roslyn.Utilities; -using System.Diagnostics; using Microsoft.CodeAnalysis.Emit; -using System.Collections.Immutable; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedEvent.cs b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedEvent.cs index 828c0c84916a1..d10909e6a9a0f 100644 --- a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedEvent.cs +++ b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedEvent.cs @@ -4,8 +4,8 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; using System.Collections.Generic; +using Microsoft.CodeAnalysis.CSharp.Symbols; #if !DEBUG using EventSymbolAdapter = Microsoft.CodeAnalysis.CSharp.Symbols.EventSymbol; diff --git a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedField.cs b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedField.cs index 38cb8ab9625ba..a0a2fa8ec350b 100644 --- a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedField.cs +++ b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedField.cs @@ -4,11 +4,11 @@ #nullable disable +using System.Collections.Generic; using System.Collections.Immutable; +using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.Emit; -using System.Collections.Generic; -using Microsoft.CodeAnalysis.CodeGen; #if !DEBUG using FieldSymbolAdapter = Microsoft.CodeAnalysis.CSharp.Symbols.FieldSymbol; diff --git a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedParameter.cs b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedParameter.cs index 9f02eefefc5df..c313a49e55dcc 100644 --- a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedParameter.cs +++ b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedParameter.cs @@ -4,14 +4,14 @@ #nullable disable -using System.Collections.Immutable; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.Emit; using System; using System.Collections.Generic; +using System.Collections.Immutable; using System.Diagnostics; -using Cci = Microsoft.Cci; using Microsoft.CodeAnalysis.CodeGen; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.Emit; +using Cci = Microsoft.Cci; #if !DEBUG using ParameterSymbolAdapter = Microsoft.CodeAnalysis.CSharp.Symbols.ParameterSymbol; diff --git a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypeParameter.cs b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypeParameter.cs index 819b0c2e43f9b..869cc2bd4108a 100644 --- a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypeParameter.cs +++ b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypeParameter.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.Emit; using System.Collections.Generic; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.Emit; using Cci = Microsoft.Cci; #if !DEBUG diff --git a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypesManager.cs b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypesManager.cs index 2362945a2ba54..2759e7900f1d9 100644 --- a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypesManager.cs +++ b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypesManager.cs @@ -12,8 +12,8 @@ using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.Emit; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.Emit.NoPia; +using Roslyn.Utilities; #if !DEBUG using SymbolAdapter = Microsoft.CodeAnalysis.CSharp.Symbol; diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/DataFlowsOutWalker.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/DataFlowsOutWalker.cs index ebc7f7d75e889..e2ad3e9bb3b15 100644 --- a/src/Compilers/CSharp/Portable/FlowAnalysis/DataFlowsOutWalker.cs +++ b/src/Compilers/CSharp/Portable/FlowAnalysis/DataFlowsOutWalker.cs @@ -4,12 +4,12 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/DefiniteAssignment.LocalFunctions.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/DefiniteAssignment.LocalFunctions.cs index cd41d4faed57a..3b17d550bb092 100644 --- a/src/Compilers/CSharp/Portable/FlowAnalysis/DefiniteAssignment.LocalFunctions.cs +++ b/src/Compilers/CSharp/Portable/FlowAnalysis/DefiniteAssignment.LocalFunctions.cs @@ -4,8 +4,8 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Symbols; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/EmptyStructTypeCache.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/EmptyStructTypeCache.cs index de42811ccdb6d..54aae98004cd2 100644 --- a/src/Compilers/CSharp/Portable/FlowAnalysis/EmptyStructTypeCache.cs +++ b/src/Compilers/CSharp/Portable/FlowAnalysis/EmptyStructTypeCache.cs @@ -9,11 +9,11 @@ using System.Collections.Generic; using System.Diagnostics; using System.Text; +using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Threading; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/FlowAnalysisPass.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/FlowAnalysisPass.cs index a138883fe13ba..a012c967af516 100644 --- a/src/Compilers/CSharp/Portable/FlowAnalysis/FlowAnalysisPass.cs +++ b/src/Compilers/CSharp/Portable/FlowAnalysis/FlowAnalysisPass.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Collections.Immutable; -using System.Linq; using System.Diagnostics; +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/ReadWriteWalker.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/ReadWriteWalker.cs index a9b90b624d5a9..13c466b88d263 100644 --- a/src/Compilers/CSharp/Portable/FlowAnalysis/ReadWriteWalker.cs +++ b/src/Compilers/CSharp/Portable/FlowAnalysis/ReadWriteWalker.cs @@ -4,11 +4,11 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/VariablesDeclaredWalker.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/VariablesDeclaredWalker.cs index 1964a19ff2aa8..4be833638eb8a 100644 --- a/src/Compilers/CSharp/Portable/FlowAnalysis/VariablesDeclaredWalker.cs +++ b/src/Compilers/CSharp/Portable/FlowAnalysis/VariablesDeclaredWalker.cs @@ -5,12 +5,12 @@ #nullable disable using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/LambdaCapturedVariable.cs b/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/LambdaCapturedVariable.cs index 9cf23ae249234..ddd0303ffad3c 100644 --- a/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/LambdaCapturedVariable.cs +++ b/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/LambdaCapturedVariable.cs @@ -5,10 +5,10 @@ #nullable disable using System; +using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; -using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/SynthesizedClosureMethod.cs b/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/SynthesizedClosureMethod.cs index b3dd71d8252e4..129a3a088539c 100644 --- a/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/SynthesizedClosureMethod.cs +++ b/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/SynthesizedClosureMethod.cs @@ -3,12 +3,12 @@ // See the LICENSE file in the project root for more information. using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; -using System.Diagnostics; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/Instrumentation/DebugInfoInjector.cs b/src/Compilers/CSharp/Portable/Lowering/Instrumentation/DebugInfoInjector.cs index 0a2a4c930ab8b..f4e319dbdee21 100644 --- a/src/Compilers/CSharp/Portable/Lowering/Instrumentation/DebugInfoInjector.cs +++ b/src/Compilers/CSharp/Portable/Lowering/Instrumentation/DebugInfoInjector.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Text; -using Roslyn.Utilities; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.IteratorFinallyFrame.cs b/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.IteratorFinallyFrame.cs index d1acb500db5af..e500d00651514 100644 --- a/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.IteratorFinallyFrame.cs +++ b/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.IteratorFinallyFrame.cs @@ -4,9 +4,9 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; using System.Collections.Generic; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Symbols; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.YieldsInTryAnalysis.cs b/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.YieldsInTryAnalysis.cs index 4663c0c7e298b..c75fd9a4aedd1 100644 --- a/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.YieldsInTryAnalysis.cs +++ b/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.YieldsInTryAnalysis.cs @@ -4,9 +4,9 @@ #nullable disable +using System.Collections.Generic; using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; -using System.Collections.Generic; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.cs b/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.cs index e77349419b340..deb1abccb2eff 100644 --- a/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.cs +++ b/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.cs @@ -4,16 +4,16 @@ #nullable disable -using System.Collections.Immutable; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.PooledObjects; using System; using System.Collections.Generic; +using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.CodeGen; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/DynamicSiteContainer.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/DynamicSiteContainer.cs index 982c07056192a..6b0d45701d67a 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/DynamicSiteContainer.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/DynamicSiteContainer.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System.Collections.Immutable; -using Microsoft.CodeAnalysis.CSharp.Symbols; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.Symbols; using Roslyn.Utilities; diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Call.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Call.cs index f3e0e9c240aba..d2467c7d6cba9 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Call.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Call.cs @@ -9,8 +9,8 @@ using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Operations; +using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_DoStatement.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_DoStatement.cs index 85dc338a8a45c..448db16b3ef2a 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_DoStatement.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_DoStatement.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; -using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Event.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Event.cs index a7a0ece2c831c..50127272f6394 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Event.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Event.cs @@ -5,8 +5,8 @@ using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.RuntimeMembers; diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_IfStatement.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_IfStatement.cs index 41828efc10d5b..3978bbbb8b30c 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_IfStatement.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_IfStatement.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; -using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_ObjectOrCollectionInitializerExpression.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_ObjectOrCollectionInitializerExpression.cs index 74b03b933a3e9..b169a518f495c 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_ObjectOrCollectionInitializerExpression.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_ObjectOrCollectionInitializerExpression.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Range.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Range.cs index c7e1b1e8b8aab..e5159d83d4d15 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Range.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Range.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Diagnostics; using System.Collections.Immutable; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; -using System.Linq; using Roslyn.Utilities; -using System.Diagnostics.CodeAnalysis; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StackAlloc.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StackAlloc.cs index 88a1002fcb43d..9cea9d617c977 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StackAlloc.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StackAlloc.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Diagnostics; using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StringInterpolation.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StringInterpolation.cs index 78836a245dbfc..3171d865d1584 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StringInterpolation.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StringInterpolation.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; -using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_TupleCreationExpression.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_TupleCreationExpression.cs index 203e7c2301751..f804904a77104 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_TupleCreationExpression.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_TupleCreationExpression.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; -using System.Collections.Immutable; -using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_WhileStatement.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_WhileStatement.cs index a72b989910167..5734c7323ff93 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_WhileStatement.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_WhileStatement.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; -using System.Collections.Immutable; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Portable/Lowering/SynthesizedSubmissionFields.cs b/src/Compilers/CSharp/Portable/Lowering/SynthesizedSubmissionFields.cs index 7728fe4384949..6c3365b7ddc2d 100644 --- a/src/Compilers/CSharp/Portable/Lowering/SynthesizedSubmissionFields.cs +++ b/src/Compilers/CSharp/Portable/Lowering/SynthesizedSubmissionFields.cs @@ -4,12 +4,12 @@ #nullable disable +using System; using System.Collections.Generic; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; -using System; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Parser/Blender.Cursor.cs b/src/Compilers/CSharp/Portable/Parser/Blender.Cursor.cs index b408bce8a7a6b..bf5fb4d04b1be 100644 --- a/src/Compilers/CSharp/Portable/Parser/Blender.Cursor.cs +++ b/src/Compilers/CSharp/Portable/Parser/Blender.Cursor.cs @@ -4,12 +4,12 @@ #nullable disable +using System; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System; namespace Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax { diff --git a/src/Compilers/CSharp/Portable/Parser/LexerCache.cs b/src/Compilers/CSharp/Portable/Parser/LexerCache.cs index da0ca610787c7..6e07289cf855b 100644 --- a/src/Compilers/CSharp/Portable/Parser/LexerCache.cs +++ b/src/Compilers/CSharp/Portable/Parser/LexerCache.cs @@ -7,12 +7,12 @@ // #define COLLECT_STATS using System; +using System.Text; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Text; namespace Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax { diff --git a/src/Compilers/CSharp/Portable/Parser/Lexer_StringLiteral.cs b/src/Compilers/CSharp/Portable/Parser/Lexer_StringLiteral.cs index da04733e21f80..5e1956c8105b6 100644 --- a/src/Compilers/CSharp/Portable/Parser/Lexer_StringLiteral.cs +++ b/src/Compilers/CSharp/Portable/Parser/Lexer_StringLiteral.cs @@ -4,14 +4,14 @@ #nullable disable -using Microsoft.CodeAnalysis.Collections; -using Microsoft.CodeAnalysis.PooledObjects; using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.Collections; +using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax { diff --git a/src/Compilers/CSharp/Portable/SourceGeneration/CSharpGeneratorDriver.cs b/src/Compilers/CSharp/Portable/SourceGeneration/CSharpGeneratorDriver.cs index 5ddbb2bd85b3a..9b980dca5dab0 100644 --- a/src/Compilers/CSharp/Portable/SourceGeneration/CSharpGeneratorDriver.cs +++ b/src/Compilers/CSharp/Portable/SourceGeneration/CSharpGeneratorDriver.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Collections.Immutable; +using System.Linq; using System.Threading; using Microsoft.CodeAnalysis.Diagnostics; -using System.Linq; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Symbols/AnonymousTypes/SynthesizedSymbols/AnonymousType.SynthesizedMethodBase.cs b/src/Compilers/CSharp/Portable/Symbols/AnonymousTypes/SynthesizedSymbols/AnonymousType.SynthesizedMethodBase.cs index 6a19be4e5f635..6eef0ab1b9c1c 100644 --- a/src/Compilers/CSharp/Portable/Symbols/AnonymousTypes/SynthesizedSymbols/AnonymousType.SynthesizedMethodBase.cs +++ b/src/Compilers/CSharp/Portable/Symbols/AnonymousTypes/SynthesizedSymbols/AnonymousType.SynthesizedMethodBase.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Collections.Immutable; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.CSharp.Emit; +using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols diff --git a/src/Compilers/CSharp/Portable/Symbols/Attributes/AttributeData.cs b/src/Compilers/CSharp/Portable/Symbols/Attributes/AttributeData.cs index 30e083b20619c..16251c0e265ee 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Attributes/AttributeData.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Attributes/AttributeData.cs @@ -6,16 +6,16 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.Linq; +using System.Reflection; using System.Runtime.InteropServices; using System.Text; -using System.Reflection; +using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; -using Microsoft.CodeAnalysis; -using System.Diagnostics.CodeAnalysis; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Attributes/SourceAttributeData.cs b/src/Compilers/CSharp/Portable/Symbols/Attributes/SourceAttributeData.cs index dda01b8945108..fc9f046d7e228 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Attributes/SourceAttributeData.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Attributes/SourceAttributeData.cs @@ -5,10 +5,10 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Syntax; using System.Reflection.Metadata; -using System.Diagnostics.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/ConstantValueUtils.cs b/src/Compilers/CSharp/Portable/Symbols/ConstantValueUtils.cs index 9e5a0b229be8e..4d309c64d0f6e 100644 --- a/src/Compilers/CSharp/Portable/Symbols/ConstantValueUtils.cs +++ b/src/Compilers/CSharp/Portable/Symbols/ConstantValueUtils.cs @@ -4,8 +4,8 @@ #nullable disable -using System.Collections.Immutable; using System.Collections.Generic; +using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; diff --git a/src/Compilers/CSharp/Portable/Symbols/ConstraintsHelper.cs b/src/Compilers/CSharp/Portable/Symbols/ConstraintsHelper.cs index 037055b74e898..5ad2237fddb9f 100644 --- a/src/Compilers/CSharp/Portable/Symbols/ConstraintsHelper.cs +++ b/src/Compilers/CSharp/Portable/Symbols/ConstraintsHelper.cs @@ -9,10 +9,10 @@ using System.Collections.Immutable; using System.Diagnostics; using System.Linq; +using System.Runtime.CompilerServices; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; -using System.Runtime.CompilerServices; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/ErrorTypeSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/ErrorTypeSymbol.cs index 004f5ce10266d..565cd4d9e3837 100644 --- a/src/Compilers/CSharp/Portable/Symbols/ErrorTypeSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/ErrorTypeSymbol.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Roslyn.Utilities; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Runtime.InteropServices; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEEventSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEEventSymbol.cs index 802b89f730d4f..874d8f1e75d69 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEEventSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEEventSymbol.cs @@ -2,10 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.CSharp.DocumentationComments; -using Microsoft.CodeAnalysis.CSharp.Emit; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Collections.Immutable; @@ -14,6 +10,10 @@ using System.Reflection; using System.Reflection.Metadata; using System.Threading; +using Microsoft.CodeAnalysis.CSharp.DocumentationComments; +using Microsoft.CodeAnalysis.CSharp.Emit; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE { diff --git a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.cs index 427d4fb261044..ca89d1865f8c4 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.cs @@ -4,15 +4,15 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Text; -using Roslyn.Utilities; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Reflection.Metadata; -using System; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE { diff --git a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.cs index 94efbb4550f53..554c5cfcd8413 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.cs @@ -10,9 +10,9 @@ using System.Diagnostics; using System.Globalization; using System.Linq; -using System.Runtime.InteropServices; using System.Reflection; using System.Reflection.Metadata; +using System.Runtime.InteropServices; using System.Threading; using Microsoft.CodeAnalysis.CSharp.DocumentationComments; using Microsoft.CodeAnalysis.CSharp.Emit; diff --git a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamespaceSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamespaceSymbol.cs index f65dd9c4436b3..dcb62a5d18739 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamespaceSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamespaceSymbol.cs @@ -4,8 +4,6 @@ #nullable disable -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Collections.Immutable; @@ -13,6 +11,8 @@ using System.Linq; using System.Reflection.Metadata; using System.Threading; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE { diff --git a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.cs index 797c31a8e713f..a9aa1827f1b8a 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.cs @@ -5,11 +5,11 @@ #nullable disable using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Reflection.Metadata; using System.Threading; using Roslyn.Utilities; -using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE { diff --git a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/TupleTypeDecoder.cs b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/TupleTypeDecoder.cs index af0a16d9d0805..781c84fd29811 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/TupleTypeDecoder.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/TupleTypeDecoder.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.Diagnostics; using System.Reflection.Metadata; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE { diff --git a/src/Compilers/CSharp/Portable/Symbols/MethodSymbolExtensions.cs b/src/Compilers/CSharp/Portable/Symbols/MethodSymbolExtensions.cs index 6ff5ef7702a84..3e63d745b40e0 100644 --- a/src/Compilers/CSharp/Portable/Symbols/MethodSymbolExtensions.cs +++ b/src/Compilers/CSharp/Portable/Symbols/MethodSymbolExtensions.cs @@ -4,14 +4,14 @@ #nullable disable -using Microsoft.CodeAnalysis.Collections; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using Microsoft.CodeAnalysis.CSharp.Syntax; using System.Linq; +using Microsoft.CodeAnalysis.Collections; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/MissingModuleSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/MissingModuleSymbol.cs index 2bd3c1a5adb95..1d33e7416806f 100644 --- a/src/Compilers/CSharp/Portable/Symbols/MissingModuleSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/MissingModuleSymbol.cs @@ -7,13 +7,13 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; +using System.Reflection.PortableExecutable; using System.Runtime.InteropServices; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Diagnostics; -using System.Reflection.PortableExecutable; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/MissingNamespaceSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/MissingNamespaceSymbol.cs index 1fba2e3465546..55e93b06fd8ea 100644 --- a/src/Compilers/CSharp/Portable/Symbols/MissingNamespaceSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/MissingNamespaceSymbol.cs @@ -6,11 +6,11 @@ using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/NonMissingAssemblySymbol.cs b/src/Compilers/CSharp/Portable/Symbols/NonMissingAssemblySymbol.cs index ed8be8a7bfaea..8f9e8df846c87 100644 --- a/src/Compilers/CSharp/Portable/Symbols/NonMissingAssemblySymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/NonMissingAssemblySymbol.cs @@ -6,13 +6,13 @@ using System.Collections.Concurrent; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/OverriddenOrHiddenMembersResult.cs b/src/Compilers/CSharp/Portable/Symbols/OverriddenOrHiddenMembersResult.cs index bb9ed641b2cd0..b0fd8f7f4a810 100644 --- a/src/Compilers/CSharp/Portable/Symbols/OverriddenOrHiddenMembersResult.cs +++ b/src/Compilers/CSharp/Portable/Symbols/OverriddenOrHiddenMembersResult.cs @@ -5,10 +5,10 @@ #nullable disable using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; -using System.Diagnostics; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols diff --git a/src/Compilers/CSharp/Portable/Symbols/PointerTypeSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/PointerTypeSymbol.cs index b667cb0b3bbf6..9e3502ebfa8f3 100644 --- a/src/Compilers/CSharp/Portable/Symbols/PointerTypeSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/PointerTypeSymbol.cs @@ -7,9 +7,9 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using Roslyn.Utilities; using System.Diagnostics; using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/ReferenceManager.cs b/src/Compilers/CSharp/Portable/Symbols/ReferenceManager.cs index c74183f52f5f6..c5b5eeeff2ac7 100644 --- a/src/Compilers/CSharp/Portable/Symbols/ReferenceManager.cs +++ b/src/Compilers/CSharp/Portable/Symbols/ReferenceManager.cs @@ -6,15 +6,14 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; - +using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; -using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.cs index da4dc6aaf714d..4c57df2395fc4 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.cs @@ -9,14 +9,14 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Collections.ObjectModel; -using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using System.Diagnostics; +using System.Globalization; +using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Diagnostics; -using System.Globalization; -using System.Threading; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting { diff --git a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingEventSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingEventSymbol.cs index e8fd32a56eff5..63647d270ce22 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingEventSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingEventSymbol.cs @@ -5,15 +5,15 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; +using System.Globalization; +using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Diagnostics; -using System.Globalization; -using System.Threading; -using Microsoft.CodeAnalysis.CSharp.Emit; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting { diff --git a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingFieldSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingFieldSymbol.cs index a087f842c7370..187528900b853 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingFieldSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingFieldSymbol.cs @@ -8,8 +8,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.CSharp.Emit; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting { diff --git a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingNamespaceSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingNamespaceSymbol.cs index 9954e16c1f4f8..0a6b263a154ff 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingNamespaceSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingNamespaceSymbol.cs @@ -7,14 +7,14 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; +using System.Globalization; +using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Diagnostics; -using System.Globalization; -using System.Threading; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting { diff --git a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.cs b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.cs index be8ece2a7ba76..0503566765b9c 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.cs @@ -10,8 +10,8 @@ using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; diff --git a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingTypeParameterSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingTypeParameterSymbol.cs index 2ff127565b8d0..c209c66bcd967 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingTypeParameterSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingTypeParameterSymbol.cs @@ -7,13 +7,13 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; +using System.Globalization; using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Diagnostics; -using System.Globalization; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting { diff --git a/src/Compilers/CSharp/Portable/Symbols/SignatureOnlyMethodSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/SignatureOnlyMethodSymbol.cs index 59a09861eb1cf..76d1579fd7547 100644 --- a/src/Compilers/CSharp/Portable/Symbols/SignatureOnlyMethodSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/SignatureOnlyMethodSymbol.cs @@ -6,9 +6,9 @@ using System.Collections.Generic; using System.Collections.Immutable; -using Roslyn.Utilities; -using System.Reflection.Metadata; using System.Diagnostics; +using System.Reflection.Metadata; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/CustomModifierUtils.cs b/src/Compilers/CSharp/Portable/Symbols/Source/CustomModifierUtils.cs index c22d081db63ad..33b44573e0af7 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Source/CustomModifierUtils.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Source/CustomModifierUtils.cs @@ -4,11 +4,11 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; -using Microsoft.CodeAnalysis.PooledObjects; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourceEventSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourceEventSymbol.cs index 87b77df7f5c2c..af87e312a56ab 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Source/SourceEventSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Source/SourceEventSymbol.cs @@ -2,19 +2,19 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Globalization; +using System.Linq; using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Collections.Generic; -using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.CodeAnalysis.CSharp.Emit; -using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberFieldSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberFieldSymbol.cs index 238f0f2512e57..5c861766ee56e 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberFieldSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberFieldSymbol.cs @@ -4,16 +4,16 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Emit; -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Emit; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamedTypeSymbol_Bases.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamedTypeSymbol_Bases.cs index e52b2615acfcc..0969f400f1c3e 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamedTypeSymbol_Bases.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamedTypeSymbol_Bases.cs @@ -5,17 +5,17 @@ #nullable disable using System; +using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; using System.Threading; +using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Collections.Generic; -using Microsoft.CodeAnalysis.Collections; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/SubstitutedFieldSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/SubstitutedFieldSymbol.cs index d957d20bfbe9c..812ef064406a0 100644 --- a/src/Compilers/CSharp/Portable/Symbols/SubstitutedFieldSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/SubstitutedFieldSymbol.cs @@ -7,8 +7,8 @@ using System; using System.Collections.Immutable; using System.Threading; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.CSharp.Emit; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/SymbolCompletionState.cs b/src/Compilers/CSharp/Portable/Symbols/SymbolCompletionState.cs index 6bfd061ef6933..5b5479ca3f278 100644 --- a/src/Compilers/CSharp/Portable/Symbols/SymbolCompletionState.cs +++ b/src/Compilers/CSharp/Portable/Symbols/SymbolCompletionState.cs @@ -5,13 +5,13 @@ #nullable disable using System.Diagnostics; +using System.Text; using System.Threading; +using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Text; -using Microsoft.CodeAnalysis.Collections; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/SymbolDistinguisher.cs b/src/Compilers/CSharp/Portable/Symbols/SymbolDistinguisher.cs index 3d86b3527dfae..ec4d16a3f6bbb 100644 --- a/src/Compilers/CSharp/Portable/Symbols/SymbolDistinguisher.cs +++ b/src/Compilers/CSharp/Portable/Symbols/SymbolDistinguisher.cs @@ -4,11 +4,11 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedContainer.cs b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedContainer.cs index 7d424e0ca1f77..138b24313e81b 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedContainer.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedContainer.cs @@ -9,8 +9,8 @@ using System.Collections.Immutable; using System.Diagnostics; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.CSharp.Emit; +using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols diff --git a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEmbeddedAttributeSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEmbeddedAttributeSymbol.cs index c206668864d31..fc98a6999a3b7 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEmbeddedAttributeSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEmbeddedAttributeSymbol.cs @@ -4,16 +4,16 @@ #nullable disable -using Microsoft.Cci; -using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Runtime.InteropServices; using System.Linq; +using System.Runtime.InteropServices; +using Microsoft.Cci; using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEnumValueFieldSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEnumValueFieldSymbol.cs index 0a6e4a5ca5950..b83c855112c47 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEnumValueFieldSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEnumValueFieldSymbol.cs @@ -4,8 +4,8 @@ #nullable disable -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.CSharp.Emit; +using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols diff --git a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedFieldSymbolBase.cs b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedFieldSymbolBase.cs index 8e60bf2848e13..7c5244a655b09 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedFieldSymbolBase.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedFieldSymbolBase.cs @@ -6,8 +6,8 @@ using System.Collections.Immutable; using System.Diagnostics; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.CSharp.Emit; +using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols diff --git a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedInteractiveInitializerMethod.cs b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedInteractiveInitializerMethod.cs index c6f7bc3fbe8dc..2321dd4fd8bad 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedInteractiveInitializerMethod.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedInteractiveInitializerMethod.cs @@ -4,13 +4,13 @@ #nullable disable -using Roslyn.Utilities; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Reflection; using System.Linq; +using System.Reflection; using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedIntrinsicOperatorSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedIntrinsicOperatorSymbol.cs index e97ac78ab7771..c8c9c9ed74f27 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedIntrinsicOperatorSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedIntrinsicOperatorSymbol.cs @@ -4,11 +4,11 @@ #nullable disable +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using Roslyn.Utilities; -using System; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/SynthesizedNamespaceSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/SynthesizedNamespaceSymbol.cs index 67f5a5d21a364..cd5f7eec36f68 100644 --- a/src/Compilers/CSharp/Portable/Symbols/SynthesizedNamespaceSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/SynthesizedNamespaceSymbol.cs @@ -4,11 +4,11 @@ #nullable disable +using System; using System.Collections.Immutable; -using Roslyn.Utilities; using System.Diagnostics; -using System; using Microsoft.CodeAnalysis.Emit; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Tuples/TupleFieldSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Tuples/TupleFieldSymbol.cs index 44a1763685642..0a3309ffbe87a 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Tuples/TupleFieldSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Tuples/TupleFieldSymbol.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Roslyn.Utilities; using System.Collections.Immutable; using System.Diagnostics; using System.Threading; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { /// diff --git a/src/Compilers/CSharp/Portable/Symbols/Wrapped/WrappedParameterSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Wrapped/WrappedParameterSymbol.cs index d72ddee82e48d..696ed2a2403d3 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Wrapped/WrappedParameterSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Wrapped/WrappedParameterSymbol.cs @@ -9,8 +9,8 @@ using System.Globalization; using System.Runtime.InteropServices; using System.Threading; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.CSharp.Emit; +using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Syntax/EventDeclarationSyntax.cs b/src/Compilers/CSharp/Portable/Syntax/EventDeclarationSyntax.cs index 3525feb6ac5d5..daaac1d4c207b 100644 --- a/src/Compilers/CSharp/Portable/Syntax/EventDeclarationSyntax.cs +++ b/src/Compilers/CSharp/Portable/Syntax/EventDeclarationSyntax.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.CSharp.Syntax; using System; using System.ComponentModel; +using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp.Syntax { diff --git a/src/Compilers/CSharp/Portable/Syntax/IndexerDeclarationSyntax.cs b/src/Compilers/CSharp/Portable/Syntax/IndexerDeclarationSyntax.cs index c87269a9fe8bc..18570e031863d 100644 --- a/src/Compilers/CSharp/Portable/Syntax/IndexerDeclarationSyntax.cs +++ b/src/Compilers/CSharp/Portable/Syntax/IndexerDeclarationSyntax.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.CSharp.Syntax; using System; using System.ComponentModel; +using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp.Syntax { diff --git a/src/Compilers/CSharp/Portable/Syntax/InternalSyntax/SyntaxToken.SyntaxLiteral.cs b/src/Compilers/CSharp/Portable/Syntax/InternalSyntax/SyntaxToken.SyntaxLiteral.cs index 0493e1929af71..1313991bfaefc 100644 --- a/src/Compilers/CSharp/Portable/Syntax/InternalSyntax/SyntaxToken.SyntaxLiteral.cs +++ b/src/Compilers/CSharp/Portable/Syntax/InternalSyntax/SyntaxToken.SyntaxLiteral.cs @@ -5,8 +5,8 @@ #nullable disable using System; -using Roslyn.Utilities; using System.Globalization; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax { diff --git a/src/Compilers/CSharp/Portable/Syntax/PropertyDeclarationSyntax.cs b/src/Compilers/CSharp/Portable/Syntax/PropertyDeclarationSyntax.cs index aff5609cb9091..69f707f0d0681 100644 --- a/src/Compilers/CSharp/Portable/Syntax/PropertyDeclarationSyntax.cs +++ b/src/Compilers/CSharp/Portable/Syntax/PropertyDeclarationSyntax.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.CSharp.Syntax; using System; using System.ComponentModel; +using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp.Syntax { diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Embedded.cs b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Embedded.cs index 46140ddffb010..15096365946e9 100644 --- a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Embedded.cs +++ b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Embedded.cs @@ -4,10 +4,10 @@ #nullable disable +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; -using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_IsUnmanaged.cs b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_IsUnmanaged.cs index 7030e4225e882..b6ff93bc41ed8 100644 --- a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_IsUnmanaged.cs +++ b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_IsUnmanaged.cs @@ -4,6 +4,9 @@ #nullable disable +using System; +using System.Collections.Immutable; +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Syntax; @@ -12,9 +15,6 @@ using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Roslyn.Utilities; -using System; -using System.Collections.Immutable; -using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_ReadOnlyStruct.cs b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_ReadOnlyStruct.cs index 159326acfd8e6..845b55490bcbb 100644 --- a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_ReadOnlyStruct.cs +++ b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_ReadOnlyStruct.cs @@ -4,6 +4,8 @@ #nullable disable +using System.Collections.Immutable; +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Syntax; @@ -11,8 +13,6 @@ using Microsoft.CodeAnalysis.CSharp.UnitTests; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System.Collections.Immutable; -using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/EmitTestStrongNameProvider.cs b/src/Compilers/CSharp/Test/Emit/Attributes/EmitTestStrongNameProvider.cs index b782b74d7fdb6..b2ce8ef31f404 100644 --- a/src/Compilers/CSharp/Test/Emit/Attributes/EmitTestStrongNameProvider.cs +++ b/src/Compilers/CSharp/Test/Emit/Attributes/EmitTestStrongNameProvider.cs @@ -7,8 +7,8 @@ using System; using System.Collections.Immutable; using System.IO; -using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; using static Roslyn.Test.Utilities.SigningTestHelpers; diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/WellKnownAttributesTestBase.cs b/src/Compilers/CSharp/Test/Emit/Attributes/WellKnownAttributesTestBase.cs index ce04f6bc96c1b..cd1bece715397 100644 --- a/src/Compilers/CSharp/Test/Emit/Attributes/WellKnownAttributesTestBase.cs +++ b/src/Compilers/CSharp/Test/Emit/Attributes/WellKnownAttributesTestBase.cs @@ -11,16 +11,16 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Text; -using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using Microsoft.CodeAnalysis.CSharp.Emit; -using Microsoft.CodeAnalysis.Emit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenCapturing.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenCapturing.cs index d74d9d4e7b2d2..f0094bebf978a 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenCapturing.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenCapturing.cs @@ -4,17 +4,17 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Roslyn.Test.Utilities; using System; +using System.Collections; +using System.Collections.Concurrent; using System.Collections.Generic; +using System.Collections.Immutable; using System.Linq; using System.Text; -using Xunit; -using System.Collections; -using System.Collections.Immutable; using System.Threading.Tasks; -using System.Collections.Concurrent; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen { diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenIterators.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenIterators.cs index 5b00142ccda9c..339905212e604 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenIterators.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenIterators.cs @@ -4,10 +4,10 @@ #nullable disable +using System; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenOperators.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenOperators.cs index a44a2e1b40a7f..8b979fdba4a8d 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenOperators.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenOperators.cs @@ -4,14 +4,14 @@ #nullable disable +using System.Collections.Immutable; +using System.Text; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.CSharp.UnitTests.Emit; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System.Collections.Immutable; -using System.Text; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs index ba34dbeb843e1..1b18026cd622a 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs @@ -21,8 +21,8 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using static TestResources.NetFX.ValueTuple; using static Roslyn.Test.Utilities.TestMetadata; +using static TestResources.NetFX.ValueTuple; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen { diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/EventTests.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/EventTests.cs index 6039a5b140eec..2da7e739245d6 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/EventTests.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/EventTests.cs @@ -9,10 +9,10 @@ using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.CSharp.UnitTests.Emit; -using Microsoft.CodeAnalysis.Text; -using Xunit; using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen { diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/FixedSizeBufferTests.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/FixedSizeBufferTests.cs index 97e453e6292f8..4ca148a5ce26f 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/FixedSizeBufferTests.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/FixedSizeBufferTests.cs @@ -4,6 +4,8 @@ #nullable disable +using System.Linq; +using System.Runtime.InteropServices; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; using Microsoft.CodeAnalysis.CSharp.Syntax; @@ -11,8 +13,6 @@ using Microsoft.CodeAnalysis.CSharp.UnitTests.Emit; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System.Linq; -using System.Runtime.InteropServices; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/WinMdDelegateTests.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/WinMdDelegateTests.cs index 91944f42f246e..7b1a1a4a43a1f 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/WinMdDelegateTests.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/WinMdDelegateTests.cs @@ -4,15 +4,15 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Test.Utilities; -using Roslyn.Test.Utilities; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.Test.Utilities; +using Roslyn.Test.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen diff --git a/src/Compilers/CSharp/Test/Emit/Emit/DeterministicTests.cs b/src/Compilers/CSharp/Test/Emit/Emit/DeterministicTests.cs index 777f086f5e01a..f4e7f270db03f 100644 --- a/src/Compilers/CSharp/Test/Emit/Emit/DeterministicTests.cs +++ b/src/Compilers/CSharp/Test/Emit/Emit/DeterministicTests.cs @@ -9,15 +9,15 @@ using System.Collections.Immutable; using System.IO; using System.Linq; +using System.Reflection.PortableExecutable; using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Test.Utilities; -using System.Reflection.PortableExecutable; using Roslyn.Test.Utilities; using Xunit; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Emit { diff --git a/src/Compilers/CSharp/Test/Emit/Emit/DynamicAnalysis/DynamicInstrumentationTests.cs b/src/Compilers/CSharp/Test/Emit/Emit/DynamicAnalysis/DynamicInstrumentationTests.cs index 805e7440a5a59..3672986518128 100644 --- a/src/Compilers/CSharp/Test/Emit/Emit/DynamicAnalysis/DynamicInstrumentationTests.cs +++ b/src/Compilers/CSharp/Test/Emit/Emit/DynamicAnalysis/DynamicInstrumentationTests.cs @@ -10,8 +10,8 @@ using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Test.Utilities; -using Xunit; using Roslyn.Test.Utilities; +using Xunit; using static Microsoft.CodeAnalysis.Test.Utilities.CSharpInstrumentationChecker; namespace Microsoft.CodeAnalysis.CSharp.DynamicAnalysis.UnitTests diff --git a/src/Compilers/CSharp/Test/Emit/Emit/EmitCustomModifiers.cs b/src/Compilers/CSharp/Test/Emit/Emit/EmitCustomModifiers.cs index 57b74980239f0..2b2dd37b943fa 100644 --- a/src/Compilers/CSharp/Test/Emit/Emit/EmitCustomModifiers.cs +++ b/src/Compilers/CSharp/Test/Emit/Emit/EmitCustomModifiers.cs @@ -4,6 +4,7 @@ #nullable disable +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; @@ -11,7 +12,6 @@ using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Xunit; -using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Emit { diff --git a/src/Compilers/CSharp/Test/Emit/Emit/EmitErrorTests.cs b/src/Compilers/CSharp/Test/Emit/Emit/EmitErrorTests.cs index 3a559fcdc2531..7480727fa0bb1 100644 --- a/src/Compilers/CSharp/Test/Emit/Emit/EmitErrorTests.cs +++ b/src/Compilers/CSharp/Test/Emit/Emit/EmitErrorTests.cs @@ -8,13 +8,13 @@ using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.CSharp.UnitTests.Emit; +using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Xunit; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Emit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Emit/Emit/EndToEndTests.cs b/src/Compilers/CSharp/Test/Emit/Emit/EndToEndTests.cs index 6ba84970145bc..52f03b0dc8423 100644 --- a/src/Compilers/CSharp/Test/Emit/Emit/EndToEndTests.cs +++ b/src/Compilers/CSharp/Test/Emit/Emit/EndToEndTests.cs @@ -4,14 +4,14 @@ #nullable disable -using Roslyn.Test.Utilities; using System; using System.Text; -using Xunit; -using Microsoft.CodeAnalysis.Test.Utilities; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.Test.Utilities; +using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Emit { diff --git a/src/Compilers/CSharp/Test/Emit/Emit/ResourceTests.cs b/src/Compilers/CSharp/Test/Emit/Emit/ResourceTests.cs index 148d8e54805be..002a297f21135 100644 --- a/src/Compilers/CSharp/Test/Emit/Emit/ResourceTests.cs +++ b/src/Compilers/CSharp/Test/Emit/Emit/ResourceTests.cs @@ -7,6 +7,7 @@ using System; using System.ComponentModel; using System.Diagnostics; +using System.Globalization; using System.IO; using System.Linq; using System.Reflection; @@ -17,7 +18,6 @@ using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using System.Globalization; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Emit { diff --git a/src/Compilers/CSharp/Test/Emit/PrivateProtected.cs b/src/Compilers/CSharp/Test/Emit/PrivateProtected.cs index 059a107ff10ba..9dde54b58840d 100644 --- a/src/Compilers/CSharp/Test/Emit/PrivateProtected.cs +++ b/src/Compilers/CSharp/Test/Emit/PrivateProtected.cs @@ -5,12 +5,12 @@ #nullable disable using System.Collections.Immutable; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using static Roslyn.Test.Utilities.SigningTestHelpers; using Xunit; -using Microsoft.CodeAnalysis.CSharp.Symbols; +using static Roslyn.Test.Utilities.SigningTestHelpers; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_ISymbolInitializer.cs b/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_ISymbolInitializer.cs index 152a0fde829df..57a316bff5c0b 100644 --- a/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_ISymbolInitializer.cs +++ b/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_ISymbolInitializer.cs @@ -4,11 +4,11 @@ #nullable disable +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidExpression.cs b/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidExpression.cs index f305a8ac4c238..4b74c29f6559f 100644 --- a/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidExpression.cs +++ b/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidExpression.cs @@ -4,11 +4,11 @@ #nullable disable +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidStatement.cs b/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidStatement.cs index 4c7dc839b84bc..8ae2a7da92177 100644 --- a/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidStatement.cs +++ b/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidStatement.cs @@ -4,11 +4,11 @@ #nullable disable +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Semantic/Diagnostics/OperationAnalyzerTests.cs b/src/Compilers/CSharp/Test/Semantic/Diagnostics/OperationAnalyzerTests.cs index a9bc194f86d55..277255018b29f 100644 --- a/src/Compilers/CSharp/Test/Semantic/Diagnostics/OperationAnalyzerTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Diagnostics/OperationAnalyzerTests.cs @@ -9,9 +9,9 @@ using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.UnitTests.Diagnostics; using Roslyn.Test.Utilities; using Xunit; -using Microsoft.CodeAnalysis.UnitTests.Diagnostics; using static Microsoft.CodeAnalysis.CommonDiagnosticAnalyzers; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Semantic/FlowAnalysis/StructTests.cs b/src/Compilers/CSharp/Test/Semantic/FlowAnalysis/StructTests.cs index fd01c43e7352f..820b34dc468fd 100644 --- a/src/Compilers/CSharp/Test/Semantic/FlowAnalysis/StructTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/FlowAnalysis/StructTests.cs @@ -6,10 +6,10 @@ using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/AwaitExpressionTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/AwaitExpressionTests.cs index ff547024e3d84..fe5e2825286f5 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/AwaitExpressionTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/AwaitExpressionTests.cs @@ -4,6 +4,7 @@ #nullable disable +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; @@ -11,7 +12,6 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/BetterCandidates.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/BetterCandidates.cs index 32280b50301e3..551ad4a8973d4 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/BetterCandidates.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/BetterCandidates.cs @@ -4,16 +4,16 @@ #nullable disable +using System.Collections; using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using System.Linq; -using System.Diagnostics; -using System.Collections; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/BindingTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/BindingTests.cs index 8249170b71bb9..52fa733e979a7 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/BindingTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/BindingTests.cs @@ -7,11 +7,11 @@ using System.Collections.Generic; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/DynamicTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/DynamicTests.cs index d415815594392..c1d31f7ee972d 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/DynamicTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/DynamicTests.cs @@ -5,14 +5,14 @@ #nullable disable using System; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Roslyn.Test.Utilities; -using Xunit; using System.Collections.Generic; using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; +using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/ExpressionBodiedMemberTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/ExpressionBodiedMemberTests.cs index 9c6a695db5e08..277c95d65174f 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/ExpressionBodiedMemberTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/ExpressionBodiedMemberTests.cs @@ -7,11 +7,11 @@ using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.CSharp.UnitTests; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/FuzzTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/FuzzTests.cs index 8578baf232325..94a2cd3bb6587 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/FuzzTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/FuzzTests.cs @@ -4,10 +4,10 @@ #nullable disable +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/ImportsTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/ImportsTests.cs index f437cd21dff54..fdbf532ca8bb0 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/ImportsTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/ImportsTests.cs @@ -5,6 +5,7 @@ #nullable disable using System.Collections.Generic; +using System.Collections.Immutable; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; @@ -12,7 +13,6 @@ using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/InteractiveUsingTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/InteractiveUsingTests.cs index a475e3a18146f..7d7030cb5c786 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/InteractiveUsingTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/InteractiveUsingTests.cs @@ -9,9 +9,9 @@ using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using Microsoft.CodeAnalysis.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/InterpolationTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/InterpolationTests.cs index 62cc043b27220..ebd4dc113af5f 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/InterpolationTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/InterpolationTests.cs @@ -4,10 +4,10 @@ #nullable disable +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/IteratorTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/IteratorTests.cs index 97944cb79b263..da76c2242edd1 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/IteratorTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/IteratorTests.cs @@ -5,14 +5,14 @@ #nullable disable using System.IO; +using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Emit; +using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.Test.Utilities; -using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/LocalFunctionTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/LocalFunctionTests.cs index 9daf64427a68e..ab5c72d182466 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/LocalFunctionTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/LocalFunctionTests.cs @@ -4,15 +4,15 @@ #nullable disable +using System; +using System.Collections.Immutable; +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Roslyn.Utilities; -using System; -using System.Collections.Immutable; -using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/MemberResolutionResultTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/MemberResolutionResultTests.cs index d4ffaa5b3ccfa..c33793350f039 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/MemberResolutionResultTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/MemberResolutionResultTests.cs @@ -4,12 +4,12 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.Semantics diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/NameLengthTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/NameLengthTests.cs index f6892c39b5001..9c6f4a3bd8de1 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/NameLengthTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/NameLengthTests.cs @@ -4,13 +4,13 @@ #nullable disable +using System; using System.IO; +using Microsoft.Cci; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using Microsoft.Cci; -using System; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/NameOfTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/NameOfTests.cs index 0a0dc8c945aac..4c6c3bf5f4ec8 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/NameOfTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/NameOfTests.cs @@ -5,14 +5,14 @@ #nullable disable using System; +using System.Linq; +using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using System.Threading; -using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/OperatorTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/OperatorTests.cs index 44d5fc2dd4851..8a208dcd25d5b 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/OperatorTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/OperatorTests.cs @@ -11,9 +11,9 @@ using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Xunit; -using Roslyn.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; +using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/OutVarTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/OutVarTests.cs index 99740a7cd5898..55a8f6b91bed7 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/OutVarTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/OutVarTests.cs @@ -11,11 +11,11 @@ using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Test.Utilities; -using Xunit; using Roslyn.Test.Utilities; using Roslyn.Utilities; -using Microsoft.CodeAnalysis.Diagnostics; +using Xunit; using static Roslyn.Test.Utilities.TestMetadata; using ReferenceEqualityComparer = Roslyn.Utilities.ReferenceEqualityComparer; diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionPerfTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionPerfTests.cs index 6566129e0fbb1..069e335a97079 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionPerfTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionPerfTests.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Roslyn.Test.Utilities; using System.Linq; using System.Text; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Roslyn.Test.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionTestBase.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionTestBase.cs index 1e10ff7a1c44f..217ea164c2a8d 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionTestBase.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionTestBase.cs @@ -4,17 +4,17 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.CSharp.UnitTests; -using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Xunit; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.CSharp.UnitTests; using Roslyn.Test.Utilities; +using Roslyn.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTestBase.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTestBase.cs index 3b592a4aab8f7..0a1acdc0277c7 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTestBase.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTestBase.cs @@ -12,8 +12,8 @@ using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using Xunit; using Roslyn.Utilities; +using Xunit; using ReferenceEqualityComparer = Roslyn.Utilities.ReferenceEqualityComparer; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTests_Global.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTests_Global.cs index 1ea2d6a668273..7653b63ee75b2 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTests_Global.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTests_Global.cs @@ -12,8 +12,8 @@ using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using Xunit; using Roslyn.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/PropertyAccessTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/PropertyAccessTests.cs index bf0fc81bae2d4..ba54d2743ed80 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/PropertyAccessTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/PropertyAccessTests.cs @@ -4,14 +4,14 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.UnitTests; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Xunit; +using Microsoft.CodeAnalysis.CSharp.UnitTests; using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/ReadOnlyStructsTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/ReadOnlyStructsTests.cs index 3f03276b84575..735118312449d 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/ReadOnlyStructsTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/ReadOnlyStructsTests.cs @@ -5,8 +5,8 @@ #nullable disable using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/RefExtensionMethodsTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/RefExtensionMethodsTests.cs index 97ded5084ff70..fcc20148e20ac 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/RefExtensionMethodsTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/RefExtensionMethodsTests.cs @@ -7,11 +7,11 @@ using System.Collections.Generic; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/RefLocalsAndReturnsTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/RefLocalsAndReturnsTests.cs index 3883f09aeb305..62cbf64ff98f2 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/RefLocalsAndReturnsTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/RefLocalsAndReturnsTests.cs @@ -5,13 +5,13 @@ #nullable disable using System.Collections.Generic; -using Xunit; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Roslyn.Test.Utilities; using System.Linq; -using Microsoft.CodeAnalysis.Test.Utilities; -using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.Test.Utilities; +using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/StructsTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/StructsTests.cs index 083a1c1bf07aa..714082c2cfd8f 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/StructsTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/StructsTests.cs @@ -5,8 +5,8 @@ #nullable disable using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/SwitchTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/SwitchTests.cs index 6578ef1ef3bf0..764e0cbe50dd1 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/SwitchTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/SwitchTests.cs @@ -4,11 +4,11 @@ #nullable disable +using System.Collections.Generic; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using System.Collections.Generic; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/SyntaxTreeRootTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/SyntaxTreeRootTests.cs index a5bdfcbdb0f5a..29b31dc9201d3 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/SyntaxTreeRootTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/SyntaxTreeRootTests.cs @@ -4,17 +4,17 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Text; using System; using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; -using Xunit; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.Text; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/TargetTypedDefaultTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/TargetTypedDefaultTests.cs index ebf0618a26854..0cf060d4961e5 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/TargetTypedDefaultTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/TargetTypedDefaultTests.cs @@ -4,12 +4,12 @@ #nullable disable +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; -using System.Linq; -using Xunit; using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/TypeOfTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/TypeOfTests.cs index fb6da4b4f8889..26429c2968029 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/TypeOfTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/TypeOfTests.cs @@ -4,12 +4,12 @@ #nullable disable +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/WarningVersionTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/WarningVersionTests.cs index 9a0a81a379c1b..f810de72192f0 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/WarningVersionTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/WarningVersionTests.cs @@ -4,8 +4,8 @@ #nullable disable -using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.Test.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Symbol/Compilation/CompilationAPITests.cs b/src/Compilers/CSharp/Test/Symbol/Compilation/CompilationAPITests.cs index 188a65c7fe99f..563876d4d33da 100644 --- a/src/Compilers/CSharp/Test/Symbol/Compilation/CompilationAPITests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Compilation/CompilationAPITests.cs @@ -12,6 +12,7 @@ using System.IO; using System.Linq; using System.Reflection.PortableExecutable; +using System.Security.Cryptography; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -25,11 +26,10 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using VB = Microsoft.CodeAnalysis.VisualBasic; -using KeyValuePairUtil = Roslyn.Utilities.KeyValuePairUtil; -using System.Security.Cryptography; using static Roslyn.Test.Utilities.TestHelpers; using static Roslyn.Test.Utilities.TestMetadata; +using KeyValuePairUtil = Roslyn.Utilities.KeyValuePairUtil; +using VB = Microsoft.CodeAnalysis.VisualBasic; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Symbol/Compilation/QueryClauseInfoTests.cs b/src/Compilers/CSharp/Test/Symbol/Compilation/QueryClauseInfoTests.cs index b4ce0158e8f82..a871c72fbe263 100644 --- a/src/Compilers/CSharp/Test/Symbol/Compilation/QueryClauseInfoTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Compilation/QueryClauseInfoTests.cs @@ -4,10 +4,10 @@ #nullable disable +using System; using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; -using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/AnonymousTypesSymbolTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/AnonymousTypesSymbolTests.cs index 3f21385a75283..2da7b08de5445 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/AnonymousTypesSymbolTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/AnonymousTypesSymbolTests.cs @@ -10,15 +10,15 @@ using System.IO; using System.Linq; using System.Reflection; +using System.Threading.Tasks; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using Xunit; -using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Emit; using Roslyn.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols { diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/ExtensionMethodTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/ExtensionMethodTests.cs index d6377beb3b457..19d6886ee5d46 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/ExtensionMethodTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/ExtensionMethodTests.cs @@ -15,8 +15,8 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using Utils = Microsoft.CodeAnalysis.CSharp.UnitTests.CompilationUtils; using static Roslyn.Test.Utilities.TestMetadata; +using Utils = Microsoft.CodeAnalysis.CSharp.UnitTests.CompilationUtils; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols { diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/BaseTypeResolution.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/BaseTypeResolution.cs index f78cca40a4721..ccae184393d63 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/BaseTypeResolution.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/BaseTypeResolution.cs @@ -6,16 +6,16 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using System.Reflection.Metadata; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using CSReferenceManager = Microsoft.CodeAnalysis.CSharp.CSharpCompilation.ReferenceManager; -using System.Reflection.Metadata; using static Roslyn.Test.Utilities.TestMetadata; +using CSReferenceManager = Microsoft.CodeAnalysis.CSharp.CSharpCompilation.ReferenceManager; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Metadata.PE { diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingEvents.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingEvents.cs index 61852eab05639..8dd4851d5b179 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingEvents.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingEvents.cs @@ -4,13 +4,13 @@ #nullable disable +using System; +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System; -using System.Linq; using Xunit; using static Roslyn.Test.Utilities.TestMetadata; diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingFields.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingFields.cs index 1c0bc08a0f255..65a5bed45286e 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingFields.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingFields.cs @@ -4,12 +4,12 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Metadata.PE diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingIndexers.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingIndexers.cs index dcac054e6cdb5..6d50321fbb442 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingIndexers.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingIndexers.cs @@ -5,8 +5,8 @@ #nullable disable using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingMethods.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingMethods.cs index c3b413062e0fc..bc2987f30eeae 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingMethods.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingMethods.cs @@ -5,14 +5,14 @@ #nullable disable using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using System.Reflection; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using System.Reflection; using static Roslyn.Test.Utilities.TestMetadata; //test diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/NoPia.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/NoPia.cs index 532eea11e15a3..10040d4c7cc09 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/NoPia.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/NoPia.cs @@ -10,8 +10,8 @@ using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; -using Xunit; using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Retargeting { diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomAttributes.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomAttributes.cs index 8cc57e46a9b83..eabb9c0e366d5 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomAttributes.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomAttributes.cs @@ -5,13 +5,13 @@ #nullable disable using System; +using System.Collections.Generic; using System.Linq; using System.Reflection.Metadata; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Roslyn.Test.Utilities; -using System.Collections.Generic; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Retargeting diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomModifiers.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomModifiers.cs index 0edd129c020d2..cd66ea697f1ca 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomModifiers.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomModifiers.cs @@ -5,15 +5,15 @@ #nullable disable using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; -using Xunit; using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Retargeting { diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetingTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetingTests.cs index fad0938036e7c..1b13524e0e91a 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetingTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetingTests.cs @@ -7,8 +7,8 @@ using System; using System.Collections.Immutable; using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Test.Utilities; diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/BaseClassTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/BaseClassTests.cs index e37e1eaad7c06..6f4ef3280c515 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/BaseClassTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/BaseClassTests.cs @@ -8,8 +8,8 @@ using System.Collections.Immutable; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Emit; -using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Emit; diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/EventTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/EventTests.cs index 4c6b66371c085..351be904bff16 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/EventTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/EventTests.cs @@ -4,14 +4,14 @@ #nullable disable +using System; +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System; -using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Source diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/ExpressionBodiedPropertyTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/ExpressionBodiedPropertyTests.cs index ad857ae71ef04..8d3d3bf859fb4 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/ExpressionBodiedPropertyTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/ExpressionBodiedPropertyTests.cs @@ -4,12 +4,12 @@ #nullable disable +using System; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System; using Xunit; -using Microsoft.CodeAnalysis.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Source { diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/MethodTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/MethodTests.cs index 056af7e3cf087..9405b61bcc557 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/MethodTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/MethodTests.cs @@ -12,8 +12,8 @@ using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/PropertyTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/PropertyTests.cs index 21a09ff22a202..e115e9ab553b7 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/PropertyTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/PropertyTests.cs @@ -7,14 +7,14 @@ using System; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Emit; -using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using Microsoft.CodeAnalysis.Emit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Source { diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/UsingAliasTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/UsingAliasTests.cs index cdb2cfbd0aaeb..cd35785d2e835 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/UsingAliasTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/UsingAliasTests.cs @@ -4,12 +4,12 @@ #nullable disable +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; -using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Source diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolExtensionTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolExtensionTests.cs index 6c032e4930553..50ff5e485493c 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolExtensionTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolExtensionTests.cs @@ -4,10 +4,10 @@ #nullable disable +using System; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Roslyn.Test.Utilities; -using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/TypedConstantTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/TypedConstantTests.cs index a045c2f5e5cd5..dace0526993f7 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/TypedConstantTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/TypedConstantTests.cs @@ -9,8 +9,8 @@ using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.Text; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols diff --git a/src/Compilers/CSharp/Test/Syntax/Diagnostics/DiagnosticTest.MockSyntaxTree.cs b/src/Compilers/CSharp/Test/Syntax/Diagnostics/DiagnosticTest.MockSyntaxTree.cs index 1a33cee8c15c6..9a77b42d0a123 100644 --- a/src/Compilers/CSharp/Test/Syntax/Diagnostics/DiagnosticTest.MockSyntaxTree.cs +++ b/src/Compilers/CSharp/Test/Syntax/Diagnostics/DiagnosticTest.MockSyntaxTree.cs @@ -5,12 +5,12 @@ #nullable disable using System; +using System.Collections.Immutable; +using System.Text; +using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; -using System.Threading; -using System.Text; -using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Syntax/LexicalAndXml/XmlDocCommentTests.cs b/src/Compilers/CSharp/Test/Syntax/LexicalAndXml/XmlDocCommentTests.cs index 2479f4a321137..50ae3df85edee 100644 --- a/src/Compilers/CSharp/Test/Syntax/LexicalAndXml/XmlDocCommentTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/LexicalAndXml/XmlDocCommentTests.cs @@ -4,17 +4,17 @@ #nullable disable +using System; using System.Collections.Generic; using System.Linq; using System.Text; +using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Xunit; -using System; -using System.Threading; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/AsyncParsingTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/AsyncParsingTests.cs index 78f0a99e054da..3237701931a7a 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/AsyncParsingTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/AsyncParsingTests.cs @@ -4,9 +4,9 @@ #nullable disable +using System; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Roslyn.Test.Utilities; -using System; using Xunit; using Xunit.Abstractions; diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/CrefParsingTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/CrefParsingTests.cs index 7238a96dc69a8..857299cb5a80a 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/CrefParsingTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/CrefParsingTests.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Roslyn.Test.Utilities; using System; using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Roslyn.Test.Utilities; using Xunit; using Xunit.Abstractions; diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/LocalFunctionParsingTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/LocalFunctionParsingTests.cs index f0034659cc1c1..49a439458bb76 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/LocalFunctionParsingTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/LocalFunctionParsingTests.cs @@ -4,11 +4,11 @@ #nullable disable +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System.Linq; using Xunit; using Xunit.Abstractions; diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/ParserRegressionTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/ParserRegressionTests.cs index ce56ecd88690e..ab0132a81b74e 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/ParserRegressionTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/ParserRegressionTests.cs @@ -4,13 +4,13 @@ #nullable disable +using System.Collections.Generic; +using System.Linq; +using System.Text; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Roslyn.Test.Utilities.Syntax; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Xunit; using Xunit.Abstractions; diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/ReadOnlyStructs.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/ReadOnlyStructs.cs index 4f83645482f13..6deb183df98b2 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/ReadOnlyStructs.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/ReadOnlyStructs.cs @@ -4,11 +4,11 @@ #nullable disable -using Xunit; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using Xunit; using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Parsing diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/RefReadonlyTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/RefReadonlyTests.cs index f6a22989d091c..bcad9d472383a 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/RefReadonlyTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/RefReadonlyTests.cs @@ -4,11 +4,11 @@ #nullable disable -using Xunit; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using Xunit; using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Parsing diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/RefStructs.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/RefStructs.cs index b8fffc5bdca7c..a0d94da957139 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/RefStructs.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/RefStructs.cs @@ -4,11 +4,11 @@ #nullable disable -using Xunit; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using Xunit; using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Parsing diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/StackAllocInitializerParsingTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/StackAllocInitializerParsingTests.cs index 8b3901f69bbf6..2f1e33f2bbfca 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/StackAllocInitializerParsingTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/StackAllocInitializerParsingTests.cs @@ -4,9 +4,9 @@ #nullable disable -using Xunit; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; +using Xunit; using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Parsing diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/ValueTupleTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/ValueTupleTests.cs index 8ee753002d30d..04623ca4649a7 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/ValueTupleTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/ValueTupleTests.cs @@ -4,11 +4,11 @@ #nullable disable -using Xunit; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using Xunit; using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Parsing diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/ChildSyntaxListTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/ChildSyntaxListTests.cs index e78a52ddb1afc..2e3e791a4e5b7 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/ChildSyntaxListTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/ChildSyntaxListTests.cs @@ -4,10 +4,10 @@ #nullable disable +using System; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; -using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxFactoryTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxFactoryTests.cs index e2f6c14aea80a..f974ae530f74d 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxFactoryTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxFactoryTests.cs @@ -9,11 +9,11 @@ using System.Linq; using System.Text; using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Xunit; using InternalSyntax = Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxListTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxListTests.cs index be509ab5aa57c..8bc38e834862d 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxListTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxListTests.cs @@ -4,14 +4,14 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Test.Utilities; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeOrTokenListTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeOrTokenListTests.cs index 6d3c6c6053186..efa2b506d8c06 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeOrTokenListTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeOrTokenListTests.cs @@ -4,11 +4,11 @@ #nullable disable +using System; using System.Collections.Generic; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; -using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeTests.cs index ffaca6b7089bb..72432349b1946 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeTests.cs @@ -7,12 +7,12 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Text; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Xunit; using InternalSyntax = Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax; -using System.Text; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNormalizerTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNormalizerTests.cs index 0e87076b9dafd..02355c4900028 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNormalizerTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNormalizerTests.cs @@ -4,13 +4,13 @@ #nullable disable +using System; using System.Text; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Xunit; -using System; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTokenListTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTokenListTests.cs index 604927769ceca..9552777a9dea8 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTokenListTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTokenListTests.cs @@ -4,11 +4,11 @@ #nullable disable +using System; using System.Collections.Generic; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; -using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTriviaListTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTriviaListTests.cs index 7b86b365596e6..47b290af32762 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTriviaListTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTriviaListTests.cs @@ -4,11 +4,11 @@ #nullable disable +using System; using System.Collections.Generic; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; -using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/WinRT/CodeGen/WinRTCollectionTests.cs b/src/Compilers/CSharp/Test/WinRT/CodeGen/WinRTCollectionTests.cs index f094328bc9e46..aafee2b066d48 100644 --- a/src/Compilers/CSharp/Test/WinRT/CodeGen/WinRTCollectionTests.cs +++ b/src/Compilers/CSharp/Test/WinRT/CodeGen/WinRTCollectionTests.cs @@ -5,12 +5,12 @@ #nullable disable using System.Collections.Generic; +using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen { diff --git a/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdEventTests.cs b/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdEventTests.cs index 44eb7a532aa3d..75987d8c14723 100644 --- a/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdEventTests.cs +++ b/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdEventTests.cs @@ -4,6 +4,8 @@ #nullable disable +using System; +using System.Linq; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; @@ -11,8 +13,6 @@ using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System; -using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdMetadataTests.cs b/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdMetadataTests.cs index 993d13b385885..b8f8bcf90fbe6 100644 --- a/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdMetadataTests.cs +++ b/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdMetadataTests.cs @@ -9,20 +9,16 @@ using System.IO; using System.Linq; using System.Text; - using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; - +using Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; - - using Xunit; -using Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/CommonSyntaxTests.cs b/src/Compilers/Core/CodeAnalysisTest/CommonSyntaxTests.cs index f4af4e32d064e..b500b19cddc0d 100644 --- a/src/Compilers/Core/CodeAnalysisTest/CommonSyntaxTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/CommonSyntaxTests.cs @@ -9,8 +9,8 @@ using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Xunit; -using VB = Microsoft.CodeAnalysis.VisualBasic; using CS = Microsoft.CodeAnalysis.CSharp; +using VB = Microsoft.CodeAnalysis.VisualBasic; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/CommonTypedConstantTests.cs b/src/Compilers/Core/CodeAnalysisTest/CommonTypedConstantTests.cs index e2b75c9f00106..d8de79779b8eb 100644 --- a/src/Compilers/Core/CodeAnalysisTest/CommonTypedConstantTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/CommonTypedConstantTests.cs @@ -4,14 +4,14 @@ #nullable disable -using Microsoft.CodeAnalysis.Symbols; -using Microsoft.CodeAnalysis.Test.Utilities; -using Roslyn.Test.Utilities; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.Symbols; +using Microsoft.CodeAnalysis.Test.Utilities; +using Roslyn.Test.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.UnitTests diff --git a/src/Compilers/Core/CodeAnalysisTest/CryptoBlobParserTests.cs b/src/Compilers/Core/CodeAnalysisTest/CryptoBlobParserTests.cs index c3ef283b036f0..5d7e545f0b7ab 100644 --- a/src/Compilers/Core/CodeAnalysisTest/CryptoBlobParserTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/CryptoBlobParserTests.cs @@ -4,13 +4,13 @@ #nullable disable -using Roslyn.Test.Utilities; using System; using System.Collections.Immutable; using System.Diagnostics; using System.Globalization; using System.Linq; using System.Security.Cryptography; +using Roslyn.Test.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.UnitTests diff --git a/src/Compilers/Core/CodeAnalysisTest/Diagnostics/SuppressMessageTargetSymbolResolverTests.cs b/src/Compilers/Core/CodeAnalysisTest/Diagnostics/SuppressMessageTargetSymbolResolverTests.cs index d4a11c5acd9b7..62d76a77178be 100644 --- a/src/Compilers/Core/CodeAnalysisTest/Diagnostics/SuppressMessageTargetSymbolResolverTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/Diagnostics/SuppressMessageTargetSymbolResolverTests.cs @@ -4,6 +4,8 @@ #nullable disable +using System.Collections.Generic; +using System.Collections.Immutable; using System.Linq; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Diagnostics; @@ -11,8 +13,6 @@ using Microsoft.CodeAnalysis.VisualBasic; using Roslyn.Test.Utilities; using Xunit; -using System.Collections.Generic; -using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.UnitTests.Diagnostics { diff --git a/src/Compilers/Core/CodeAnalysisTest/EmbeddedTextTests.cs b/src/Compilers/Core/CodeAnalysisTest/EmbeddedTextTests.cs index a72360e7926dc..db2ff1b4e63e5 100644 --- a/src/Compilers/Core/CodeAnalysisTest/EmbeddedTextTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/EmbeddedTextTests.cs @@ -7,13 +7,13 @@ using System; using System.Collections.Generic; using System.IO; +using System.IO.Compression; +using System.Linq; +using System.Text; using Microsoft.CodeAnalysis.Text; +using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using System.Text; -using System.IO.Compression; -using Roslyn.Test.Utilities; -using System.Linq; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/SpecializedCollectionsTests.cs b/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/SpecializedCollectionsTests.cs index 74ac02e753b5b..3e1fc5d2f730a 100644 --- a/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/SpecializedCollectionsTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/SpecializedCollectionsTests.cs @@ -4,11 +4,11 @@ #nullable disable -using Roslyn.Utilities; using System; using System.Collections; using System.Collections.Generic; using System.Collections.Immutable; +using Roslyn.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.UnitTests.InternalUtilities diff --git a/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/StreamExtensionsTests.cs b/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/StreamExtensionsTests.cs index f18b9ba6a9d6f..6d9b2b6d39b81 100644 --- a/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/StreamExtensionsTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/StreamExtensionsTests.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.CodeAnalysis; -using Roslyn.Test.Utilities; using System; using System.IO; +using Microsoft.CodeAnalysis; +using Roslyn.Test.Utilities; using Xunit; namespace Roslyn.Utilities.UnitTests.InternalUtilities diff --git a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/AssemblyMetadataTests.cs b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/AssemblyMetadataTests.cs index e85b4d95b6b56..cb44bdaad0483 100644 --- a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/AssemblyMetadataTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/AssemblyMetadataTests.cs @@ -5,10 +5,10 @@ #nullable disable using System; +using System.Collections.Generic; using System.Collections.Immutable; using Roslyn.Test.Utilities; using Xunit; -using System.Collections.Generic; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyIdentityTests.cs b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyIdentityTests.cs index d800e672d0a45..c8cb0ffa77d74 100644 --- a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyIdentityTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyIdentityTests.cs @@ -8,8 +8,8 @@ using System.Globalization; using System.IO; using System.Reflection; -using Xunit; using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.UnitTests.MetadataReferences { diff --git a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyPortabilityPolicy.cs b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyPortabilityPolicy.cs index 6f0e711d3fc36..1b494f269e03e 100644 --- a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyPortabilityPolicy.cs +++ b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyPortabilityPolicy.cs @@ -5,6 +5,8 @@ #nullable disable using System; +using System.Collections.Immutable; +using System.Diagnostics; using System.IO; using System.Linq; using System.Runtime.InteropServices; @@ -12,8 +14,6 @@ using System.Text; using System.Threading; using Roslyn.Utilities; -using System.Diagnostics; -using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataReferenceTests.cs b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataReferenceTests.cs index 97ee1e1246445..37e8fbd2ad2ac 100644 --- a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataReferenceTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataReferenceTests.cs @@ -18,8 +18,8 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using CS = Microsoft.CodeAnalysis.CSharp; using static Roslyn.Test.Utilities.TestMetadata; +using CS = Microsoft.CodeAnalysis.CSharp; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/ModuleMetadataTests.cs b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/ModuleMetadataTests.cs index b0d29d7d6225d..9f846451fbf76 100644 --- a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/ModuleMetadataTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/ModuleMetadataTests.cs @@ -5,12 +5,12 @@ #nullable disable using System; +using System.Collections.Generic; using System.Collections.Immutable; using System.IO; +using System.Reflection.PortableExecutable; using Roslyn.Test.Utilities; using Xunit; -using System.Collections.Generic; -using System.Reflection.PortableExecutable; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/SourceFileResolverTest.cs b/src/Compilers/Core/CodeAnalysisTest/SourceFileResolverTest.cs index 326a13c5140dd..a4f7c715dd44f 100644 --- a/src/Compilers/Core/CodeAnalysisTest/SourceFileResolverTest.cs +++ b/src/Compilers/Core/CodeAnalysisTest/SourceFileResolverTest.cs @@ -4,11 +4,11 @@ #nullable disable -using Roslyn.Test.Utilities; -using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.IO; +using Roslyn.Test.Utilities; +using Roslyn.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.UnitTests diff --git a/src/Compilers/Core/CodeAnalysisTest/Text/StringTextTest.cs b/src/Compilers/Core/CodeAnalysisTest/Text/StringTextTest.cs index 2138c7162fb10..a0cb3eb0f697c 100644 --- a/src/Compilers/Core/CodeAnalysisTest/Text/StringTextTest.cs +++ b/src/Compilers/Core/CodeAnalysisTest/Text/StringTextTest.cs @@ -5,14 +5,14 @@ #nullable disable using System; -using Microsoft.CodeAnalysis.Text; -using Xunit; -using System.Text; +using System.Collections.Immutable; using System.IO; -using Roslyn.Test.Utilities; using System.Security.Cryptography; -using System.Collections.Immutable; +using System.Text; +using Microsoft.CodeAnalysis.Text; +using Roslyn.Test.Utilities; using Roslyn.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/VersionHelperTests.cs b/src/Compilers/Core/CodeAnalysisTest/VersionHelperTests.cs index 12a2468a69eaa..53e1dcdfe1525 100644 --- a/src/Compilers/Core/CodeAnalysisTest/VersionHelperTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/VersionHelperTests.cs @@ -8,8 +8,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.Text; using Xunit; namespace Microsoft.CodeAnalysis.UnitTests diff --git a/src/Compilers/Core/CodeAnalysisTest/Win32Res.cs b/src/Compilers/Core/CodeAnalysisTest/Win32Res.cs index b7e00741e113d..a5b25d6816ec4 100644 --- a/src/Compilers/Core/CodeAnalysisTest/Win32Res.cs +++ b/src/Compilers/Core/CodeAnalysisTest/Win32Res.cs @@ -9,11 +9,11 @@ using System.Linq; using System.Runtime.InteropServices; using System.Xml; -using Microsoft.CodeAnalysis.Text; -using Xunit; -using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.CodeGen; +using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CommandLine/BuildProtocol.cs b/src/Compilers/Core/CommandLine/BuildProtocol.cs index 4ad65f3c4db6d..bdaf85cab2df2 100644 --- a/src/Compilers/Core/CommandLine/BuildProtocol.cs +++ b/src/Compilers/Core/CommandLine/BuildProtocol.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -13,6 +12,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; +using Roslyn.Utilities; using static Microsoft.CodeAnalysis.CommandLine.BuildProtocolConstants; using static Microsoft.CodeAnalysis.CommandLine.CompilerServerLogger; diff --git a/src/Compilers/Core/CommandLine/CompilerServerLogger.cs b/src/Compilers/Core/CommandLine/CompilerServerLogger.cs index d13c363c03446..99f7a1560a43b 100644 --- a/src/Compilers/Core/CommandLine/CompilerServerLogger.cs +++ b/src/Compilers/Core/CommandLine/CompilerServerLogger.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; using System.Text; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CommandLine { diff --git a/src/Compilers/Core/CommandLine/ConsoleUtil.cs b/src/Compilers/Core/CommandLine/ConsoleUtil.cs index 2fb87faebe709..aecd220ede2eb 100644 --- a/src/Compilers/Core/CommandLine/ConsoleUtil.cs +++ b/src/Compilers/Core/CommandLine/ConsoleUtil.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis; using System; using System.IO; using System.Text; +using Microsoft.CodeAnalysis; namespace Microsoft.CodeAnalysis.CommandLine { diff --git a/src/Compilers/Core/MSBuildTask/Csc.cs b/src/Compilers/Core/MSBuildTask/Csc.cs index 3dead94c8a72b..c43c80d7d840e 100644 --- a/src/Compilers/Core/MSBuildTask/Csc.cs +++ b/src/Compilers/Core/MSBuildTask/Csc.cs @@ -6,11 +6,11 @@ using System.Diagnostics; using System.Globalization; using System.Text; -using Roslyn.Utilities; using Microsoft.Build.Framework; using Microsoft.Build.Tasks.Hosting; using Microsoft.Build.Utilities; using Microsoft.CodeAnalysis.CommandLine; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.BuildTasks { diff --git a/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs b/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs index 71017a0904bd2..98463e695c382 100644 --- a/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs +++ b/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs @@ -12,10 +12,10 @@ using System.Text; using System.Threading; using Microsoft.Build.Framework; +using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.CommandLine; -using Microsoft.Build.Tasks; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.BuildTasks { diff --git a/src/Compilers/Core/MSBuildTask/RCWForCurrentContext.cs b/src/Compilers/Core/MSBuildTask/RCWForCurrentContext.cs index 09300c5978caa..db30c4e3a4ee2 100644 --- a/src/Compilers/Core/MSBuildTask/RCWForCurrentContext.cs +++ b/src/Compilers/Core/MSBuildTask/RCWForCurrentContext.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System; -using System.Runtime.InteropServices; using System.Diagnostics; +using System.Runtime.InteropServices; namespace Microsoft.CodeAnalysis.BuildTasks { diff --git a/src/Compilers/Core/MSBuildTask/Utilities.cs b/src/Compilers/Core/MSBuildTask/Utilities.cs index 14c50fe1bb9b1..f44216493dc17 100644 --- a/src/Compilers/Core/MSBuildTask/Utilities.cs +++ b/src/Compilers/Core/MSBuildTask/Utilities.cs @@ -2,14 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using System; using System.Diagnostics; using System.Globalization; using System.IO; using System.Reflection; using System.Security; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; namespace Microsoft.CodeAnalysis.BuildTasks { diff --git a/src/Compilers/Core/MSBuildTask/Vbc.cs b/src/Compilers/Core/MSBuildTask/Vbc.cs index f74e830993918..768bc65a8e611 100644 --- a/src/Compilers/Core/MSBuildTask/Vbc.cs +++ b/src/Compilers/Core/MSBuildTask/Vbc.cs @@ -3,14 +3,14 @@ // See the LICENSE file in the project root for more information. using System; +using System.Collections.Generic; using System.Diagnostics; +using System.Globalization; using System.IO; using System.Text; -using System.Collections.Generic; -using System.Globalization; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Tasks.Hosting; +using Microsoft.Build.Utilities; using Microsoft.CodeAnalysis.CommandLine; using Roslyn.Utilities; diff --git a/src/Compilers/Core/MSBuildTaskTests/CscTests.cs b/src/Compilers/Core/MSBuildTaskTests/CscTests.cs index f3a6c128630c2..fafb1862cefe8 100644 --- a/src/Compilers/Core/MSBuildTaskTests/CscTests.cs +++ b/src/Compilers/Core/MSBuildTaskTests/CscTests.cs @@ -3,14 +3,14 @@ // See the LICENSE file in the project root for more information. using System; +using System.IO; using System.Linq; using Microsoft.Build.Framework; using Microsoft.CodeAnalysis.BuildTasks; -using Xunit; +using Microsoft.CodeAnalysis.BuildTasks.UnitTests.TestUtilities; using Moq; -using System.IO; using Roslyn.Test.Utilities; -using Microsoft.CodeAnalysis.BuildTasks.UnitTests.TestUtilities; +using Xunit; namespace Microsoft.CodeAnalysis.BuildTasks.UnitTests { diff --git a/src/Compilers/Core/MSBuildTaskTests/MiscTests.cs b/src/Compilers/Core/MSBuildTaskTests/MiscTests.cs index 96034040c66f0..aad36bdf90d38 100644 --- a/src/Compilers/Core/MSBuildTaskTests/MiscTests.cs +++ b/src/Compilers/Core/MSBuildTaskTests/MiscTests.cs @@ -3,14 +3,14 @@ // See the LICENSE file in the project root for more information. using System; +using System.Collections.Immutable; using System.Linq; using Microsoft.Build.Framework; using Microsoft.CodeAnalysis.BuildTasks; -using Xunit; +using Microsoft.CodeAnalysis.CSharp; using Moq; using Roslyn.Test.Utilities; -using Microsoft.CodeAnalysis.CSharp; -using System.Collections.Immutable; +using Xunit; namespace Microsoft.CodeAnalysis.BuildTasks.UnitTests { diff --git a/src/Compilers/Core/MSBuildTaskTests/TargetTests.cs b/src/Compilers/Core/MSBuildTaskTests/TargetTests.cs index 469887809ffb9..372cc28ba382b 100644 --- a/src/Compilers/Core/MSBuildTaskTests/TargetTests.cs +++ b/src/Compilers/Core/MSBuildTaskTests/TargetTests.cs @@ -12,10 +12,10 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Xml; -using Roslyn.Test.Utilities; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; +using Roslyn.Test.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.BuildTasks.UnitTests diff --git a/src/Compilers/Core/MSBuildTaskTests/TestUtilities/MSBuildUtil.cs b/src/Compilers/Core/MSBuildTaskTests/TestUtilities/MSBuildUtil.cs index 17518299a9114..134ccc914dd2d 100644 --- a/src/Compilers/Core/MSBuildTaskTests/TestUtilities/MSBuildUtil.cs +++ b/src/Compilers/Core/MSBuildTaskTests/TestUtilities/MSBuildUtil.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Build.Framework; -using Moq; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.Build.Framework; +using Moq; namespace Microsoft.CodeAnalysis.BuildTasks.UnitTests { diff --git a/src/Compilers/Core/Portable/CodeGen/ArrayMembers.cs b/src/Compilers/Core/Portable/CodeGen/ArrayMembers.cs index ad334c416e8cb..ea090229d2e9e 100644 --- a/src/Compilers/Core/Portable/CodeGen/ArrayMembers.cs +++ b/src/Compilers/Core/Portable/CodeGen/ArrayMembers.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; using EmitContext = Microsoft.CodeAnalysis.Emit.EmitContext; diff --git a/src/Compilers/Core/Portable/CodeGen/CompilationTestData.cs b/src/Compilers/Core/Portable/CodeGen/CompilationTestData.cs index b0cb635e5360a..3e0377dafdd87 100644 --- a/src/Compilers/Core/Portable/CodeGen/CompilationTestData.cs +++ b/src/Compilers/Core/Portable/CodeGen/CompilationTestData.cs @@ -2,15 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.Symbols; -using Microsoft.DiaSymReader; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; using System.Threading; +using Microsoft.CodeAnalysis.Emit; +using Microsoft.CodeAnalysis.Symbols; +using Microsoft.DiaSymReader; namespace Microsoft.CodeAnalysis.CodeGen { diff --git a/src/Compilers/Core/Portable/CodeGen/PermissionSetAttribute.cs b/src/Compilers/Core/Portable/CodeGen/PermissionSetAttribute.cs index 3da6f84924a37..01cb690123d3d 100644 --- a/src/Compilers/Core/Portable/CodeGen/PermissionSetAttribute.cs +++ b/src/Compilers/Core/Portable/CodeGen/PermissionSetAttribute.cs @@ -2,17 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.Collections; -using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis.Symbols; -using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.Diagnostics; using System.IO; using System.Linq; using System.Text; +using Microsoft.CodeAnalysis.Collections; +using Microsoft.CodeAnalysis.Emit; +using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CodeGen { diff --git a/src/Compilers/Core/Portable/CodeGen/SwitchIntegralJumpTableEmitter.SwitchBucket.cs b/src/Compilers/Core/Portable/CodeGen/SwitchIntegralJumpTableEmitter.SwitchBucket.cs index 850efba26f5be..8a86a36f705b1 100644 --- a/src/Compilers/Core/Portable/CodeGen/SwitchIntegralJumpTableEmitter.SwitchBucket.cs +++ b/src/Compilers/Core/Portable/CodeGen/SwitchIntegralJumpTableEmitter.SwitchBucket.cs @@ -3,10 +3,10 @@ // See the LICENSE file in the project root for more information. using System; +using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.Text; -using System.Collections.Generic; namespace Microsoft.CodeAnalysis.CodeGen { diff --git a/src/Compilers/Core/Portable/Collections/IdentifierCollection.cs b/src/Compilers/Core/Portable/Collections/IdentifierCollection.cs index 3527034c90d18..a162f564683f2 100644 --- a/src/Compilers/Core/Portable/Collections/IdentifierCollection.cs +++ b/src/Compilers/Core/Portable/Collections/IdentifierCollection.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Diagnostics; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Collections/UnionCollection.cs b/src/Compilers/Core/Portable/Collections/UnionCollection.cs index b903f907bf76a..8c5ca1ab96c73 100644 --- a/src/Compilers/Core/Portable/Collections/UnionCollection.cs +++ b/src/Compilers/Core/Portable/Collections/UnionCollection.cs @@ -4,11 +4,11 @@ using System; using System.Collections.Generic; +using System.Collections.Immutable; +using System.Diagnostics; using System.Linq; using Microsoft.CodeAnalysis.Text; -using System.Diagnostics; using Roslyn.Utilities; -using System.Collections.Immutable; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/CommandLine/TouchedFileLogger.cs b/src/Compilers/Core/Portable/CommandLine/TouchedFileLogger.cs index c398790b4d4f2..71bdbe20e6796 100644 --- a/src/Compilers/Core/Portable/CommandLine/TouchedFileLogger.cs +++ b/src/Compilers/Core/Portable/CommandLine/TouchedFileLogger.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Roslyn.Utilities; using System; using System.IO; using System.Threading; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Compilation/PreprocessingSymbolInfo.cs b/src/Compilers/Core/Portable/Compilation/PreprocessingSymbolInfo.cs index f8d1a1b3f5140..bd6202b38ff8d 100644 --- a/src/Compilers/Core/Portable/Compilation/PreprocessingSymbolInfo.cs +++ b/src/Compilers/Core/Portable/Compilation/PreprocessingSymbolInfo.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Roslyn.Utilities; using System; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Compilation/SymbolInfo.cs b/src/Compilers/Core/Portable/Compilation/SymbolInfo.cs index 9831ac33a7ba9..990e8594116d0 100644 --- a/src/Compilers/Core/Portable/Compilation/SymbolInfo.cs +++ b/src/Compilers/Core/Portable/Compilation/SymbolInfo.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Immutable; +using System.Diagnostics; using System.Linq; using Roslyn.Utilities; -using System.Diagnostics; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/CvtRes.cs b/src/Compilers/Core/Portable/CvtRes.cs index ccf71f106b2a6..c2d72bc31a181 100644 --- a/src/Compilers/Core/Portable/CvtRes.cs +++ b/src/Compilers/Core/Portable/CvtRes.cs @@ -4,17 +4,17 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Linq; +using System.Reflection.PortableExecutable; using System.Text; using Microsoft.CodeAnalysis.Text; -using System.Diagnostics; +using Roslyn.Utilities; using BYTE = System.Byte; using DWORD = System.UInt32; using WCHAR = System.Char; using WORD = System.UInt16; -using System.Reflection.PortableExecutable; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/DiaSymReader/Metadata/MetadataAdapterBase.cs b/src/Compilers/Core/Portable/DiaSymReader/Metadata/MetadataAdapterBase.cs index 03eac10d05ba5..a7b205d4194f0 100644 --- a/src/Compilers/Core/Portable/DiaSymReader/Metadata/MetadataAdapterBase.cs +++ b/src/Compilers/Core/Portable/DiaSymReader/Metadata/MetadataAdapterBase.cs @@ -5,8 +5,8 @@ #nullable disable using System; -using System.Runtime.InteropServices; using System.Reflection; +using System.Runtime.InteropServices; namespace Microsoft.DiaSymReader { diff --git a/src/Compilers/Core/Portable/DiaSymReader/Metadata/SymWriterMetadataAdapter.cs b/src/Compilers/Core/Portable/DiaSymReader/Metadata/SymWriterMetadataAdapter.cs index f261ad4f0cc71..d17d65b5d66bd 100644 --- a/src/Compilers/Core/Portable/DiaSymReader/Metadata/SymWriterMetadataAdapter.cs +++ b/src/Compilers/Core/Portable/DiaSymReader/Metadata/SymWriterMetadataAdapter.cs @@ -5,9 +5,9 @@ #nullable disable using System; -using System.Runtime.InteropServices; -using System.Reflection; using System.Diagnostics; +using System.Reflection; +using System.Runtime.InteropServices; namespace Microsoft.DiaSymReader { diff --git a/src/Compilers/Core/Portable/DiaSymReader/Utilities/ComMemoryStream.cs b/src/Compilers/Core/Portable/DiaSymReader/Utilities/ComMemoryStream.cs index 83cc385d34dbc..1edef1a363d91 100644 --- a/src/Compilers/Core/Portable/DiaSymReader/Utilities/ComMemoryStream.cs +++ b/src/Compilers/Core/Portable/DiaSymReader/Utilities/ComMemoryStream.cs @@ -5,10 +5,10 @@ #nullable disable using System; -using System.IO; using System.Collections.Generic; -using System.Runtime.InteropServices.ComTypes; +using System.IO; using System.Runtime.InteropServices; +using System.Runtime.InteropServices.ComTypes; using STATSTG = System.Runtime.InteropServices.ComTypes.STATSTG; namespace Microsoft.DiaSymReader diff --git a/src/Compilers/Core/Portable/Diagnostic/DiagnosticBag.cs b/src/Compilers/Core/Portable/Diagnostic/DiagnosticBag.cs index 43af33b7d544e..5979af65f6e31 100644 --- a/src/Compilers/Core/Portable/Diagnostic/DiagnosticBag.cs +++ b/src/Compilers/Core/Portable/Diagnostic/DiagnosticBag.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using System; +using System.Collections; using System.Collections.Concurrent; using System.Collections.Generic; -using System.Collections; using System.Collections.Immutable; using System.Diagnostics; using System.Text; diff --git a/src/Compilers/Core/Portable/Diagnostic/DiagnosticInfo.cs b/src/Compilers/Core/Portable/Diagnostic/DiagnosticInfo.cs index 0f271f2372989..be93acf4adc75 100644 --- a/src/Compilers/Core/Portable/Diagnostic/DiagnosticInfo.cs +++ b/src/Compilers/Core/Portable/Diagnostic/DiagnosticInfo.cs @@ -8,9 +8,9 @@ using System.Diagnostics; using System.Globalization; using System.Reflection; -using Roslyn.Utilities; using System.Threading; using Microsoft.CodeAnalysis.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Diagnostic/XmlLocation.cs b/src/Compilers/Core/Portable/Diagnostic/XmlLocation.cs index 191404c239695..dddb1f1663873 100644 --- a/src/Compilers/Core/Portable/Diagnostic/XmlLocation.cs +++ b/src/Compilers/Core/Portable/Diagnostic/XmlLocation.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.Text; using System; -using System.Xml.Linq; -using System.Xml; using System.Diagnostics; +using System.Xml; +using System.Xml.Linq; +using Microsoft.CodeAnalysis.Text; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Emit/AnonymousTypeValue.cs b/src/Compilers/Core/Portable/Emit/AnonymousTypeValue.cs index 1cc7db8d8b795..866754db707e0 100644 --- a/src/Compilers/Core/Portable/Emit/AnonymousTypeValue.cs +++ b/src/Compilers/Core/Portable/Emit/AnonymousTypeValue.cs @@ -4,8 +4,8 @@ #nullable disable -using Microsoft.Cci; using System.Diagnostics; +using Microsoft.Cci; namespace Microsoft.CodeAnalysis.Emit { diff --git a/src/Compilers/Core/Portable/Emit/DebugDocumentsBuilder.cs b/src/Compilers/Core/Portable/Emit/DebugDocumentsBuilder.cs index c57bd62d12305..4d64aac303616 100644 --- a/src/Compilers/Core/Portable/Emit/DebugDocumentsBuilder.cs +++ b/src/Compilers/Core/Portable/Emit/DebugDocumentsBuilder.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Roslyn.Utilities; using System; using System.Collections.Concurrent; using System.Collections.Generic; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Emit { diff --git a/src/Compilers/Core/Portable/Emit/EditAndContinue/DeltaMetadataWriter.cs b/src/Compilers/Core/Portable/Emit/EditAndContinue/DeltaMetadataWriter.cs index 46b3955fa274d..4732213ab99ee 100644 --- a/src/Compilers/Core/Portable/Emit/EditAndContinue/DeltaMetadataWriter.cs +++ b/src/Compilers/Core/Portable/Emit/EditAndContinue/DeltaMetadataWriter.cs @@ -11,10 +11,10 @@ using System.Reflection.Metadata.Ecma335; using System.Threading; using Microsoft.Cci; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; -using Roslyn.Utilities; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Emit { diff --git a/src/Compilers/Core/Portable/Emit/EditAndContinue/SymbolChanges.cs b/src/Compilers/Core/Portable/Emit/EditAndContinue/SymbolChanges.cs index 9ae6b6b8fa97b..51dd60d9dd64a 100644 --- a/src/Compilers/Core/Portable/Emit/EditAndContinue/SymbolChanges.cs +++ b/src/Compilers/Core/Portable/Emit/EditAndContinue/SymbolChanges.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Cci; -using Roslyn.Utilities; +using System; using System.Collections.Generic; using System.Diagnostics; -using System; +using Microsoft.Cci; using Microsoft.CodeAnalysis.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Emit { diff --git a/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedMethod.cs b/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedMethod.cs index 66692ffdf4ed3..ab5ca85b9319d 100644 --- a/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedMethod.cs +++ b/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedMethod.cs @@ -6,10 +6,10 @@ using System.Collections.Generic; using System.Collections.Immutable; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.Debugging; using Microsoft.CodeAnalysis.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Emit.NoPia { diff --git a/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedType.cs b/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedType.cs index c5bf550d98e2a..a5d5b39dacfcf 100644 --- a/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedType.cs +++ b/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedType.cs @@ -4,13 +4,13 @@ #nullable disable -using System.Collections.Immutable; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using System.Collections.Generic; +using System.Collections.Immutable; using System.Diagnostics; using System.Reflection.Metadata; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Emit.NoPia { diff --git a/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedTypeParameter.cs b/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedTypeParameter.cs index 799005de1ab02..d2087b4d6e465 100644 --- a/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedTypeParameter.cs +++ b/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedTypeParameter.cs @@ -4,10 +4,10 @@ #nullable disable -using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Reflection.Metadata; +using Roslyn.Utilities; using Cci = Microsoft.Cci; namespace Microsoft.CodeAnalysis.Emit.NoPia diff --git a/src/Compilers/Core/Portable/Emit/NoPia/EmbeddedTypesManager.cs b/src/Compilers/Core/Portable/Emit/NoPia/EmbeddedTypesManager.cs index 4415cd0e09d4c..8143bf016ed7a 100644 --- a/src/Compilers/Core/Portable/Emit/NoPia/EmbeddedTypesManager.cs +++ b/src/Compilers/Core/Portable/Emit/NoPia/EmbeddedTypesManager.cs @@ -4,13 +4,13 @@ #nullable disable -using System.Collections.Immutable; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using System; using System.Collections.Concurrent; using System.Collections.Generic; +using System.Collections.Immutable; using System.Diagnostics; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; using Cci = Microsoft.Cci; namespace Microsoft.CodeAnalysis.Emit.NoPia diff --git a/src/Compilers/Core/Portable/Emit/NoPia/VtblGap.cs b/src/Compilers/Core/Portable/Emit/NoPia/VtblGap.cs index 87d5f20a81d57..a06551e83743d 100644 --- a/src/Compilers/Core/Portable/Emit/NoPia/VtblGap.cs +++ b/src/Compilers/Core/Portable/Emit/NoPia/VtblGap.cs @@ -4,9 +4,9 @@ #nullable disable +using System.Collections.Generic; using System.Collections.Immutable; using Roslyn.Utilities; -using System.Collections.Generic; namespace Microsoft.CodeAnalysis.Emit.NoPia { diff --git a/src/Compilers/Core/Portable/Emit/SemanticEdit.cs b/src/Compilers/Core/Portable/Emit/SemanticEdit.cs index 6e94ee5e55467..ea14bae801ce9 100644 --- a/src/Compilers/Core/Portable/Emit/SemanticEdit.cs +++ b/src/Compilers/Core/Portable/Emit/SemanticEdit.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.Symbols; using Roslyn.Utilities; -using System; namespace Microsoft.CodeAnalysis.Emit { diff --git a/src/Compilers/Core/Portable/FileSystem/RelativePathResolver.cs b/src/Compilers/Core/Portable/FileSystem/RelativePathResolver.cs index dc14f8a42b31a..fc4778c581c60 100644 --- a/src/Compilers/Core/Portable/FileSystem/RelativePathResolver.cs +++ b/src/Compilers/Core/Portable/FileSystem/RelativePathResolver.cs @@ -9,9 +9,9 @@ using System; using System.Collections.Immutable; using System.Diagnostics; +using System.IO; using System.Linq; using Roslyn.Utilities; -using System.IO; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/InternalUtilities/AssemblyIdentityUtils.cs b/src/Compilers/Core/Portable/InternalUtilities/AssemblyIdentityUtils.cs index 8afa27f0886df..747a83e6d6808 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/AssemblyIdentityUtils.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/AssemblyIdentityUtils.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Immutable; +using System.IO; using System.Reflection; using System.Reflection.Metadata; using System.Reflection.PortableExecutable; -using System.IO; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/InternalUtilities/BlobBuildingStream.cs b/src/Compilers/Core/Portable/InternalUtilities/BlobBuildingStream.cs index c458e569706a5..9437655b9be0d 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/BlobBuildingStream.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/BlobBuildingStream.cs @@ -7,8 +7,8 @@ using System.Diagnostics; using System.IO; using System.Reflection.Metadata; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/InternalUtilities/EncodingExtensions.cs b/src/Compilers/Core/Portable/InternalUtilities/EncodingExtensions.cs index ed721c5816e1d..ee22e433694a7 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/EncodingExtensions.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/EncodingExtensions.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis; using System; using System.Diagnostics; using System.IO; using System.Text; +using Microsoft.CodeAnalysis; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/InternalUtilities/EnumField.cs b/src/Compilers/Core/Portable/InternalUtilities/EnumField.cs index 0bbe8947f8e80..a472cbd62e5f1 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/EnumField.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/EnumField.cs @@ -4,8 +4,8 @@ using System.Collections.Generic; using System.Diagnostics; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/InternalUtilities/IsExternalInit.cs b/src/Compilers/Core/Portable/InternalUtilities/IsExternalInit.cs index 19138060ce89d..7d1e003609644 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/IsExternalInit.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/IsExternalInit.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/Core/Portable/InternalUtilities/JsonWriter.cs b/src/Compilers/Core/Portable/InternalUtilities/JsonWriter.cs index d857dfaf9a0f9..37a5e5dbcc3ea 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/JsonWriter.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/JsonWriter.cs @@ -7,8 +7,8 @@ using System.Globalization; using System.IO; using System.Text; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/InternalUtilities/OneOrMany.cs b/src/Compilers/Core/Portable/InternalUtilities/OneOrMany.cs index bdf29b7f006e7..91e7726c38646 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/OneOrMany.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/OneOrMany.cs @@ -5,8 +5,8 @@ using System; using System.Collections.Immutable; using System.Diagnostics.CodeAnalysis; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/InternalUtilities/SpanUtilities.cs b/src/Compilers/Core/Portable/InternalUtilities/SpanUtilities.cs index 98b512186e329..78b7a1d66c43d 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/SpanUtilities.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/SpanUtilities.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/Core/Portable/InternalUtilities/TextKeyedCache.cs b/src/Compilers/Core/Portable/InternalUtilities/TextKeyedCache.cs index 9164416313002..2bec3cc65a9bc 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/TextKeyedCache.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/TextKeyedCache.cs @@ -8,11 +8,11 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; -using System.Threading; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/MemberDescriptor.cs b/src/Compilers/Core/Portable/MemberDescriptor.cs index 091cd2a0193d2..9cd2ea585c8cf 100644 --- a/src/Compilers/Core/Portable/MemberDescriptor.cs +++ b/src/Compilers/Core/Portable/MemberDescriptor.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.IO; using System.Reflection.Metadata; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.RuntimeMembers { diff --git a/src/Compilers/Core/Portable/MetadataReader/MetadataTypeCodeExtensions.cs b/src/Compilers/Core/Portable/MetadataReader/MetadataTypeCodeExtensions.cs index 53d367988058e..82bb2aed7a379 100644 --- a/src/Compilers/Core/Portable/MetadataReader/MetadataTypeCodeExtensions.cs +++ b/src/Compilers/Core/Portable/MetadataReader/MetadataTypeCodeExtensions.cs @@ -4,8 +4,8 @@ #nullable disable -using Roslyn.Utilities; using System.Reflection.Metadata; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/MetadataReader/PEAssembly.cs b/src/Compilers/Core/Portable/MetadataReader/PEAssembly.cs index 04af11a9dee76..80af156f00c62 100644 --- a/src/Compilers/Core/Portable/MetadataReader/PEAssembly.cs +++ b/src/Compilers/Core/Portable/MetadataReader/PEAssembly.cs @@ -7,12 +7,12 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; using System.Linq; using System.Reflection.Metadata; using System.Threading; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; -using System.Diagnostics; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/MetadataReference/AssemblyMetadata.cs b/src/Compilers/Core/Portable/MetadataReference/AssemblyMetadata.cs index d8ea338e14d25..592298034e5fa 100644 --- a/src/Compilers/Core/Portable/MetadataReference/AssemblyMetadata.cs +++ b/src/Compilers/Core/Portable/MetadataReference/AssemblyMetadata.cs @@ -5,13 +5,13 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; using System.IO; using System.Reflection.Metadata; using System.Reflection.PortableExecutable; using System.Threading; -using System.Diagnostics; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/MetadataReference/MetadataReferenceProperties.cs b/src/Compilers/Core/Portable/MetadataReference/MetadataReferenceProperties.cs index cb7dbfb37fd57..3b880aca65551 100644 --- a/src/Compilers/Core/Portable/MetadataReference/MetadataReferenceProperties.cs +++ b/src/Compilers/Core/Portable/MetadataReference/MetadataReferenceProperties.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using System; -using System.Linq; using System.Collections.Generic; using System.Collections.Immutable; +using System.Linq; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis diff --git a/src/Compilers/Core/Portable/MetadataReference/PortableExecutableReference.cs b/src/Compilers/Core/Portable/MetadataReference/PortableExecutableReference.cs index cb07bf4e74010..5085af7e5a04f 100644 --- a/src/Compilers/Core/Portable/MetadataReference/PortableExecutableReference.cs +++ b/src/Compilers/Core/Portable/MetadataReference/PortableExecutableReference.cs @@ -3,10 +3,10 @@ // See the LICENSE file in the project root for more information. using System; +using System.Collections.Generic; +using System.Collections.Immutable; using System.IO; using System.Threading; -using System.Collections.Immutable; -using System.Collections.Generic; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/MetadataReference/ReferenceDirective.cs b/src/Compilers/Core/Portable/MetadataReference/ReferenceDirective.cs index 344263efbe03d..de9c4e03bc8fd 100644 --- a/src/Compilers/Core/Portable/MetadataReference/ReferenceDirective.cs +++ b/src/Compilers/Core/Portable/MetadataReference/ReferenceDirective.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.Text; using System.Diagnostics; +using Microsoft.CodeAnalysis.Text; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Operations/ControlFlowGraphBuilder.ConditionalAccessOperationTracker.cs b/src/Compilers/Core/Portable/Operations/ControlFlowGraphBuilder.ConditionalAccessOperationTracker.cs index d51ad4e5303cf..f3f77c8bfdb6c 100644 --- a/src/Compilers/Core/Portable/Operations/ControlFlowGraphBuilder.ConditionalAccessOperationTracker.cs +++ b/src/Compilers/Core/Portable/Operations/ControlFlowGraphBuilder.ConditionalAccessOperationTracker.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/Core/Portable/Operations/Operation.Enumerable.cs b/src/Compilers/Core/Portable/Operations/Operation.Enumerable.cs index 84e466976926e..f89856b72a992 100644 --- a/src/Compilers/Core/Portable/Operations/Operation.Enumerable.cs +++ b/src/Compilers/Core/Portable/Operations/Operation.Enumerable.cs @@ -1,12 +1,12 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Collections.Generic; -using System.Collections; using System; -using System.Diagnostics; +using System.Collections; +using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.CodeAnalysis.Operations; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; diff --git a/src/Compilers/Core/Portable/Operations/Operation.cs b/src/Compilers/Core/Portable/Operations/Operation.cs index 495b39d3e256c..64a38440133ba 100644 --- a/src/Compilers/Core/Portable/Operations/Operation.cs +++ b/src/Compilers/Core/Portable/Operations/Operation.cs @@ -5,10 +5,10 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.Threading; using Microsoft.CodeAnalysis.Operations; using Microsoft.CodeAnalysis.PooledObjects; -using System.Diagnostics.CodeAnalysis; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Operations/OperationMapBuilder.cs b/src/Compilers/Core/Portable/Operations/OperationMapBuilder.cs index e3beda6e9cfb3..7a31dcb0fcc12 100644 --- a/src/Compilers/Core/Portable/Operations/OperationMapBuilder.cs +++ b/src/Compilers/Core/Portable/Operations/OperationMapBuilder.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/Core/Portable/OutputKind.cs b/src/Compilers/Core/Portable/OutputKind.cs index 09db23ac906cb..5dbf63fc4a5af 100644 --- a/src/Compilers/Core/Portable/OutputKind.cs +++ b/src/Compilers/Core/Portable/OutputKind.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.Text; using System; +using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis diff --git a/src/Compilers/Core/Portable/PEWriter/DebugSourceDocument.cs b/src/Compilers/Core/Portable/PEWriter/DebugSourceDocument.cs index a6080b64f4f25..1a9ed7e93f6e3 100644 --- a/src/Compilers/Core/Portable/PEWriter/DebugSourceDocument.cs +++ b/src/Compilers/Core/Portable/PEWriter/DebugSourceDocument.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Collections.Immutable; using System; +using System.Collections.Immutable; +using System.Diagnostics; using System.Threading.Tasks; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.Text; -using System.Diagnostics; +using Roslyn.Utilities; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/DebugSourceInfo.cs b/src/Compilers/Core/Portable/PEWriter/DebugSourceInfo.cs index b24dd2729de92..5dbb73bd56a3e 100644 --- a/src/Compilers/Core/Portable/PEWriter/DebugSourceInfo.cs +++ b/src/Compilers/Core/Portable/PEWriter/DebugSourceInfo.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.Debugging; -using Microsoft.CodeAnalysis.Text; using System; using System.Collections.Immutable; +using Microsoft.CodeAnalysis.Debugging; +using Microsoft.CodeAnalysis.Text; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/ExtendedPEBuilder.cs b/src/Compilers/Core/Portable/PEWriter/ExtendedPEBuilder.cs index f5f447c624ded..83b2c2649dd5f 100755 --- a/src/Compilers/Core/Portable/PEWriter/ExtendedPEBuilder.cs +++ b/src/Compilers/Core/Portable/PEWriter/ExtendedPEBuilder.cs @@ -9,8 +9,8 @@ using System.Reflection.Metadata; using System.Reflection.Metadata.Ecma335; using System.Reflection.PortableExecutable; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/ITypeReferenceExtensions.cs b/src/Compilers/Core/Portable/PEWriter/ITypeReferenceExtensions.cs index df6206ca62158..e823ce34cfce5 100644 --- a/src/Compilers/Core/Portable/PEWriter/ITypeReferenceExtensions.cs +++ b/src/Compilers/Core/Portable/PEWriter/ITypeReferenceExtensions.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System.Text; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.PooledObjects; -using System.Text; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/MetadataVisitor.cs b/src/Compilers/Core/Portable/PEWriter/MetadataVisitor.cs index 94638937fae6b..d734aee619c0d 100644 --- a/src/Compilers/Core/Portable/PEWriter/MetadataVisitor.cs +++ b/src/Compilers/Core/Portable/PEWriter/MetadataVisitor.cs @@ -3,11 +3,11 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; -using System.Diagnostics; -using Roslyn.Utilities; using System.Collections.Immutable; -using Microsoft.CodeAnalysis.Emit; +using System.Diagnostics; using Microsoft.CodeAnalysis.CodeGen; +using Microsoft.CodeAnalysis.Emit; +using Roslyn.Utilities; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/PooledBlobBuilder.cs b/src/Compilers/Core/Portable/PEWriter/PooledBlobBuilder.cs index d8aab2ccdf1ca..e0c7f2204928a 100644 --- a/src/Compilers/Core/Portable/PEWriter/PooledBlobBuilder.cs +++ b/src/Compilers/Core/Portable/PEWriter/PooledBlobBuilder.cs @@ -4,8 +4,8 @@ using System; using System.Reflection.Metadata; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/ReferenceIndexer.cs b/src/Compilers/Core/Portable/PEWriter/ReferenceIndexer.cs index e0764b747d7ec..0ac52917e46ed 100644 --- a/src/Compilers/Core/Portable/PEWriter/ReferenceIndexer.cs +++ b/src/Compilers/Core/Portable/PEWriter/ReferenceIndexer.cs @@ -7,8 +7,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.Emit; +using Roslyn.Utilities; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/ReferenceIndexerBase.cs b/src/Compilers/Core/Portable/PEWriter/ReferenceIndexerBase.cs index e0f5e82919cc9..9d8a182431b48 100644 --- a/src/Compilers/Core/Portable/PEWriter/ReferenceIndexerBase.cs +++ b/src/Compilers/Core/Portable/PEWriter/ReferenceIndexerBase.cs @@ -7,9 +7,9 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using EmitContext = Microsoft.CodeAnalysis.Emit.EmitContext; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Emit; +using EmitContext = Microsoft.CodeAnalysis.Emit.EmitContext; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/TypeNameSerializer.cs b/src/Compilers/Core/Portable/PEWriter/TypeNameSerializer.cs index 29115ffdff6a5..25bb43369a78a 100644 --- a/src/Compilers/Core/Portable/PEWriter/TypeNameSerializer.cs +++ b/src/Compilers/Core/Portable/PEWriter/TypeNameSerializer.cs @@ -4,12 +4,12 @@ #nullable disable +using System.Diagnostics; +using System.Text; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.PooledObjects; -using System.Text; -using System.Diagnostics; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/ResourceDescription.cs b/src/Compilers/Core/Portable/ResourceDescription.cs index 1563e3ee96088..3f9f109174b56 100644 --- a/src/Compilers/Core/Portable/ResourceDescription.cs +++ b/src/Compilers/Core/Portable/ResourceDescription.cs @@ -3,13 +3,13 @@ // See the LICENSE file in the project root for more information. using System; -using System.IO; -using Roslyn.Utilities; -using Microsoft.CodeAnalysis.Emit; -using System.Reflection; using System.Collections.Immutable; using System.Diagnostics; +using System.IO; +using System.Reflection; using System.Security.Cryptography; +using Microsoft.CodeAnalysis.Emit; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/RuleSet/RuleSetProcessor.cs b/src/Compilers/Core/Portable/RuleSet/RuleSetProcessor.cs index ac6e03a4dbd3f..79a0a42da04dd 100644 --- a/src/Compilers/Core/Portable/RuleSet/RuleSetProcessor.cs +++ b/src/Compilers/Core/Portable/RuleSet/RuleSetProcessor.cs @@ -8,8 +8,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Linq; using System.IO; +using System.Linq; using System.Xml; using System.Xml.Linq; using Roslyn.Utilities; diff --git a/src/Compilers/Core/Portable/Serialization/ObjectReader.cs b/src/Compilers/Core/Portable/Serialization/ObjectReader.cs index 7ad967e5f8b24..b2ac0d4651d4f 100644 --- a/src/Compilers/Core/Portable/Serialization/ObjectReader.cs +++ b/src/Compilers/Core/Portable/Serialization/ObjectReader.cs @@ -11,9 +11,9 @@ using System.Text; using System.Threading; using System.Threading.Tasks; +using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/Serialization/ObjectWriter.cs b/src/Compilers/Core/Portable/Serialization/ObjectWriter.cs index d09fdba9cfc3e..a8a3d0d64f64a 100644 --- a/src/Compilers/Core/Portable/Serialization/ObjectWriter.cs +++ b/src/Compilers/Core/Portable/Serialization/ObjectWriter.cs @@ -10,9 +10,9 @@ using System.Runtime.InteropServices; using System.Text; using System.Threading; +using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/StrongName/CryptoBlobParser.cs b/src/Compilers/Core/Portable/StrongName/CryptoBlobParser.cs index 47a4d5ad6a07e..b1d6c6a8f897b 100644 --- a/src/Compilers/Core/Portable/StrongName/CryptoBlobParser.cs +++ b/src/Compilers/Core/Portable/StrongName/CryptoBlobParser.cs @@ -4,14 +4,14 @@ #nullable disable -using Microsoft.CodeAnalysis.Collections; -using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.IO; using System.Linq; using System.Reflection.Metadata; using System.Security.Cryptography; +using Microsoft.CodeAnalysis.Collections; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/SymbolDisplay/FormattedSymbol.cs b/src/Compilers/Core/Portable/SymbolDisplay/FormattedSymbol.cs index 535ed7dc3d490..9a88f6137f684 100644 --- a/src/Compilers/Core/Portable/SymbolDisplay/FormattedSymbol.cs +++ b/src/Compilers/Core/Portable/SymbolDisplay/FormattedSymbol.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.CodeAnalysis.Symbols; -using Roslyn.Utilities; using System; using System.Diagnostics; +using Microsoft.CodeAnalysis.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Symbols/Attributes/AttributeDescription.cs b/src/Compilers/Core/Portable/Symbols/Attributes/AttributeDescription.cs index a6d8f011f4849..d403d02b80770 100644 --- a/src/Compilers/Core/Portable/Symbols/Attributes/AttributeDescription.cs +++ b/src/Compilers/Core/Portable/Symbols/Attributes/AttributeDescription.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System.Collections.Immutable; using System.Diagnostics; using System.Reflection.Metadata; -using System.Collections.Immutable; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis diff --git a/src/Compilers/Core/Portable/Symbols/Attributes/CommonAssemblyWellKnownAttributeData.cs b/src/Compilers/Core/Portable/Symbols/Attributes/CommonAssemblyWellKnownAttributeData.cs index 166e8a073382a..07802e01aae41 100644 --- a/src/Compilers/Core/Portable/Symbols/Attributes/CommonAssemblyWellKnownAttributeData.cs +++ b/src/Compilers/Core/Portable/Symbols/Attributes/CommonAssemblyWellKnownAttributeData.cs @@ -5,9 +5,9 @@ #nullable disable using System; +using System.Collections.Generic; using System.Reflection; using Microsoft.CodeAnalysis.Text; -using System.Collections.Generic; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Symbols/Attributes/CustomAttributesBag.cs b/src/Compilers/Core/Portable/Symbols/Attributes/CustomAttributesBag.cs index 92ecc52d79fa0..ffe7dde958fd0 100644 --- a/src/Compilers/Core/Portable/Symbols/Attributes/CustomAttributesBag.cs +++ b/src/Compilers/Core/Portable/Symbols/Attributes/CustomAttributesBag.cs @@ -4,12 +4,12 @@ #nullable disable +using System; using System.Collections.Immutable; using System.Diagnostics; using System.Threading; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Symbols/Attributes/MarshalPseudoCustomAttributeData.cs b/src/Compilers/Core/Portable/Symbols/Attributes/MarshalPseudoCustomAttributeData.cs index 8165381312ce2..c107131ceec60 100644 --- a/src/Compilers/Core/Portable/Symbols/Attributes/MarshalPseudoCustomAttributeData.cs +++ b/src/Compilers/Core/Portable/Symbols/Attributes/MarshalPseudoCustomAttributeData.cs @@ -4,11 +4,11 @@ #nullable disable -using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.Symbols; using System; using System.Diagnostics; using System.Runtime.InteropServices; +using Microsoft.CodeAnalysis.Emit; +using Microsoft.CodeAnalysis.Symbols; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Symbols/IModuleSymbol.cs b/src/Compilers/Core/Portable/Symbols/IModuleSymbol.cs index d6318be7b7b9c..bcc5712708c01 100644 --- a/src/Compilers/Core/Portable/Symbols/IModuleSymbol.cs +++ b/src/Compilers/Core/Portable/Symbols/IModuleSymbol.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.Text; using System.Collections.Immutable; +using Microsoft.CodeAnalysis.Text; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxList.WithLotsOfChildren.cs b/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxList.WithLotsOfChildren.cs index cef920cc76170..919abdcb2a695 100644 --- a/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxList.WithLotsOfChildren.cs +++ b/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxList.WithLotsOfChildren.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System; -using Roslyn.Utilities; using System.Diagnostics; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Syntax.InternalSyntax { diff --git a/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxNodeCache.cs b/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxNodeCache.cs index a35bf1cb5a0bc..0629eb4ebea4c 100644 --- a/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxNodeCache.cs +++ b/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxNodeCache.cs @@ -2,10 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.Syntax.InternalSyntax; - using System; using System.Diagnostics; +using Microsoft.CodeAnalysis.Syntax.InternalSyntax; using Roslyn.Utilities; #if STATS diff --git a/src/Compilers/Core/Portable/Syntax/LineDirectiveMap.cs b/src/Compilers/Core/Portable/Syntax/LineDirectiveMap.cs index 3ad2f7bdbc6cc..0f948393b47ab 100644 --- a/src/Compilers/Core/Portable/Syntax/LineDirectiveMap.cs +++ b/src/Compilers/Core/Portable/Syntax/LineDirectiveMap.cs @@ -7,8 +7,8 @@ using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.Text; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Text/LargeText.cs b/src/Compilers/Core/Portable/Text/LargeText.cs index a03e52ff89b94..e30ec3dc3e3c9 100644 --- a/src/Compilers/Core/Portable/Text/LargeText.cs +++ b/src/Compilers/Core/Portable/Text/LargeText.cs @@ -4,12 +4,12 @@ using System; using System.Collections.Immutable; +using System.Diagnostics; using System.IO; using System.Text; using System.Threading; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; -using System.Diagnostics; namespace Microsoft.CodeAnalysis.Text { diff --git a/src/Compilers/Core/Portable/TreeDumper.cs b/src/Compilers/Core/Portable/TreeDumper.cs index 6eec8da558f03..822012f4c84eb 100644 --- a/src/Compilers/Core/Portable/TreeDumper.cs +++ b/src/Compilers/Core/Portable/TreeDumper.cs @@ -7,8 +7,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Reflection; using System.Linq; +using System.Reflection; using System.Text; using Roslyn.Utilities; diff --git a/src/Compilers/Core/Rebuild/MetadataCompilationOptions.cs b/src/Compilers/Core/Rebuild/MetadataCompilationOptions.cs index b73ec8ca8753c..0fd2b8848ecd7 100644 --- a/src/Compilers/Core/Rebuild/MetadataCompilationOptions.cs +++ b/src/Compilers/Core/Rebuild/MetadataCompilationOptions.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using System.Collections.Immutable; -using System.Linq; using System.Diagnostics.CodeAnalysis; -using System; +using System.Linq; using Microsoft.Extensions.Logging; namespace Microsoft.CodeAnalysis.Rebuild diff --git a/src/Compilers/Core/RebuildTest/CompilationOptionsReaderTests.cs b/src/Compilers/Core/RebuildTest/CompilationOptionsReaderTests.cs index 535eaf346c599..84139919c0819 100644 --- a/src/Compilers/Core/RebuildTest/CompilationOptionsReaderTests.cs +++ b/src/Compilers/Core/RebuildTest/CompilationOptionsReaderTests.cs @@ -10,17 +10,17 @@ using System.Reflection.PortableExecutable; using System.Text; using System.Threading; +using Microsoft.Cci; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Rebuild; +using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.VisualBasic; using Microsoft.Extensions.Logging; -using Xunit; -using Microsoft.Cci; using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.Rebuild.UnitTests { diff --git a/src/Compilers/Core/RebuildTest/RoundTripUtil.cs b/src/Compilers/Core/RebuildTest/RoundTripUtil.cs index e2cef09b916f2..eb427b6a4712f 100644 --- a/src/Compilers/Core/RebuildTest/RoundTripUtil.cs +++ b/src/Compilers/Core/RebuildTest/RoundTripUtil.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System; +using System.Collections.Generic; using System.Collections.Immutable; using System.IO; using System.Linq; @@ -19,10 +20,9 @@ using Microsoft.CodeAnalysis.VisualBasic; using Microsoft.Extensions.Logging; using Microsoft.Metadata.Tools; +using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using Roslyn.Test.Utilities; -using System.Collections.Generic; namespace Microsoft.CodeAnalysis.Rebuild.UnitTests { diff --git a/src/Compilers/Server/VBCSCompiler/AnalyzerConsistencyChecker.cs b/src/Compilers/Server/VBCSCompiler/AnalyzerConsistencyChecker.cs index ba0b1f6507569..3a0b0c25b4f0c 100644 --- a/src/Compilers/Server/VBCSCompiler/AnalyzerConsistencyChecker.cs +++ b/src/Compilers/Server/VBCSCompiler/AnalyzerConsistencyChecker.cs @@ -5,13 +5,13 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics.CodeAnalysis; using System.IO; using System.Linq; using System.Reflection; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.CommandLine; -using System.Diagnostics.CodeAnalysis; using Microsoft.CodeAnalysis.VisualBasic; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CompilerServer { diff --git a/src/Compilers/Server/VBCSCompiler/BuildServerController.cs b/src/Compilers/Server/VBCSCompiler/BuildServerController.cs index 9a5de7aa0a2ad..c0fc9e6b8ae73 100644 --- a/src/Compilers/Server/VBCSCompiler/BuildServerController.cs +++ b/src/Compilers/Server/VBCSCompiler/BuildServerController.cs @@ -4,15 +4,15 @@ using System; using System.Collections.Generic; +using System.Collections.Specialized; using System.Diagnostics; +using System.Globalization; using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -using System.Globalization; using Microsoft.CodeAnalysis.CommandLine; -using System.Runtime.InteropServices; -using System.Collections.Specialized; namespace Microsoft.CodeAnalysis.CompilerServer { diff --git a/src/Compilers/Server/VBCSCompiler/CompletionData.cs b/src/Compilers/Server/VBCSCompiler/CompletionData.cs index 8e725cb8b76f2..53486df5a8e2c 100644 --- a/src/Compilers/Server/VBCSCompiler/CompletionData.cs +++ b/src/Compilers/Server/VBCSCompiler/CompletionData.cs @@ -2,15 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Roslyn.Utilities; using System; using System.Diagnostics; using System.Globalization; using System.IO; +using System.IO.Pipes; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CommandLine; -using System.IO.Pipes; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CompilerServer { internal enum CompletionReason diff --git a/src/Compilers/Server/VBCSCompiler/NamedPipeClientConnection.cs b/src/Compilers/Server/VBCSCompiler/NamedPipeClientConnection.cs index 5df1c170ab14c..c9d06fba252fd 100644 --- a/src/Compilers/Server/VBCSCompiler/NamedPipeClientConnection.cs +++ b/src/Compilers/Server/VBCSCompiler/NamedPipeClientConnection.cs @@ -2,17 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Roslyn.Utilities; using System; using System.Diagnostics; using System.IO; using System.IO.Pipes; using System.Runtime.CompilerServices; +using System.Security.AccessControl; using System.Security.Principal; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CommandLine; -using System.Security.AccessControl; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CompilerServer { internal sealed class NamedPipeClientConnection : IClientConnection diff --git a/src/Compilers/Server/VBCSCompiler/ServerDispatcher.cs b/src/Compilers/Server/VBCSCompiler/ServerDispatcher.cs index 7f379c1da9035..4438b4ab61e70 100644 --- a/src/Compilers/Server/VBCSCompiler/ServerDispatcher.cs +++ b/src/Compilers/Server/VBCSCompiler/ServerDispatcher.cs @@ -5,16 +5,16 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Globalization; using System.IO; using System.IO.Pipes; using System.Linq; using System.Runtime; using System.Threading; using System.Threading.Tasks; -using System.Globalization; using Microsoft.CodeAnalysis.CommandLine; -using Microsoft.CodeAnalysis.Symbols; using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.Symbols; namespace Microsoft.CodeAnalysis.CompilerServer { /// diff --git a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.cs b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.cs index a67d4e8d767eb..afb3e40175f6d 100644 --- a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.cs +++ b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.CommandLine; using System; using System.Collections.Specialized; using System.IO; +using Microsoft.CodeAnalysis.CommandLine; namespace Microsoft.CodeAnalysis.CompilerServer { diff --git a/src/Compilers/Server/VBCSCompilerTests/BuildClientTests.cs b/src/Compilers/Server/VBCSCompilerTests/BuildClientTests.cs index 79ac0ec19c981..79df022c73862 100644 --- a/src/Compilers/Server/VBCSCompilerTests/BuildClientTests.cs +++ b/src/Compilers/Server/VBCSCompilerTests/BuildClientTests.cs @@ -6,21 +6,20 @@ extern alias csc; extern alias vbc; - using System; +using System.Collections.Generic; using System.IO; -using Microsoft.CodeAnalysis.CommandLine; +using System.IO.Pipes; using System.Runtime.InteropServices; -using Moq; -using Xunit; -using System.Collections.Generic; +using System.Security.AccessControl; +using System.Security.Principal; +using System.Threading; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.CommandLine; using Microsoft.CodeAnalysis.Test.Utilities; +using Moq; using Roslyn.Test.Utilities; -using System.Threading; -using System.IO.Pipes; -using System.Security.AccessControl; -using System.Security.Principal; +using Xunit; using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests diff --git a/src/Compilers/Server/VBCSCompilerTests/ClientConnectionHandlerTests.cs b/src/Compilers/Server/VBCSCompilerTests/ClientConnectionHandlerTests.cs index 984055a767c85..2e6e56bbc841a 100644 --- a/src/Compilers/Server/VBCSCompilerTests/ClientConnectionHandlerTests.cs +++ b/src/Compilers/Server/VBCSCompilerTests/ClientConnectionHandlerTests.cs @@ -5,17 +5,17 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; +using System.IO; using System.IO.Pipes; +using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CommandLine; +using Microsoft.CodeAnalysis.Test.Utilities; using Moq; using Roslyn.Test.Utilities; using Xunit; -using System.Runtime.InteropServices; -using System.Diagnostics; -using System.IO; -using Microsoft.CodeAnalysis.Test.Utilities; using static Microsoft.CodeAnalysis.CommandLine.BuildResponse; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests { diff --git a/src/Compilers/Server/VBCSCompilerTests/CompilerServerApiTest.cs b/src/Compilers/Server/VBCSCompilerTests/CompilerServerApiTest.cs index 0dbd1b2e14379..243f069ba7892 100644 --- a/src/Compilers/Server/VBCSCompilerTests/CompilerServerApiTest.cs +++ b/src/Compilers/Server/VBCSCompilerTests/CompilerServerApiTest.cs @@ -7,19 +7,19 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; +using System.IO; using System.IO.Pipes; +using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CommandLine; +using Microsoft.CodeAnalysis.Test.Utilities; using Moq; using Roslyn.Test.Utilities; using Xunit; -using System.Runtime.InteropServices; -using System.Diagnostics; -using System.IO; -using Microsoft.CodeAnalysis.Test.Utilities; -using static Microsoft.CodeAnalysis.CommandLine.BuildResponse; using Xunit.Abstractions; +using static Microsoft.CodeAnalysis.CommandLine.BuildResponse; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests { diff --git a/src/Compilers/Server/VBCSCompilerTests/NamedPipeTestUtil.cs b/src/Compilers/Server/VBCSCompilerTests/NamedPipeTestUtil.cs index 183f9401d7d6c..51a407ac1dca3 100644 --- a/src/Compilers/Server/VBCSCompilerTests/NamedPipeTestUtil.cs +++ b/src/Compilers/Server/VBCSCompilerTests/NamedPipeTestUtil.cs @@ -7,8 +7,8 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO.Pipes; -using System.Reflection; using System.Net.Sockets; +using System.Reflection; using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests { diff --git a/src/Compilers/Server/VBCSCompilerTests/ServerUtil.cs b/src/Compilers/Server/VBCSCompilerTests/ServerUtil.cs index 3969e10dec9ff..fe6770cdf465d 100644 --- a/src/Compilers/Server/VBCSCompilerTests/ServerUtil.cs +++ b/src/Compilers/Server/VBCSCompilerTests/ServerUtil.cs @@ -6,18 +6,17 @@ extern alias csc; extern alias vbc; - -using Microsoft.CodeAnalysis.CommandLine; using System; +using System.Collections.Concurrent; +using System.Collections.Immutable; using System.IO; using System.IO.Pipes; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.CommandLine; using Moq; using Xunit; -using System.Collections.Concurrent; -using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests { diff --git a/src/Compilers/Server/VBCSCompilerTests/TestableClientConnectionHost.cs b/src/Compilers/Server/VBCSCompilerTests/TestableClientConnectionHost.cs index 52deeb88fb41a..ad457fbaccf22 100644 --- a/src/Compilers/Server/VBCSCompilerTests/TestableClientConnectionHost.cs +++ b/src/Compilers/Server/VBCSCompilerTests/TestableClientConnectionHost.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.CommandLine; using System; using System.Collections.Generic; using System.IO.Pipes; using System.Threading; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.CommandLine; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests { diff --git a/src/Compilers/Server/VBCSCompilerTests/TestableCompilerServerHost.cs b/src/Compilers/Server/VBCSCompilerTests/TestableCompilerServerHost.cs index c8297f1cbf0c4..2951a560efea7 100644 --- a/src/Compilers/Server/VBCSCompilerTests/TestableCompilerServerHost.cs +++ b/src/Compilers/Server/VBCSCompilerTests/TestableCompilerServerHost.cs @@ -4,9 +4,9 @@ #nullable disable -using Microsoft.CodeAnalysis.CommandLine; using System; using System.Threading; +using Microsoft.CodeAnalysis.CommandLine; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests { diff --git a/src/Compilers/Server/VBCSCompilerTests/TouchedFileLoggingTests.cs b/src/Compilers/Server/VBCSCompilerTests/TouchedFileLoggingTests.cs index abafacdbcfbaf..cc91baf1e09fb 100644 --- a/src/Compilers/Server/VBCSCompilerTests/TouchedFileLoggingTests.cs +++ b/src/Compilers/Server/VBCSCompilerTests/TouchedFileLoggingTests.cs @@ -9,15 +9,15 @@ using System.Globalization; using System.IO; using System.Linq; +using System.Reflection; using System.Runtime.InteropServices; +using Microsoft.CodeAnalysis.CompilerServer; +using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.VisualBasic; using Roslyn.Test.Utilities; using Xunit; using static Roslyn.Test.Utilities.SharedResourceHelpers; -using System.Reflection; -using Microsoft.CodeAnalysis.CompilerServer; -using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.VisualBasic; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests { diff --git a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerServerTests.cs b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerServerTests.cs index 0e04447726c20..4627645b89b88 100644 --- a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerServerTests.cs +++ b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerServerTests.cs @@ -4,9 +4,6 @@ #nullable disable -using Microsoft.CodeAnalysis.CommandLine; -using Microsoft.CodeAnalysis.Test.Utilities; -using Roslyn.Test.Utilities; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -17,6 +14,9 @@ using System.Security.Cryptography; using System.Threading; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.CommandLine; +using Microsoft.CodeAnalysis.Test.Utilities; +using Roslyn.Test.Utilities; using Xunit; using Xunit.Abstractions; diff --git a/src/Compilers/Shared/CoreClrShim.cs b/src/Compilers/Shared/CoreClrShim.cs index 308307a3bdd89..e64235789e694 100644 --- a/src/Compilers/Shared/CoreClrShim.cs +++ b/src/Compilers/Shared/CoreClrShim.cs @@ -4,9 +4,9 @@ #nullable disable -using Roslyn.Utilities; using System; using System.Reflection; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Test/Core/Diagnostics/DiagnosticDescription.cs b/src/Compilers/Test/Core/Diagnostics/DiagnosticDescription.cs index 61aa60dcb0238..088590450a7ac 100644 --- a/src/Compilers/Test/Core/Diagnostics/DiagnosticDescription.cs +++ b/src/Compilers/Test/Core/Diagnostics/DiagnosticDescription.cs @@ -10,12 +10,12 @@ using System.Text; using System.Text.RegularExpressions; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; +using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using Roslyn.Test.Utilities; -using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis.CSharp; namespace Microsoft.CodeAnalysis.Test.Utilities { diff --git a/src/Compilers/Test/Core/Diagnostics/TrackingDiagnosticAnalyzer.cs b/src/Compilers/Test/Core/Diagnostics/TrackingDiagnosticAnalyzer.cs index aa53734438baf..78b668853d5b4 100644 --- a/src/Compilers/Test/Core/Diagnostics/TrackingDiagnosticAnalyzer.cs +++ b/src/Compilers/Test/Core/Diagnostics/TrackingDiagnosticAnalyzer.cs @@ -11,8 +11,8 @@ using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; -using System.Threading; using System.Text.RegularExpressions; +using System.Threading; using Microsoft.CodeAnalysis.Diagnostics; using Xunit; diff --git a/src/Compilers/Test/Core/MarkedSource/MarkupTestFile.cs b/src/Compilers/Test/Core/MarkedSource/MarkupTestFile.cs index fc8d1a7233a6d..eae7f9407e2bd 100644 --- a/src/Compilers/Test/Core/MarkedSource/MarkupTestFile.cs +++ b/src/Compilers/Test/Core/MarkedSource/MarkupTestFile.cs @@ -10,8 +10,8 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; diff --git a/src/Compilers/Test/Core/Metadata/ILBuilderVisualizer.cs b/src/Compilers/Test/Core/Metadata/ILBuilderVisualizer.cs index 5d9c6b5c4dbcd..61782ebb019e8 100644 --- a/src/Compilers/Test/Core/Metadata/ILBuilderVisualizer.cs +++ b/src/Compilers/Test/Core/Metadata/ILBuilderVisualizer.cs @@ -7,17 +7,17 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; using System.Reflection.Emit; using System.Reflection.Metadata; using System.Text; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CodeGen; +using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.Symbols; using Microsoft.Metadata.Tools; using Roslyn.Utilities; using Cci = Microsoft.Cci; -using Microsoft.CodeAnalysis.Symbols; -using System.Diagnostics; namespace Roslyn.Test.Utilities { diff --git a/src/Compilers/Test/Core/Mocks/MoqExtensions.cs b/src/Compilers/Test/Core/Mocks/MoqExtensions.cs index d7ea43a518a44..cbb9a632642da 100644 --- a/src/Compilers/Test/Core/Mocks/MoqExtensions.cs +++ b/src/Compilers/Test/Core/Mocks/MoqExtensions.cs @@ -4,8 +4,8 @@ #nullable disable -using Moq; using System.Linq; +using Moq; namespace Roslyn.Test.Utilities { diff --git a/src/Compilers/Test/Core/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs b/src/Compilers/Test/Core/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs index f8935f6337a90..064bb5c6a84ce 100644 --- a/src/Compilers/Test/Core/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs +++ b/src/Compilers/Test/Core/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs @@ -6,9 +6,9 @@ #if NETCOREAPP using System; -using System.Linq; using System.Collections.Generic; using System.Collections.Immutable; +using System.Linq; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.Emit; diff --git a/src/Compilers/Test/Core/Syntax/SourceUtilities.cs b/src/Compilers/Test/Core/Syntax/SourceUtilities.cs index 9e6be06ed50ba..2ac95ef937af8 100644 --- a/src/Compilers/Test/Core/Syntax/SourceUtilities.cs +++ b/src/Compilers/Test/Core/Syntax/SourceUtilities.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.Text; using System; using System.Collections.Generic; using System.Text; +using Microsoft.CodeAnalysis.Text; namespace Roslyn.Test.Utilities.Syntax { diff --git a/src/Compilers/Test/Core/TargetFrameworkUtil.cs b/src/Compilers/Test/Core/TargetFrameworkUtil.cs index 900d4149e9e33..c3d63c3d206ab 100644 --- a/src/Compilers/Test/Core/TargetFrameworkUtil.cs +++ b/src/Compilers/Test/Core/TargetFrameworkUtil.cs @@ -9,8 +9,8 @@ using System.Collections.Immutable; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Test.Utilities; -using static TestReferences; using static Roslyn.Test.Utilities.TestMetadata; +using static TestReferences; namespace Roslyn.Test.Utilities { diff --git a/src/Compilers/Test/Core/TempFiles/DisposableFile.cs b/src/Compilers/Test/Core/TempFiles/DisposableFile.cs index 327f8abd3efe4..9c3781e26d9c2 100644 --- a/src/Compilers/Test/Core/TempFiles/DisposableFile.cs +++ b/src/Compilers/Test/Core/TempFiles/DisposableFile.cs @@ -7,8 +7,8 @@ using System; using System.IO; using System.Runtime.InteropServices; -using Roslyn.Utilities; using Microsoft.Win32.SafeHandles; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Test.Utilities { diff --git a/src/Compilers/Test/Core/TempFiles/TempFile.cs b/src/Compilers/Test/Core/TempFiles/TempFile.cs index ac1c6bd109e37..ac5d121c3df26 100644 --- a/src/Compilers/Test/Core/TempFiles/TempFile.cs +++ b/src/Compilers/Test/Core/TempFiles/TempFile.cs @@ -6,13 +6,13 @@ using System; using System.Collections.Immutable; +using System.Diagnostics; using System.IO; +using System.Text; +using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Text; -using System.Text; -using System.Diagnostics; using Roslyn.Utilities; -using System.Threading.Tasks; namespace Microsoft.CodeAnalysis.Test.Utilities { diff --git a/src/Compilers/Test/Core/TestBase.cs b/src/Compilers/Test/Core/TestBase.cs index 6e8d93fe5a931..ca60dfec3cd72 100644 --- a/src/Compilers/Test/Core/TestBase.cs +++ b/src/Compilers/Test/Core/TestBase.cs @@ -12,12 +12,12 @@ using System.Xml.Linq; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.Test.Resources.Proprietary; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.VisualBasic; -using static TestReferences.NetFx; using static Roslyn.Test.Utilities.TestMetadata; -using Microsoft.CodeAnalysis.Test.Resources.Proprietary; +using static TestReferences.NetFx; namespace Roslyn.Test.Utilities { diff --git a/src/Compilers/Test/Core/Traits/CompilerTraitDiscoverer.cs b/src/Compilers/Test/Core/Traits/CompilerTraitDiscoverer.cs index 3a30a2b623c88..79c4e82f2d602 100644 --- a/src/Compilers/Test/Core/Traits/CompilerTraitDiscoverer.cs +++ b/src/Compilers/Test/Core/Traits/CompilerTraitDiscoverer.cs @@ -4,10 +4,10 @@ #nullable disable -using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Linq; +using Roslyn.Utilities; using Xunit; using Xunit.Abstractions; using Xunit.Sdk; diff --git a/src/Compilers/Test/Core/Win32Res.cs b/src/Compilers/Test/Core/Win32Res.cs index 6e040f93aac89..6af13d7da4ce1 100644 --- a/src/Compilers/Test/Core/Win32Res.cs +++ b/src/Compilers/Test/Core/Win32Res.cs @@ -5,12 +5,12 @@ #nullable disable using System; +using System.Collections.Generic; using System.ComponentModel; +using System.IO; using System.Runtime.InteropServices; using System.Text; using System.Xml; -using System.IO; -using System.Collections.Generic; using System.Xml.Linq; namespace Microsoft.CodeAnalysis.Test.Utilities diff --git a/src/Compilers/Test/Utilities/CSharp/BasicCompilationUtils.cs b/src/Compilers/Test/Utilities/CSharp/BasicCompilationUtils.cs index 469a80f4ea595..8e8db1242db52 100644 --- a/src/Compilers/Test/Utilities/CSharp/BasicCompilationUtils.cs +++ b/src/Compilers/Test/Utilities/CSharp/BasicCompilationUtils.cs @@ -6,9 +6,9 @@ using System; using System.Collections.Generic; +using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.VisualBasic; using Roslyn.Test.Utilities; -using Microsoft.CodeAnalysis.Test.Utilities; using static Microsoft.CodeAnalysis.CodeGen.CompilationTestData; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/Test/Utilities/CSharp/CompilationTestUtils.cs b/src/Compilers/Test/Utilities/CSharp/CompilationTestUtils.cs index 34015be8ac8e5..195a6e7002638 100644 --- a/src/Compilers/Test/Utilities/CSharp/CompilationTestUtils.cs +++ b/src/Compilers/Test/Utilities/CSharp/CompilationTestUtils.cs @@ -4,23 +4,23 @@ #nullable disable +using System; +using System.Collections.Generic; +using System.Collections.Immutable; +using System.Diagnostics; +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis.Operations; -using Microsoft.CodeAnalysis.Text; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Emit; +using Microsoft.CodeAnalysis.Operations; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Roslyn.Utilities; -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Linq; using Xunit; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/Test/Utilities/CSharp/TestOptions.cs b/src/Compilers/Test/Utilities/CSharp/TestOptions.cs index e5bba5b842d74..4de45dddb00a9 100644 --- a/src/Compilers/Test/Utilities/CSharp/TestOptions.cs +++ b/src/Compilers/Test/Utilities/CSharp/TestOptions.cs @@ -8,8 +8,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; -using Roslyn.Test.Utilities; using Microsoft.CodeAnalysis.Emit; +using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Test.Utilities { diff --git a/src/Compilers/Test/Utilities/VisualBasic/ParserTestUtilities.vb b/src/Compilers/Test/Utilities/VisualBasic/ParserTestUtilities.vb index 822a2315edbda..7db440c139802 100644 --- a/src/Compilers/Test/Utilities/VisualBasic/ParserTestUtilities.vb +++ b/src/Compilers/Test/Utilities/VisualBasic/ParserTestUtilities.vb @@ -2,19 +2,19 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Collections.Immutable Imports System.Globalization Imports System.Runtime.CompilerServices Imports System.Text Imports System.Threading Imports System.Xml.Linq +Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.SyntaxFacts Imports Roslyn.Test.Utilities Imports Xunit -Imports Microsoft.CodeAnalysis.Collections -Imports System.Collections.Immutable Friend Module ParserTestUtilities Friend ReadOnly Property PooledStringBuilderPool As ObjectPool(Of PooledStringBuilder) = PooledStringBuilder.CreatePool(64) diff --git a/src/Compilers/Test/Utilities/VisualBasic/VBParser.vb b/src/Compilers/Test/Utilities/VisualBasic/VBParser.vb index 18039220d0bf5..931d5ad493185 100644 --- a/src/Compilers/Test/Utilities/VisualBasic/VBParser.vb +++ b/src/Compilers/Test/Utilities/VisualBasic/VBParser.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Text Imports System.Reflection +Imports System.Text Imports Microsoft.CodeAnalysis.Test.Utilities Public Class VBParser diff --git a/src/Compilers/VisualBasic/Portable/Analysis/FlowAnalysis/AbstractFlowPass.vb b/src/Compilers/VisualBasic/Portable/Analysis/FlowAnalysis/AbstractFlowPass.vb index 4094116194cf7..18b2129eec566 100644 --- a/src/Compilers/VisualBasic/Portable/Analysis/FlowAnalysis/AbstractFlowPass.vb +++ b/src/Compilers/VisualBasic/Portable/Analysis/FlowAnalysis/AbstractFlowPass.vb @@ -7,13 +7,13 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Diagnostics Imports System.Linq +Imports System.Runtime.InteropServices Imports System.Text Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Utilities -Imports System.Runtime.InteropServices ' NOTE: VB does not support constant expressions in flow analysis during command-line compilation, but supports them when ' analysis is being called via public API. This distinction is governed by 'suppressConstantExpressions' flag diff --git a/src/Compilers/VisualBasic/Portable/Analysis/IteratorAndAsyncAnalysis/IteratorAndAsyncCaptureWalker.vb b/src/Compilers/VisualBasic/Portable/Analysis/IteratorAndAsyncAnalysis/IteratorAndAsyncCaptureWalker.vb index e588fbe69dff1..81b7cc77a65f8 100644 --- a/src/Compilers/VisualBasic/Portable/Analysis/IteratorAndAsyncAnalysis/IteratorAndAsyncCaptureWalker.vb +++ b/src/Compilers/VisualBasic/Portable/Analysis/IteratorAndAsyncAnalysis/IteratorAndAsyncCaptureWalker.vb @@ -4,8 +4,8 @@ Imports System.Collections.Generic Imports System.Runtime.InteropServices -Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.Collections +Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports TypeKind = Microsoft.CodeAnalysis.TypeKind diff --git a/src/Compilers/VisualBasic/Portable/Binding/Binder_DocumentationComments.vb b/src/Compilers/VisualBasic/Portable/Binding/Binder_DocumentationComments.vb index bfd4a1345acbe..38160018c001d 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/Binder_DocumentationComments.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/Binder_DocumentationComments.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable +Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic Partial Friend Class Binder diff --git a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentBinder.vb b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentBinder.vb index 174dc17ec3d69..fc65ce0dee142 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentBinder.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentBinder.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable +Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder.vb b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder.vb index 1a110259d0acd..8b3da05be3ec1 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder.vb @@ -3,12 +3,12 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable +Imports System.Runtime.InteropServices +Imports System.Threading Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Runtime.InteropServices -Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_Compat.vb b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_Compat.vb index f64ca3011cadf..d94143d1ee4bf 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_Compat.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_Compat.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable +Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_TypeParameters.vb b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_TypeParameters.vb index fb3a70acf2bdd..7b20d464483af 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_TypeParameters.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_TypeParameters.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentParamBinder.vb b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentParamBinder.vb index 6a4845858b553..a0c4f3194713e 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentParamBinder.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentParamBinder.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable +Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamBinder.vb b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamBinder.vb index 01c10dfcc45ed..89f869b3a40a6 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamBinder.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamBinder.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable +Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamRefBinder.vb b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamRefBinder.vb index c51ddd1b9b5a1..9692e82300f0b 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamRefBinder.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamRefBinder.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable +Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Binding/MemberSemanticModel.vb b/src/Compilers/VisualBasic/Portable/Binding/MemberSemanticModel.vb index 3e9cbd0723840..9a45282949b21 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/MemberSemanticModel.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/MemberSemanticModel.vb @@ -6,8 +6,8 @@ Imports System.Collections.Immutable Imports System.Runtime.InteropServices Imports System.Threading Imports Microsoft.CodeAnalysis.Collections -Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Operations +Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/BoundTree/BoundLateInvocation.vb b/src/Compilers/VisualBasic/Portable/BoundTree/BoundLateInvocation.vb index f6607d714e2e4..d6509ead28909 100644 --- a/src/Compilers/VisualBasic/Portable/BoundTree/BoundLateInvocation.vb +++ b/src/Compilers/VisualBasic/Portable/BoundTree/BoundLateInvocation.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Diagnostics Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Diagnostics Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/BoundTree/BoundMethodGroup.vb b/src/Compilers/VisualBasic/Portable/BoundTree/BoundMethodGroup.vb index 8fbc6bd6f5089..7947a4e39031d 100644 --- a/src/Compilers/VisualBasic/Portable/BoundTree/BoundMethodGroup.vb +++ b/src/Compilers/VisualBasic/Portable/BoundTree/BoundMethodGroup.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable +Imports System.Runtime.InteropServices +Imports System.Threading Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Runtime.InteropServices -Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/BoundTree/Statement.vb b/src/Compilers/VisualBasic/Portable/BoundTree/Statement.vb index 82615531632c6..27d631f1a54b2 100644 --- a/src/Compilers/VisualBasic/Portable/BoundTree/Statement.vb +++ b/src/Compilers/VisualBasic/Portable/BoundTree/Statement.vb @@ -3,8 +3,8 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Operations +Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocWriter.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocWriter.vb index 00d64fac3b51a..111c455203e83 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocWriter.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocWriter.vb @@ -6,8 +6,8 @@ Imports System Imports System.Collections.Generic Imports System.Diagnostics Imports System.IO -Imports System.Text Imports System.Runtime.InteropServices +Imports System.Text Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Event.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Event.vb index 1c2a3ff807cf2..0e3759983f981 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Event.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Event.vb @@ -8,8 +8,8 @@ Imports System.Collections.Immutable Imports System.Diagnostics Imports System.Globalization Imports System.IO -Imports System.Text Imports System.Runtime.InteropServices +Imports System.Text Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Field.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Field.vb index 6183083248cc5..066173c92c98d 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Field.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Field.vb @@ -7,8 +7,8 @@ Imports System.Collections.Generic Imports System.Diagnostics Imports System.Globalization Imports System.IO -Imports System.Text Imports System.Runtime.InteropServices +Imports System.Text Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Includes.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Includes.vb index 70b2dc1ceab2d..bc6acecba917f 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Includes.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Includes.vb @@ -11,10 +11,10 @@ Imports System.Xml Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects +Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.Text Namespace Microsoft.CodeAnalysis.VisualBasic Partial Public Class VisualBasicCompilation diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Method.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Method.vb index 8af6f3790d70e..52e419e89f264 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Method.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Method.vb @@ -7,8 +7,8 @@ Imports System.Collections.Generic Imports System.Diagnostics Imports System.Globalization Imports System.IO -Imports System.Text Imports System.Runtime.InteropServices +Imports System.Text Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.NamedType.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.NamedType.vb index 73276dae567a8..9edf3546ea637 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.NamedType.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.NamedType.vb @@ -7,8 +7,8 @@ Imports System.Collections.Generic Imports System.Diagnostics Imports System.Globalization Imports System.IO -Imports System.Text Imports System.Runtime.InteropServices +Imports System.Text Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Namespace.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Namespace.vb index 566f05f9cf7df..e57ba9a693b4b 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Namespace.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Namespace.vb @@ -7,8 +7,8 @@ Imports System.Collections.Generic Imports System.Diagnostics Imports System.Globalization Imports System.IO -Imports System.Text Imports System.Runtime.InteropServices +Imports System.Text Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Property.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Property.vb index c324c94b4a8be..03a28dd6f2ea6 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Property.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Property.vb @@ -7,8 +7,8 @@ Imports System.Collections.Generic Imports System.Diagnostics Imports System.Globalization Imports System.IO -Imports System.Text Imports System.Runtime.InteropServices +Imports System.Text Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.vb index 64afcf834b6ae..ceb6a6efb576d 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.vb @@ -6,11 +6,11 @@ Imports System.Globalization Imports System.IO Imports System.Text Imports System.Threading +Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols -Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Namespace Microsoft.CodeAnalysis.VisualBasic Partial Public Class VisualBasicCompilation diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentWalker.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentWalker.vb index 2eb54a56ac68b..687ee43e0f698 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentWalker.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentWalker.vb @@ -7,8 +7,8 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Diagnostics Imports System.IO -Imports System.Text Imports System.Runtime.InteropServices +Imports System.Text Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/UnprocessedDocumentationCommentFinder.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/UnprocessedDocumentationCommentFinder.vb index 1700ef1f15e3d..4710119d1ab41 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/UnprocessedDocumentationCommentFinder.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/UnprocessedDocumentationCommentFinder.vb @@ -6,11 +6,11 @@ Imports System Imports System.Collections.Generic Imports System.Diagnostics Imports System.IO -Imports System.Text Imports System.Runtime.InteropServices +Imports System.Text Imports System.Threading -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic Partial Public Class VisualBasicCompilation diff --git a/src/Compilers/VisualBasic/Portable/Compilation/NamespaceScopeBuilder.vb b/src/Compilers/VisualBasic/Portable/Compilation/NamespaceScopeBuilder.vb index 4b02a23fa6407..cddc436ce637f 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/NamespaceScopeBuilder.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/NamespaceScopeBuilder.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable +Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.VisualBasic.Symbols -Imports Microsoft.CodeAnalysis.Emit Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Compilation/SemanticModel.vb b/src/Compilers/VisualBasic/Portable/Compilation/SemanticModel.vb index 04993b31fb4b9..74790b85e5b18 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/SemanticModel.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/SemanticModel.vb @@ -5,8 +5,8 @@ Imports System.Collections.Immutable Imports System.Runtime.InteropServices Imports System.Threading -Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Operations +Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Compilation/SyntaxTreeSemanticModel.vb b/src/Compilers/VisualBasic/Portable/Compilation/SyntaxTreeSemanticModel.vb index 4e0c843a67102..d018a6108b515 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/SyntaxTreeSemanticModel.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/SyntaxTreeSemanticModel.vb @@ -9,8 +9,8 @@ Imports System.Collections.ObjectModel Imports System.IO Imports System.Runtime.InteropServices Imports System.Threading -Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Operations +Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Compilation/VisualBasicDiagnosticFilter.vb b/src/Compilers/VisualBasic/Portable/Compilation/VisualBasicDiagnosticFilter.vb index 8f1f42fc0b9ca..1a7def072faf8 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/VisualBasicDiagnosticFilter.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/VisualBasicDiagnosticFilter.vb @@ -3,8 +3,8 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports System.Threading Imports System.Runtime.InteropServices +Imports System.Threading Imports Microsoft.CodeAnalysis.VisualBasic Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/DocumentationComments/PEDocumenationCommentUtils.vb b/src/Compilers/VisualBasic/Portable/DocumentationComments/PEDocumenationCommentUtils.vb index b39b01454325d..da5a298d8da8b 100644 --- a/src/Compilers/VisualBasic/Portable/DocumentationComments/PEDocumenationCommentUtils.vb +++ b/src/Compilers/VisualBasic/Portable/DocumentationComments/PEDocumenationCommentUtils.vb @@ -5,8 +5,8 @@ Imports System.Globalization Imports System.Threading Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Emit/NoPia/EmbeddedTypesManager.vb b/src/Compilers/VisualBasic/Portable/Emit/NoPia/EmbeddedTypesManager.vb index 07fb72e461044..bd70c6c8a3786 100644 --- a/src/Compilers/VisualBasic/Portable/Emit/NoPia/EmbeddedTypesManager.vb +++ b/src/Compilers/VisualBasic/Portable/Emit/NoPia/EmbeddedTypesManager.vb @@ -2,11 +2,11 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Collections.Concurrent Imports System.Collections.Immutable +Imports System.Threading Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.VisualBasic.Symbols -Imports System.Collections.Concurrent -Imports System.Threading #If Not DEBUG Then Imports SymbolAdapter = Microsoft.CodeAnalysis.VisualBasic.Symbol diff --git a/src/Compilers/VisualBasic/Portable/Parser/ParseScan.vb b/src/Compilers/VisualBasic/Portable/Parser/ParseScan.vb index bda8c67f97fc9..6a5b5ba28b712 100644 --- a/src/Compilers/VisualBasic/Portable/Parser/ParseScan.vb +++ b/src/Compilers/VisualBasic/Portable/Parser/ParseScan.vb @@ -2,11 +2,11 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports System Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Syntax.InternalSyntax +Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax ' // diff --git a/src/Compilers/VisualBasic/Portable/Scanner/Scanner.vb b/src/Compilers/VisualBasic/Portable/Scanner/Scanner.vb index 7890a82cbd0bb..524e805ba3312 100644 --- a/src/Compilers/VisualBasic/Portable/Scanner/Scanner.vb +++ b/src/Compilers/VisualBasic/Portable/Scanner/Scanner.vb @@ -13,12 +13,12 @@ Imports System.Collections.Immutable Imports System.Globalization Imports System.Runtime.InteropServices Imports System.Text +Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects +Imports Microsoft.CodeAnalysis.Syntax.InternalSyntax Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.SyntaxFacts -Imports Microsoft.CodeAnalysis.Collections -Imports Microsoft.CodeAnalysis.Syntax.InternalSyntax Imports CoreInternalSyntax = Microsoft.CodeAnalysis.Syntax.InternalSyntax Namespace Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax diff --git a/src/Compilers/VisualBasic/Portable/Semantics/AccessCheck.vb b/src/Compilers/VisualBasic/Portable/Semantics/AccessCheck.vb index 0d0a344bed7bc..a9ef7455eb495 100644 --- a/src/Compilers/VisualBasic/Portable/Semantics/AccessCheck.vb +++ b/src/Compilers/VisualBasic/Portable/Semantics/AccessCheck.vb @@ -2,13 +2,12 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Collections.Immutable +Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Collections.Immutable -Imports System.Runtime.InteropServices - Imports TypeKind = Microsoft.CodeAnalysis.TypeKind Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Symbols/AccessibilityExtensions.vb b/src/Compilers/VisualBasic/Portable/Symbols/AccessibilityExtensions.vb index 4b482dcf2de9f..c1d85cb2b4180 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/AccessibilityExtensions.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/AccessibilityExtensions.vb @@ -3,12 +3,12 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Generic +Imports System.Runtime.CompilerServices Imports System.Text Imports System.Threading Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Runtime.CompilerServices Imports Roslyn.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/ArrayTypeSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/ArrayTypeSymbol.vb index 86ec08f92b493..3e9547ceed4a6 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/ArrayTypeSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/ArrayTypeSymbol.vb @@ -7,8 +7,8 @@ Imports System.Collections.Immutable Imports System.Collections.ObjectModel Imports System.Threading Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/AssemblySymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/AssemblySymbol.vb index eb9c6a5e7d30a..d8e7d925645a4 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/AssemblySymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/AssemblySymbol.vb @@ -5,13 +5,13 @@ Imports System.Collections.Concurrent Imports System.Collections.Generic Imports System.Collections.Immutable +Imports System.Runtime.InteropServices Imports System.Threading +Imports Microsoft.CodeAnalysis.Collections +Imports Microsoft.CodeAnalysis.Symbols Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.Collections -Imports System.Runtime.InteropServices -Imports Microsoft.CodeAnalysis.Symbols Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Attributes/PEAttributeData.vb b/src/Compilers/VisualBasic/Portable/Symbols/Attributes/PEAttributeData.vb index 0aebabd7e2454..ae277bc9a9708 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Attributes/PEAttributeData.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Attributes/PEAttributeData.vb @@ -4,8 +4,8 @@ Imports System.Collections.Immutable Imports System.Collections.ObjectModel -Imports System.Threading Imports System.Reflection.Metadata +Imports System.Threading Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Attributes/SourceAttributeData.vb b/src/Compilers/VisualBasic/Portable/Symbols/Attributes/SourceAttributeData.vb index acf0ea6c01182..18dc56b61d6c8 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Attributes/SourceAttributeData.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Attributes/SourceAttributeData.vb @@ -5,14 +5,14 @@ Imports System Imports System.Collections.Generic Imports System.Collections.Immutable +Imports System.Reflection.Metadata Imports Microsoft.Cci Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.Emit -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Reflection.Metadata Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/BaseTypeAnalysis.vb b/src/Compilers/VisualBasic/Portable/Symbols/BaseTypeAnalysis.vb index 90edacfb61bda..650d759cf2971 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/BaseTypeAnalysis.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/BaseTypeAnalysis.vb @@ -7,8 +7,8 @@ Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEAssemblySymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEAssemblySymbol.vb index 120294e440256..48265e3f4a768 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEAssemblySymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEAssemblySymbol.vb @@ -6,10 +6,10 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Collections.ObjectModel Imports System.Linq.Enumerable +Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEEventSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEEventSymbol.vb index 5a850d80434d7..542ce1614e32e 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEEventSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEEventSymbol.vb @@ -5,9 +5,9 @@ Imports System Imports System.Collections.Immutable Imports System.Globalization -Imports System.Threading Imports System.Reflection Imports System.Reflection.Metadata +Imports System.Threading Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEFieldSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEFieldSymbol.vb index eebcf922a7ced..0ac96040dd63e 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEFieldSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEFieldSymbol.vb @@ -6,10 +6,10 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Collections.ObjectModel Imports System.Globalization -Imports System.Runtime.InteropServices -Imports System.Threading Imports System.Reflection Imports System.Reflection.Metadata +Imports System.Runtime.InteropServices +Imports System.Threading Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.vb index 008058c1912b4..6793ae91aeb89 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Generic +Imports System.Reflection.Metadata Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Reflection.Metadata Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEMethodSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEMethodSymbol.vb index 180613eb6950c..406bb5ace561c 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEMethodSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEMethodSymbol.vb @@ -6,14 +6,14 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Collections.ObjectModel Imports System.Globalization -Imports System.Threading Imports System.Reflection Imports System.Reflection.Metadata +Imports System.Runtime.InteropServices +Imports System.Threading Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.vb index 8d6930537561a..721f1f3ffd0ac 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.vb @@ -6,9 +6,9 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Collections.ObjectModel Imports System.Globalization +Imports System.Linq Imports System.Reflection Imports System.Reflection.Metadata -Imports System.Linq Imports System.Runtime.InteropServices Imports System.Threading Imports Microsoft.CodeAnalysis.CodeGen @@ -16,9 +16,9 @@ Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports TypeKind = Microsoft.CodeAnalysis.TypeKind -Imports TypeAttributes = System.Reflection.TypeAttributes Imports FieldAttributes = System.Reflection.FieldAttributes +Imports TypeAttributes = System.Reflection.TypeAttributes +Imports TypeKind = Microsoft.CodeAnalysis.TypeKind Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.vb index 00c6f1ffb132a..a5f269c7807a2 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Generic -Imports System.Threading Imports System.Reflection Imports System.Reflection.Metadata +Imports System.Threading Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEParameterSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEParameterSymbol.vb index 7f9751ba6c461..0da3e65634e3a 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEParameterSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEParameterSymbol.vb @@ -4,10 +4,10 @@ Imports System.Collections.Generic Imports System.Collections.Immutable -Imports System.Runtime.InteropServices -Imports System.Threading Imports System.Reflection Imports System.Reflection.Metadata +Imports System.Runtime.InteropServices +Imports System.Threading Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEPropertySymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEPropertySymbol.vb index d35e52b5b8d73..e434276d65c3e 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEPropertySymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEPropertySymbol.vb @@ -4,9 +4,9 @@ Imports System.Collections.Immutable Imports System.Globalization -Imports System.Threading Imports System.Reflection Imports System.Reflection.Metadata +Imports System.Threading Imports Microsoft.Cci Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PETypeParameterSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PETypeParameterSymbol.vb index af013bde4b967..7bfa39005361f 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PETypeParameterSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PETypeParameterSymbol.vb @@ -4,13 +4,13 @@ Imports System.Collections.Generic Imports System.Collections.Immutable -Imports System.Threading +Imports System.Reflection Imports System.Reflection.Metadata +Imports System.Threading Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Reflection Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Portable/Symbols/NamedTypeSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/NamedTypeSymbol.vb index ba37369b1598b..616b7bdaccee8 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/NamedTypeSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/NamedTypeSymbol.vb @@ -8,8 +8,8 @@ Imports System.Runtime.InteropServices Imports System.Text Imports System.Threading Imports Microsoft.CodeAnalysis.PooledObjects -Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.Symbols +Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports TypeKind = Microsoft.CodeAnalysis.TypeKind diff --git a/src/Compilers/VisualBasic/Portable/Symbols/NamespaceOrTypeSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/NamespaceOrTypeSymbol.vb index b30611c87ecec..7563fc1480563 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/NamespaceOrTypeSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/NamespaceOrTypeSymbol.vb @@ -6,8 +6,8 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Threading Imports Microsoft.CodeAnalysis.Collections -Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.Symbols +Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Symbols/NamespaceSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/NamespaceSymbol.vb index ab40ce94cd986..4ea8f0688963f 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/NamespaceSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/NamespaceSymbol.vb @@ -6,8 +6,8 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Threading Imports Microsoft.CodeAnalysis.PooledObjects -Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.Symbols +Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.vb index d74fa93184cee..c90e600200027 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.vb @@ -6,12 +6,12 @@ Imports System.Collections.Concurrent Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Collections.ObjectModel +Imports System.Globalization +Imports System.Threading Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Globalization -Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Retargeting diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingModuleSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingModuleSymbol.vb index 0ae763a10e97e..eb46e34e866bb 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingModuleSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingModuleSymbol.vb @@ -6,15 +6,15 @@ Imports System.Collections.Concurrent Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Collections.ObjectModel +Imports System.Globalization Imports System.Runtime.InteropServices +Imports System.Threading Imports Microsoft.Cci Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports TypeKind = Microsoft.CodeAnalysis.TypeKind -Imports System.Globalization -Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Retargeting diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.vb b/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.vb index 46e7c7e6a1bb2..6dc129054f8e7 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.vb @@ -9,8 +9,8 @@ Imports System.Collections.ObjectModel Imports Microsoft.Cci Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Retargeting diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Source/SourceSimpleParameterSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Source/SourceSimpleParameterSymbol.vb index 42e76980383db..b804a273a9be9 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Source/SourceSimpleParameterSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Source/SourceSimpleParameterSymbol.vb @@ -3,6 +3,7 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Generic +Imports System.Collections.Immutable Imports System.Collections.ObjectModel Imports System.Runtime.InteropServices Imports System.Threading @@ -11,7 +12,6 @@ Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Binder Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Collections.Immutable Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols ''' diff --git a/src/Compilers/VisualBasic/Portable/Symbols/TypeParameterSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/TypeParameterSymbol.vb index 5e62b8ad9e7d9..6bb54a363af01 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/TypeParameterSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/TypeParameterSymbol.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable +Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols -Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/TypeSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/TypeSymbol.vb index 8ee0405eb018b..f72d79b66a39b 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/TypeSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/TypeSymbol.vb @@ -8,8 +8,8 @@ Imports System.Collections.Immutable Imports System.Runtime.InteropServices Imports System.Threading Imports Microsoft.CodeAnalysis.PooledObjects -Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.Symbols +Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Symbols/UnsupportedMetadataTypeSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/UnsupportedMetadataTypeSymbol.vb index ba9c790f049e6..237fa00fb44c0 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/UnsupportedMetadataTypeSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/UnsupportedMetadataTypeSymbol.vb @@ -4,10 +4,10 @@ Imports System.Collections.Generic Imports System.Collections.ObjectModel +Imports System.Reflection.Metadata Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Reflection.Metadata Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Syntax/LambdaUtilities.vb b/src/Compilers/VisualBasic/Portable/Syntax/LambdaUtilities.vb index 2f9ad037b77a3..0b45f79889609 100644 --- a/src/Compilers/VisualBasic/Portable/Syntax/LambdaUtilities.vb +++ b/src/Compilers/VisualBasic/Portable/Syntax/LambdaUtilities.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Syntax/SyntaxFactory.vb b/src/Compilers/VisualBasic/Portable/Syntax/SyntaxFactory.vb index 78252e87b8fb3..aa760d33ae906 100644 --- a/src/Compilers/VisualBasic/Portable/Syntax/SyntaxFactory.vb +++ b/src/Compilers/VisualBasic/Portable/Syntax/SyntaxFactory.vb @@ -4,9 +4,9 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports VbObjectDisplay = Microsoft.CodeAnalysis.VisualBasic.ObjectDisplay.ObjectDisplay -Imports Parser = Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.Parser Imports Feature = Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.Feature +Imports Parser = Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.Parser +Imports VbObjectDisplay = Microsoft.CodeAnalysis.VisualBasic.ObjectDisplay.ObjectDisplay Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Syntax/SyntaxNodeFactories.vb b/src/Compilers/VisualBasic/Portable/Syntax/SyntaxNodeFactories.vb index a272b57adabbc..e0ee40e0f3725 100644 --- a/src/Compilers/VisualBasic/Portable/Syntax/SyntaxNodeFactories.vb +++ b/src/Compilers/VisualBasic/Portable/Syntax/SyntaxNodeFactories.vb @@ -7,15 +7,15 @@ ' code-generated into SyntaxNodes.vb, but some are easier to hand-write. '----------------------------------------------------------------------------------------------------------- -Imports System.Threading +Imports System.Collections.Immutable +Imports System.ComponentModel Imports System.Text +Imports System.Threading +Imports Microsoft.CodeAnalysis.Syntax Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.SyntaxFacts Imports InternalSyntax = Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax -Imports Microsoft.CodeAnalysis.Syntax -Imports System.Collections.Immutable -Imports System.ComponentModel Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Test/CommandLine/CommandLineBreakingChanges.vb b/src/Compilers/VisualBasic/Test/CommandLine/CommandLineBreakingChanges.vb index fbd1f78da018f..26e83add6a68e 100644 --- a/src/Compilers/VisualBasic/Test/CommandLine/CommandLineBreakingChanges.vb +++ b/src/Compilers/VisualBasic/Test/CommandLine/CommandLineBreakingChanges.vb @@ -3,8 +3,8 @@ ' See the LICENSE file in the project root for more information. Imports System.Reflection -Imports Roslyn.Test.Utilities.SharedResourceHelpers Imports Roslyn.Test.Utilities +Imports Roslyn.Test.Utilities.SharedResourceHelpers Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.CommandLine.UnitTests diff --git a/src/Compilers/VisualBasic/Test/CommandLine/SarifErrorLoggerTests.vb b/src/Compilers/VisualBasic/Test/CommandLine/SarifErrorLoggerTests.vb index db16718bf196c..bf88ac40ca668 100644 --- a/src/Compilers/VisualBasic/Test/CommandLine/SarifErrorLoggerTests.vb +++ b/src/Compilers/VisualBasic/Test/CommandLine/SarifErrorLoggerTests.vb @@ -4,11 +4,11 @@ Imports System.Globalization Imports System.IO +Imports Microsoft.CodeAnalysis.CommonDiagnosticAnalyzers Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests -Imports Xunit -Imports Microsoft.CodeAnalysis.CommonDiagnosticAnalyzers Imports Roslyn.Test.Utilities.SharedResourceHelpers +Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.CommandLine.UnitTests diff --git a/src/Compilers/VisualBasic/Test/CommandLine/SarifV1ErrorLoggerTests.vb b/src/Compilers/VisualBasic/Test/CommandLine/SarifV1ErrorLoggerTests.vb index 5edd37fc00b3f..cad942809686c 100644 --- a/src/Compilers/VisualBasic/Test/CommandLine/SarifV1ErrorLoggerTests.vb +++ b/src/Compilers/VisualBasic/Test/CommandLine/SarifV1ErrorLoggerTests.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.IO +Imports Microsoft.CodeAnalysis.CommonDiagnosticAnalyzers +Imports Microsoft.CodeAnalysis.DiagnosticExtensions Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Xunit -Imports Microsoft.CodeAnalysis.CommonDiagnosticAnalyzers -Imports Microsoft.CodeAnalysis.DiagnosticExtensions Namespace Microsoft.CodeAnalysis.VisualBasic.CommandLine.UnitTests diff --git a/src/Compilers/VisualBasic/Test/CommandLine/SarifV2ErrorLoggerTests.vb b/src/Compilers/VisualBasic/Test/CommandLine/SarifV2ErrorLoggerTests.vb index 7edd02223ce99..7ecb20d9ff2df 100644 --- a/src/Compilers/VisualBasic/Test/CommandLine/SarifV2ErrorLoggerTests.vb +++ b/src/Compilers/VisualBasic/Test/CommandLine/SarifV2ErrorLoggerTests.vb @@ -4,10 +4,10 @@ Imports System.Globalization Imports System.IO +Imports Microsoft.CodeAnalysis.CommonDiagnosticAnalyzers Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Xunit -Imports Microsoft.CodeAnalysis.CommonDiagnosticAnalyzers Namespace Microsoft.CodeAnalysis.VisualBasic.CommandLine.UnitTests diff --git a/src/Compilers/VisualBasic/Test/CommandLine/TouchedFileLoggingTests.vb b/src/Compilers/VisualBasic/Test/CommandLine/TouchedFileLoggingTests.vb index b6f1e330f8a55..adefd29d413c5 100644 --- a/src/Compilers/VisualBasic/Test/CommandLine/TouchedFileLoggingTests.vb +++ b/src/Compilers/VisualBasic/Test/CommandLine/TouchedFileLoggingTests.vb @@ -7,8 +7,8 @@ Imports System.IO Imports System.Reflection Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Test.Utilities -Imports Roslyn.Test.Utilities.SharedResourceHelpers Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests +Imports Roslyn.Test.Utilities.SharedResourceHelpers Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.CommandLine.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Conditional.vb b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Conditional.vb index 7e9dda7474ed2..cbd3eb5add3a1 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Conditional.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Conditional.vb @@ -14,8 +14,8 @@ Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Imports TypeKind = Microsoft.CodeAnalysis.TypeKind diff --git a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_MarshalAs.vb b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_MarshalAs.vb index 098701467ec61..b0dfada1001a4 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_MarshalAs.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_MarshalAs.vb @@ -6,9 +6,9 @@ Imports System Imports System.Collections.Generic Imports System.Runtime.InteropServices Imports System.Text +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Imports Roslyn.Utilities Imports Xunit diff --git a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Tuples.vb b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Tuples.vb index 59ec5e484d03e..0a9b5d5f5ebc3 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Tuples.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Tuples.vb @@ -9,8 +9,8 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenNullable.vb b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenNullable.vb index 1afe5694d817e..6e903b11861d2 100644 --- a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenNullable.vb +++ b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenNullable.vb @@ -2,6 +2,7 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Test.Utilities @@ -10,7 +11,6 @@ Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Emit -Imports System.Collections.Immutable Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenTuples.vb b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenTuples.vb index eeb80e41efae9..1e69473f8a610 100644 --- a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenTuples.vb +++ b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenTuples.vb @@ -12,8 +12,8 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities -Imports Xunit Imports Roslyn.Test.Utilities.TestMetadata +Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenWinMdDelegates.vb b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenWinMdDelegates.vb index 8b9e58d576e80..6b9f3569397d9 100644 --- a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenWinMdDelegates.vb +++ b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenWinMdDelegates.vb @@ -2,11 +2,11 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Xml.Linq +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities -Imports System.Xml.Linq Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Emit/Emit/DeterministicTests.vb b/src/Compilers/VisualBasic/Test/Emit/Emit/DeterministicTests.vb index 38d01e41d8290..a29d0838cc91a 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Emit/DeterministicTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Emit/DeterministicTests.vb @@ -3,13 +3,13 @@ ' See the LICENSE file in the project root for more information. Imports System -Imports System.IO Imports System.Collections.Generic Imports System.Collections.Immutable +Imports System.IO Imports System.Threading Imports Microsoft.CodeAnalysis.Test.Utilities -Imports Roslyn.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Emit diff --git a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/AssemblyReferencesTests.vb b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/AssemblyReferencesTests.vb index f3be22ee50635..ae3ce72a60acd 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/AssemblyReferencesTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/AssemblyReferencesTests.vb @@ -8,10 +8,10 @@ Imports System.IO Imports System.Linq Imports System.Reflection.Metadata Imports System.Threading -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols -Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Roslyn.Test.MetadataUtilities Imports Roslyn.Test.Utilities Imports Xunit diff --git a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/EditAndContinuePdbTests.vb b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/EditAndContinuePdbTests.vb index 35d0a023f9a22..81a12c3c38bf4 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/EditAndContinuePdbTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/EditAndContinuePdbTests.vb @@ -4,10 +4,10 @@ Imports System.Collections.Immutable Imports System.Reflection.Metadata Imports System.Reflection.Metadata.Ecma335 -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols -Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/SymbolMatcherTests.vb b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/SymbolMatcherTests.vb index 8cd4cdd848467..daf25ddb8b9be 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/SymbolMatcherTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/SymbolMatcherTests.vb @@ -3,15 +3,15 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable +Imports System.Threading +Imports System.Threading.Tasks Imports Microsoft.CodeAnalysis.CodeGen Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.Test.Utilities -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Emit -Imports Roslyn.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE -Imports System.Threading.Tasks -Imports System.Threading +Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests Public Class SymbolMatcherTests diff --git a/src/Compilers/VisualBasic/Test/Emit/Emit/NoPiaEmbedTypes.vb b/src/Compilers/VisualBasic/Test/Emit/Emit/NoPiaEmbedTypes.vb index e6fe80e2af427..c721aa6c8bf61 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Emit/NoPiaEmbedTypes.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Emit/NoPiaEmbedTypes.vb @@ -2,20 +2,20 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Collections.Immutable +Imports System.IO +Imports System.Reflection +Imports System.Reflection.Metadata +Imports System.Xml.Linq +Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Emit Imports Roslyn.Test.Utilities -Imports System.IO -Imports System.Reflection -Imports System.Xml.Linq -Imports Xunit -Imports System.Reflection.Metadata -Imports Microsoft.CodeAnalysis.Emit -Imports System.Collections.Immutable Imports Roslyn.Test.Utilities.TestMetadata +Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Emit/PDB/ChecksumTests.vb b/src/Compilers/VisualBasic/Test/Emit/PDB/ChecksumTests.vb index 16edc2ffcd6bf..8540aa24447d0 100644 --- a/src/Compilers/VisualBasic/Test/Emit/PDB/ChecksumTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/PDB/ChecksumTests.vb @@ -2,13 +2,13 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Text -Imports Roslyn.Test.Utilities Imports System.Collections.Immutable Imports System.IO Imports System.Xml.Linq -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Emit +Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.Text +Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.PDB diff --git a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBConstLocalTests.vb b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBConstLocalTests.vb index 8c223892be73d..ac43ce10c9b86 100644 --- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBConstLocalTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBConstLocalTests.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Roslyn.Test.Utilities Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.PDB diff --git a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBLambdaTests.vb b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBLambdaTests.vb index 3c7a9d7e3d895..e662bcf228e49 100644 --- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBLambdaTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBLambdaTests.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities -Imports System.Xml.Linq Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.PDB Public Class PDBLambdaTests diff --git a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBWinMdExpTests.vb b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBWinMdExpTests.vb index 55af00c39e232..9caa2900068b8 100644 --- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBWinMdExpTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBWinMdExpTests.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Roslyn.Test.Utilities Imports System.IO Imports System.Text Imports System.Xml +Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.PDB Public Class PDBWinMdExpTests diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArgument.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArgument.vb index f0688530ba51f..645eb745e9733 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArgument.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArgument.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Operations +Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArrayElementReferenceExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArrayElementReferenceExpression.vb index 6ef31628f24c7..ac7ae3a83d74a 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArrayElementReferenceExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArrayElementReferenceExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IAwaitExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IAwaitExpression.vb index f31df66a0aa53..07b24339f3213 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IAwaitExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IAwaitExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBinaryOperatorExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBinaryOperatorExpression.vb index 830d524ac6f56..a2df221427a6e 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBinaryOperatorExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBinaryOperatorExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBlockStatement_MethodBlocks.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBlockStatement_MethodBlocks.vb index 0bff05b1b401a..fe749abf3a511 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBlockStatement_MethodBlocks.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBlockStatement_MethodBlocks.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ICompoundAssignmentOperation.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ICompoundAssignmentOperation.vb index 528fbc4e6a672..6b5b385056d28 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ICompoundAssignmentOperation.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ICompoundAssignmentOperation.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Operations +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IConversionExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IConversionExpression.vb index f624ec0d0a09d..a476d8d2b7c5e 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IConversionExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IConversionExpression.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Operations +Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicInvocationExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicInvocationExpression.vb index be06de39b70aa..2569b10c98a1b 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicInvocationExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicInvocationExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicMemberReferenceExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicMemberReferenceExpression.vb index 90c8138044c8c..be29c42ce8a83 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicMemberReferenceExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicMemberReferenceExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IIfStatement.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IIfStatement.vb index 7c2f62f75dcc4..d47a6b6c790bc 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IIfStatement.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IIfStatement.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IInterpolatedStringExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IInterpolatedStringExpression.vb index 81b1c8d1ba091..8d910cfbe8c23 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IInterpolatedStringExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IInterpolatedStringExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_INoPiaObjectCreationOperation.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_INoPiaObjectCreationOperation.vb index 8d580954e5591..1585a19c4f59c 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_INoPiaObjectCreationOperation.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_INoPiaObjectCreationOperation.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IObjectCreationExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IObjectCreationExpression.vb index 2422a4b0d9712..a6533376787b3 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IObjectCreationExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IObjectCreationExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IReturnStatement.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IReturnStatement.vb index 5505de8fdb6ae..0f95a7a717c5e 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IReturnStatement.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IReturnStatement.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITupleExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITupleExpression.vb index db9e4b01aa62d..510ac1ab1fd7c 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITupleExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITupleExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITypeOfExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITypeOfExpression.vb index 3d5d23aca2c13..83d8844a5ab28 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITypeOfExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITypeOfExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUnaryOperatorExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUnaryOperatorExpression.vb index b908a3e194ee2..e00d2957f47b1 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUnaryOperatorExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUnaryOperatorExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUsingStatement.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUsingStatement.vb index 89c4b1b36b34e..79e1d85aca59a 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUsingStatement.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUsingStatement.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Operations Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities -Imports Microsoft.CodeAnalysis.Operations Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics Partial Public Class IOperationTests diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IVariableDeclaration.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IVariableDeclaration.vb index 1c2ecd2125e0f..78cf95c808fb5 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IVariableDeclaration.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IVariableDeclaration.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IWithStatement.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IWithStatement.vb index 46bd430dd2c28..97533f46735d3 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IWithStatement.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IWithStatement.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_TryCatch.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_TryCatch.vb index 7f6450dddaabf..60c92f65c9b62 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_TryCatch.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_TryCatch.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Statements_Tests.vb b/src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Statements_Tests.vb index 1f78dcc964257..10f38403a1f31 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Statements_Tests.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Statements_Tests.vb @@ -7,8 +7,8 @@ Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Emit Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Semantic/Binding/LookupTests.vb b/src/Compilers/VisualBasic/Test/Semantic/Binding/LookupTests.vb index 08fa2cb65a2b4..d3b0476cf70fe 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Binding/LookupTests.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/Binding/LookupTests.vb @@ -8,8 +8,8 @@ Imports System.Text Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Imports Roslyn.Test.Utilities.TestMetadata diff --git a/src/Compilers/VisualBasic/Test/Semantic/Compilation/CompilationAPITests.vb b/src/Compilers/VisualBasic/Test/Semantic/Compilation/CompilationAPITests.vb index f7dcfd92492c2..ebe44c1ec74f2 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Compilation/CompilationAPITests.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/Compilation/CompilationAPITests.vb @@ -19,9 +19,9 @@ Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Roslyn.Test.Utilities -Imports CS = Microsoft.CodeAnalysis.CSharp Imports Roslyn.Test.Utilities.TestHelpers Imports Roslyn.Test.Utilities.TestMetadata +Imports CS = Microsoft.CodeAnalysis.CSharp Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests Public Class CompilationAPITests diff --git a/src/Compilers/VisualBasic/Test/Semantic/FlowAnalysis/FlowDiagnosticTests.vb b/src/Compilers/VisualBasic/Test/Semantic/FlowAnalysis/FlowDiagnosticTests.vb index 0adbdd3f827ba..24b6afd4dc590 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/FlowAnalysis/FlowDiagnosticTests.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/FlowAnalysis/FlowDiagnosticTests.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System -Imports System.[Text] Imports System.Collections.Generic Imports System.Linq +Imports System.[Text] Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Test/Semantic/Semantics/AsyncAwait.vb b/src/Compilers/VisualBasic/Test/Semantic/Semantics/AsyncAwait.vb index d6ff685ec29d3..bf35ba5f52627 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Semantics/AsyncAwait.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/Semantics/AsyncAwait.vb @@ -2,13 +2,12 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Collections.ObjectModel Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax - Imports Roslyn.Test.Utilities -Imports System.Collections.ObjectModel Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/Semantic/Semantics/GetSemanticInfoTests.vb b/src/Compilers/VisualBasic/Test/Semantic/Semantics/GetSemanticInfoTests.vb index c4a0121521627..17d5c5831ac1e 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Semantics/GetSemanticInfoTests.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/Semantics/GetSemanticInfoTests.vb @@ -14,9 +14,8 @@ Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.OverloadResolution Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Roslyn.Test.Utilities.TestMetadata - Imports Roslyn.Test.Utilities +Imports Roslyn.Test.Utilities.TestMetadata Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics Partial Public Class SemanticModelTests diff --git a/src/Compilers/VisualBasic/Test/Semantic/Semantics/MethodCalls.vb b/src/Compilers/VisualBasic/Test/Semantic/Semantics/MethodCalls.vb index 7a57fef155062..e282ef889054b 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Semantics/MethodCalls.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/Semantics/MethodCalls.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/Semantic/Semantics/NameLengthTests.vb b/src/Compilers/VisualBasic/Test/Semantic/Semantics/NameLengthTests.vb index ccf367fa258fc..e8eb06d87c455 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Semantics/NameLengthTests.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/Semantics/NameLengthTests.vb @@ -2,14 +2,14 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System Imports System.IO +Imports System.Xml.Linq +Imports Microsoft.Cci Imports Microsoft.CodeAnalysis.VisualBasic.Symbols 'Imports Microsoft.CodeAnalysis.VisualBasic.Test.Utilities Imports Roslyn.Test.Utilities Imports Xunit -Imports Microsoft.Cci -Imports System -Imports System.Xml.Linq Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests Public Class NameLengthTests : Inherits BasicTestBase diff --git a/src/Compilers/VisualBasic/Test/Symbol/DocumentationComments/DocCommentTests.vb b/src/Compilers/VisualBasic/Test/Symbol/DocumentationComments/DocCommentTests.vb index 5f793c9ffff46..d19ed37746289 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/DocumentationComments/DocCommentTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/DocumentationComments/DocCommentTests.vb @@ -3,15 +3,15 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable +Imports System.IO +Imports System.Text +Imports System.Xml.Linq +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.Test.Utilities -Imports System.Xml.Linq -Imports System.Text -Imports System.IO -Imports Roslyn.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.VisualBasicCompilation +Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests Public Class DocCommentTests diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesEmittedSymbolsTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesEmittedSymbolsTests.vb index 4b5a31722f9d7..6f681559e0972 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesEmittedSymbolsTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesEmittedSymbolsTests.vb @@ -7,10 +7,9 @@ Imports System.Runtime.CompilerServices Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax - Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesSemanticsTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesSemanticsTests.vb index 75b57bd30213e..87a16184f0e64 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesSemanticsTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesSemanticsTests.vb @@ -8,10 +8,9 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax - Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AssemblyAndNamespaceTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AssemblyAndNamespaceTests.vb index e1716e18bca18..9987bb038d380 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AssemblyAndNamespaceTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AssemblyAndNamespaceTests.vb @@ -2,6 +2,7 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Collections.Immutable Imports System.Globalization Imports System.Text Imports System.Xml.Linq @@ -11,7 +12,6 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities -Imports System.Collections.Immutable Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/CorLibrary/Choosing.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/CorLibrary/Choosing.vb index 15755584b9802..7b17c0ad87d4a 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/CorLibrary/Choosing.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/CorLibrary/Choosing.vb @@ -7,8 +7,8 @@ Imports CompilationCreationTestHelpers Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Metadata Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/InterfaceImplementationTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/InterfaceImplementationTests.vb index 1b2aba8041ca3..3a8da66b63ccd 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/InterfaceImplementationTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/InterfaceImplementationTests.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/BaseTypeResolution.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/BaseTypeResolution.vb index 66500bd40b27c..9a1237ba83808 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/BaseTypeResolution.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/BaseTypeResolution.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System.Reflection.Metadata +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/HasUnsupportedMetadata.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/HasUnsupportedMetadata.vb index b21bf60a59231..5e37c9a1f81eb 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/HasUnsupportedMetadata.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/HasUnsupportedMetadata.vb @@ -6,8 +6,8 @@ Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadCustomModifiers.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadCustomModifiers.vb index ae61dedfb9587..b9164597bdcb1 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadCustomModifiers.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadCustomModifiers.vb @@ -4,14 +4,14 @@ Imports System.Runtime.CompilerServices Imports CompilationCreationTestHelpers +Imports Microsoft.CodeAnalysis.CSharp Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities -Imports Microsoft.CodeAnalysis.CSharp Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingAttributes.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingAttributes.vb index eb30bf3b1eeee..ecd6cbc1ca962 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingAttributes.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingAttributes.vb @@ -8,8 +8,8 @@ Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Imports Roslyn.Test.Utilities.TestMetadata diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingEvents.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingEvents.vb index 101bdd0a1c2e1..a58983a538209 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingEvents.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingEvents.vb @@ -7,8 +7,8 @@ Imports CompilationCreationTestHelpers Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Imports Roslyn.Test.Utilities.TestMetadata diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingFields.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingFields.vb index ab01bc4261bf8..b24da14c90126 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingFields.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingFields.vb @@ -7,8 +7,8 @@ Imports CompilationCreationTestHelpers Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingWithEvents.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingWithEvents.vb index d59121d128c04..9821ff7d3cd2f 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingWithEvents.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingWithEvents.vb @@ -7,8 +7,8 @@ Imports CompilationCreationTestHelpers Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPia.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPia.vb index c8027ff848044..2377d6d6624af 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPia.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPia.vb @@ -4,8 +4,8 @@ Imports System.Collections.Immutable Imports CompilationCreationTestHelpers -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Roslyn.Test.Utilities Imports Roslyn.Test.Utilities.TestMetadata diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaInstantiationOfGenericClassAndStruct.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaInstantiationOfGenericClassAndStruct.vb index dc7a529f0b3d8..b1f39e13e66a4 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaInstantiationOfGenericClassAndStruct.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaInstantiationOfGenericClassAndStruct.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System -Imports System.[Text] Imports System.Collections.Generic Imports System.Linq +Imports System.[Text] Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaLocalHideAndTypeSubstitutionTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaLocalHideAndTypeSubstitutionTests.vb index db74b257b2d0c..2e1a9bded2797 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaLocalHideAndTypeSubstitutionTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaLocalHideAndTypeSubstitutionTests.vb @@ -2,11 +2,11 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Collections.Immutable +Imports System.Runtime.CompilerServices Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Roslyn.Test.Utilities -Imports System.Collections.Immutable -Imports System.Runtime.CompilerServices Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdEventTest.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdEventTest.vb index b8c8040294fdc..3d0ecdf533d91 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdEventTest.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdEventTest.vb @@ -8,11 +8,10 @@ Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Retargeting -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax - Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Metadata diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdTypeTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdTypeTests.vb index 134fe73177a93..db912cfd073b1 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdTypeTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdTypeTests.vb @@ -5,8 +5,8 @@ Imports CompilationCreationTestHelpers Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/MyBaseMyClassSemanticsTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/MyBaseMyClassSemanticsTests.vb index da5abdc72004f..5ff2bcdcf4a1f 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/MyBaseMyClassSemanticsTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/MyBaseMyClassSemanticsTests.vb @@ -7,10 +7,9 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax - Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/NoPia.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/NoPia.vb index 9d416fc9e17f5..0080a35091bc1 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/NoPia.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/NoPia.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Roslyn.Test.Utilities -Imports System.Xml.Linq Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Retargeting diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetCustomModifiers.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetCustomModifiers.vb index e1c3966fe2aed..6e7e717cf669a 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetCustomModifiers.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetCustomModifiers.vb @@ -3,20 +3,20 @@ ' See the LICENSE file in the project root for more information. Imports System -Imports System.[Text] Imports System.Collections.Generic Imports System.Linq +Imports System.[Text] Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Retargeting -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities -Imports Xunit Imports Roslyn.Test.Utilities.TestMetadata +Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Retargeting diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingCustomAttributes.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingCustomAttributes.vb index 2f90adc55e351..843de7a3b6b04 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingCustomAttributes.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingCustomAttributes.vb @@ -3,16 +3,16 @@ ' See the LICENSE file in the project root for more information. Imports System -Imports System.[Text] Imports System.Collections.Generic Imports System.Linq Imports System.Reflection.Metadata +Imports System.[Text] Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Retargeting -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingTests.vb index b61ce12c60488..1ccaf9e9ae8a5 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingTests.vb @@ -5,8 +5,8 @@ Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Retargeting Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Retargeting Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/BaseClassTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/BaseClassTests.vb index 368c00bc79ace..2f13d57b8fe76 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/BaseClassTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/BaseClassTests.vb @@ -4,8 +4,8 @@ Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.Test.Utilities -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Roslyn.Test.Utilities Imports Roslyn.Test.Utilities.TestMetadata diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/EventTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/EventTests.vb index b2b76a7ce6ef4..385213a7c28e3 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/EventTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/EventTests.vb @@ -12,10 +12,9 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax - Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Metadata Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/GroupClassTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/GroupClassTests.vb index a2accc8ce72e4..93dd6a9dba106 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/GroupClassTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/GroupClassTests.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/PropertyTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/PropertyTests.vb index cdc4facbb34f7..4e2390ab6fee8 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/PropertyTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/PropertyTests.vb @@ -6,8 +6,8 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Emit -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/SyntheticEntryPoint.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/SyntheticEntryPoint.vb index ba8bfbda4e7b8..a2ae1d083f464 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/SyntheticEntryPoint.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/SyntheticEntryPoint.vb @@ -9,9 +9,9 @@ Imports Microsoft.CodeAnalysis.SpecialType Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.OverloadResolution Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/WithStatementSymbolsTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/WithStatementSymbolsTests.vb index 9c5d0fbc9c884..34d9f064e8b7c 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/WithStatementSymbolsTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/WithStatementSymbolsTests.vb @@ -7,10 +7,9 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax - Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Syntax/Syntax/GeneratedTests.vb b/src/Compilers/VisualBasic/Test/Syntax/Syntax/GeneratedTests.vb index 1a089907f6e1b..cafc1ce52a1c7 100644 --- a/src/Compilers/VisualBasic/Test/Syntax/Syntax/GeneratedTests.vb +++ b/src/Compilers/VisualBasic/Test/Syntax/Syntax/GeneratedTests.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax Imports Roslyn.Test.Utilities Imports Xunit diff --git a/src/Compilers/VisualBasic/Test/Syntax/Syntax/SerializationTests.vb b/src/Compilers/VisualBasic/Test/Syntax/Syntax/SerializationTests.vb index e800fafb1a42c..0b8ffa5f46810 100644 --- a/src/Compilers/VisualBasic/Test/Syntax/Syntax/SerializationTests.vb +++ b/src/Compilers/VisualBasic/Test/Syntax/Syntax/SerializationTests.vb @@ -5,9 +5,9 @@ Imports System Imports System.IO Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax Imports Roslyn.Test.Utilities Imports Xunit diff --git a/src/EditorFeatures/CSharpTest/ConvertAnonymousTypeToClass/ConvertAnonymousTypeToClassTests.cs b/src/EditorFeatures/CSharpTest/ConvertAnonymousTypeToClass/ConvertAnonymousTypeToClassTests.cs index 7c92808b2b465..5c1e15701551b 100644 --- a/src/EditorFeatures/CSharpTest/ConvertAnonymousTypeToClass/ConvertAnonymousTypeToClassTests.cs +++ b/src/EditorFeatures/CSharpTest/ConvertAnonymousTypeToClass/ConvertAnonymousTypeToClassTests.cs @@ -4,13 +4,13 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis.CodeRefactorings; +using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.ConvertAnonymousTypeToClass; -using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings; using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeActions; +using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using Microsoft.CodeAnalysis.CSharp; namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ConvertAnonymousTypeToClass { diff --git a/src/EditorFeatures/CSharpTest/Debugging/ProximityExpressionsGetterTests.cs b/src/EditorFeatures/CSharpTest/Debugging/ProximityExpressionsGetterTests.cs index 6865676c9edb9..a6e54e7944911 100644 --- a/src/EditorFeatures/CSharpTest/Debugging/ProximityExpressionsGetterTests.cs +++ b/src/EditorFeatures/CSharpTest/Debugging/ProximityExpressionsGetterTests.cs @@ -10,8 +10,8 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Debugging; +using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs b/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs index 4fa5b89fd2ade..e84d08687f750 100644 --- a/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs +++ b/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs @@ -5,16 +5,16 @@ #nullable disable using System; +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.CSharp.UnitTests; using Microsoft.CodeAnalysis.EditAndContinue; using Microsoft.CodeAnalysis.EditAndContinue.UnitTests; -using Microsoft.VisualStudio.Debugger.Contracts.EditAndContinue; +using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.VisualStudio.Debugger.Contracts.EditAndContinue; using Roslyn.Test.Utilities; using Xunit; -using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.CSharp.UnitTests; -using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.EditAndContinue.UnitTests { diff --git a/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodBase.cs b/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodBase.cs index 141c3d9e58981..a5424734118e4 100644 --- a/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodBase.cs +++ b/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodBase.cs @@ -13,8 +13,8 @@ using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.ExtractMethod; -using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Xunit; diff --git a/src/EditorFeatures/CSharpTest/MakeMemberStatic/MakeMemberStaticTests.cs b/src/EditorFeatures/CSharpTest/MakeMemberStatic/MakeMemberStaticTests.cs index b8e700eafc5fb..0870a0d227454 100644 --- a/src/EditorFeatures/CSharpTest/MakeMemberStatic/MakeMemberStaticTests.cs +++ b/src/EditorFeatures/CSharpTest/MakeMemberStatic/MakeMemberStaticTests.cs @@ -4,9 +4,9 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.MakeMemberStatic; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CodeFixes; +using Microsoft.CodeAnalysis.CSharp.MakeMemberStatic; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Diagnostics; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/EditorFeatures/CSharpTest/PullMemberUp/CSharpPullMemberUpTests.cs b/src/EditorFeatures/CSharpTest/PullMemberUp/CSharpPullMemberUpTests.cs index 836dd583ba8b2..046154af66bbc 100644 --- a/src/EditorFeatures/CSharpTest/PullMemberUp/CSharpPullMemberUpTests.cs +++ b/src/EditorFeatures/CSharpTest/PullMemberUp/CSharpPullMemberUpTests.cs @@ -4,19 +4,19 @@ #nullable disable +using System.Collections.Generic; +using System.Collections.Immutable; using System.Linq; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.CodeActions; using Microsoft.CodeAnalysis.CodeRefactorings; +using Microsoft.CodeAnalysis.CodeRefactorings.PullMemberUp.Dialog; using Microsoft.CodeAnalysis.CSharp.CodeRefactorings.PullMemberUp; using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings; using Microsoft.CodeAnalysis.Test.Utilities; -using Xunit; -using System.Collections.Immutable; -using Microsoft.CodeAnalysis.CodeActions; -using Microsoft.CodeAnalysis.CodeRefactorings.PullMemberUp.Dialog; -using System.Collections.Generic; using Microsoft.CodeAnalysis.Test.Utilities.PullMemberUp; using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.PullMemberUp { diff --git a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindDerivedSymbolsCommandHandler.cs b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindDerivedSymbolsCommandHandler.cs index 6577d0200543a..87458f70502c1 100644 --- a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindDerivedSymbolsCommandHandler.cs +++ b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindDerivedSymbolsCommandHandler.cs @@ -3,15 +3,16 @@ // See the LICENSE file in the project root for more information. using System; -using System.Linq; using System.Collections.Generic; using System.ComponentModel.Composition; +using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Editor.FindUsages; using Microsoft.CodeAnalysis.Editor.Host; using Microsoft.CodeAnalysis.ErrorReporting; using Microsoft.CodeAnalysis.FindSymbols; +using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Internal.Log; using Microsoft.CodeAnalysis.Shared.TestHooks; using Microsoft.VisualStudio.Commanding; @@ -19,7 +20,6 @@ using Microsoft.VisualStudio.Utilities; using Roslyn.Utilities; using VSCommanding = Microsoft.VisualStudio.Commanding; -using Microsoft.CodeAnalysis.Host.Mef; namespace Microsoft.CodeAnalysis.Editor.Implementation.NavigationCommandHandlers { diff --git a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindMemberOverloadsCommandHandler.cs b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindMemberOverloadsCommandHandler.cs index 9f28f81723d43..9c1862bb22998 100644 --- a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindMemberOverloadsCommandHandler.cs +++ b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindMemberOverloadsCommandHandler.cs @@ -3,13 +3,15 @@ // See the LICENSE file in the project root for more information. using System; -using System.Linq; using System.Collections.Generic; using System.ComponentModel.Composition; +using System.Linq; +using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Editor.FindUsages; using Microsoft.CodeAnalysis.Editor.Host; using Microsoft.CodeAnalysis.ErrorReporting; +using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Internal.Log; using Microsoft.CodeAnalysis.Shared.TestHooks; using Microsoft.VisualStudio.Commanding; @@ -17,8 +19,6 @@ using Microsoft.VisualStudio.Utilities; using Roslyn.Utilities; using VSCommanding = Microsoft.VisualStudio.Commanding; -using Microsoft.CodeAnalysis.Host.Mef; -using System.Threading; namespace Microsoft.CodeAnalysis.Editor.Implementation.NavigationCommandHandlers { diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandContentTypeLanguageService.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandContentTypeLanguageService.cs index 92787b1c45c5f..b8129287e141e 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandContentTypeLanguageService.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandContentTypeLanguageService.cs @@ -4,12 +4,12 @@ #nullable disable +using System; using System.Composition; +using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Interactive; -using Microsoft.VisualStudio.Utilities; using Microsoft.VisualStudio.InteractiveWindow.Commands; -using System; -using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.VisualStudio.Utilities; namespace Microsoft.CodeAnalysis.Editor.Implementation.Interactive { diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandHandler.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandHandler.cs index 3205db76bcd48..dba0d30e6c39c 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandHandler.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandHandler.cs @@ -6,17 +6,17 @@ using System; using System.Diagnostics; +using System.Threading; +using Microsoft.CodeAnalysis.Editor.Host; +using Microsoft.VisualStudio.Commanding; using Microsoft.VisualStudio.InteractiveWindow; using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Editor; +using Microsoft.VisualStudio.Text.Editor.Commanding; +using Microsoft.VisualStudio.Text.Editor.Commanding.Commands; using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods; using Microsoft.VisualStudio.Text.Operations; using Microsoft.VisualStudio.Utilities; -using System.Threading; -using Microsoft.CodeAnalysis.Editor.Host; -using Microsoft.VisualStudio.Text.Editor.Commanding.Commands; -using Microsoft.VisualStudio.Commanding; -using Microsoft.VisualStudio.Text.Editor.Commanding; namespace Microsoft.CodeAnalysis.Editor.Interactive { diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveSupportsFeatureService.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveSupportsFeatureService.cs index 78aaa3c847bbb..f17fc08a47d57 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveSupportsFeatureService.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveSupportsFeatureService.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using System.Composition; using Microsoft.CodeAnalysis.Editor.Shared; using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.VisualStudio.Text; -using Microsoft.VisualStudio.InteractiveWindow; using Microsoft.CodeAnalysis.Shared; -using System; +using Microsoft.VisualStudio.InteractiveWindow; +using Microsoft.VisualStudio.Text; namespace Microsoft.CodeAnalysis.Editor.Implementation.Interactive { diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowResetCommand.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowResetCommand.cs index 1424d5018481b..846b936f26845 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowResetCommand.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowResetCommand.cs @@ -5,11 +5,11 @@ #nullable disable extern alias InteractiveHost; - using System; using System.Collections.Generic; using System.ComponentModel.Composition; using System.Threading.Tasks; +using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Editor.Interactive; using Microsoft.VisualStudio.InteractiveWindow; @@ -18,7 +18,6 @@ using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Classification; using Microsoft.VisualStudio.Utilities; -using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Editor.Interactive diff --git a/src/EditorFeatures/Core.Wpf/Interactive/ResetInteractive.cs b/src/EditorFeatures/Core.Wpf/Interactive/ResetInteractive.cs index bb49cea83a519..cd716b8930254 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/ResetInteractive.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/ResetInteractive.cs @@ -5,21 +5,20 @@ #nullable disable extern alias InteractiveHost; - using System; +using System.Collections.Generic; +using System.Collections.Immutable; using System.Linq; using System.Threading.Tasks; -using Roslyn.Utilities; +using InteractiveHost::Microsoft.CodeAnalysis.Interactive; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Host; using Microsoft.CodeAnalysis.Editor.Interactive; using Microsoft.VisualStudio.InteractiveWindow; -using System.Collections.Immutable; -using Microsoft.CodeAnalysis.Editor; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods; -using System.Collections.Generic; -using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Microsoft.VisualStudio.Utilities; +using Roslyn.Utilities; namespace Microsoft.VisualStudio.LanguageServices.Interactive { diff --git a/src/EditorFeatures/Core.Wpf/Preview/PreviewReferenceHighlightingTaggerProvider.cs b/src/EditorFeatures/Core.Wpf/Preview/PreviewReferenceHighlightingTaggerProvider.cs index 6a93f1407d211..c89669d7af469 100644 --- a/src/EditorFeatures/Core.Wpf/Preview/PreviewReferenceHighlightingTaggerProvider.cs +++ b/src/EditorFeatures/Core.Wpf/Preview/PreviewReferenceHighlightingTaggerProvider.cs @@ -4,15 +4,15 @@ #nullable disable +using System; using System.ComponentModel.Composition; +using Microsoft.CodeAnalysis.Editor.ReferenceHighlighting; using Microsoft.CodeAnalysis.Editor.Shared.Preview; using Microsoft.CodeAnalysis.Editor.Shared.Tagging; +using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Text.Tagging; using Microsoft.VisualStudio.Utilities; -using Microsoft.CodeAnalysis.Editor.ReferenceHighlighting; -using System; -using Microsoft.CodeAnalysis.Host.Mef; namespace Microsoft.CodeAnalysis.Editor.Implementation.Preview { diff --git a/src/EditorFeatures/Core.Wpf/Preview/PreviewWarningViewTaggerProvider.cs b/src/EditorFeatures/Core.Wpf/Preview/PreviewWarningViewTaggerProvider.cs index 4305338b3112e..d7229062a897d 100644 --- a/src/EditorFeatures/Core.Wpf/Preview/PreviewWarningViewTaggerProvider.cs +++ b/src/EditorFeatures/Core.Wpf/Preview/PreviewWarningViewTaggerProvider.cs @@ -4,15 +4,15 @@ #nullable disable +using System; using System.ComponentModel.Composition; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; using Microsoft.CodeAnalysis.Editor.Shared.Preview; using Microsoft.CodeAnalysis.Editor.Shared.Tagging; +using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Text.Tagging; using Microsoft.VisualStudio.Utilities; -using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; -using System; -using Microsoft.CodeAnalysis.Host.Mef; namespace Microsoft.CodeAnalysis.Editor.Implementation.Preview { diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/Api/IVSTypeScriptFormattingInteractionService.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/Api/IVSTypeScriptFormattingInteractionService.cs index bdcff8b3229bc..8b6f154e38c29 100644 --- a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/Api/IVSTypeScriptFormattingInteractionService.cs +++ b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/Api/IVSTypeScriptFormattingInteractionService.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptEditorInlineRenameService.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptEditorInlineRenameService.cs index cf14751ed5a01..838a6d138cf42 100644 --- a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptEditorInlineRenameService.cs +++ b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptEditorInlineRenameService.cs @@ -4,14 +4,14 @@ #nullable disable +using System; +using System.Composition; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Editor; -using Roslyn.Utilities; -using System.Composition; -using Microsoft.CodeAnalysis.Host.Mef; -using System; using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api; +using Microsoft.CodeAnalysis.Host.Mef; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript { diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFormattingInteractionService.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFormattingInteractionService.cs index d4b2ab1481110..3a7eb26a88dd7 100644 --- a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFormattingInteractionService.cs +++ b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFormattingInteractionService.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -7,8 +7,8 @@ using System.Composition; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Formatting; using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api; +using Microsoft.CodeAnalysis.Formatting; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Shared.Utilities; diff --git a/src/EditorFeatures/Core/Implementation/Interactive/ISendToInteractiveSubmissionProvider.cs b/src/EditorFeatures/Core/Implementation/Interactive/ISendToInteractiveSubmissionProvider.cs index 0d525e4553186..4e6acac78ec34 100644 --- a/src/EditorFeatures/Core/Implementation/Interactive/ISendToInteractiveSubmissionProvider.cs +++ b/src/EditorFeatures/Core/Implementation/Interactive/ISendToInteractiveSubmissionProvider.cs @@ -4,9 +4,9 @@ #nullable disable +using System.Threading; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Text.Editor.Commanding; -using System.Threading; namespace Microsoft.CodeAnalysis.Editor.Interactive { diff --git a/src/EditorFeatures/Core/Implementation/Interactive/SendToInteractiveSubmissionProvider.cs b/src/EditorFeatures/Core/Implementation/Interactive/SendToInteractiveSubmissionProvider.cs index 22512e24dfec3..1b3df3d0c1546 100644 --- a/src/EditorFeatures/Core/Implementation/Interactive/SendToInteractiveSubmissionProvider.cs +++ b/src/EditorFeatures/Core/Implementation/Interactive/SendToInteractiveSubmissionProvider.cs @@ -4,17 +4,17 @@ #nullable disable -using Microsoft.CodeAnalysis.Editor.Shared.Extensions; -using Microsoft.CodeAnalysis.Text; -using Microsoft.VisualStudio.Text; using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Roslyn.Utilities; +using Microsoft.CodeAnalysis.Editor.Shared.Extensions; +using Microsoft.CodeAnalysis.Text; +using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Editor; -using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods; using Microsoft.VisualStudio.Text.Editor.Commanding; +using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Editor.Interactive { diff --git a/src/EditorFeatures/Core/Undo/EditorSourceTextUndoService.cs b/src/EditorFeatures/Core/Undo/EditorSourceTextUndoService.cs index 5cac788aec015..dc7cb7b52845d 100644 --- a/src/EditorFeatures/Core/Undo/EditorSourceTextUndoService.cs +++ b/src/EditorFeatures/Core/Undo/EditorSourceTextUndoService.cs @@ -4,14 +4,14 @@ #nullable disable +using System; using System.Collections.Generic; using System.Composition; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Text; -using Microsoft.VisualStudio.Text.Operations; using Microsoft.VisualStudio.Text; -using System; +using Microsoft.VisualStudio.Text.Operations; namespace Microsoft.CodeAnalysis.Editor.Undo { diff --git a/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/VisualBasicCodeRefactoringVerifier`1+Test.cs b/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/VisualBasicCodeRefactoringVerifier`1+Test.cs index 0a20d8d15b116..edb74a6f31199 100644 --- a/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/VisualBasicCodeRefactoringVerifier`1+Test.cs +++ b/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/VisualBasicCodeRefactoringVerifier`1+Test.cs @@ -3,10 +3,10 @@ // See the LICENSE file in the project root for more information. using System.Net; +using Microsoft.CodeAnalysis.CodeRefactorings; +using Microsoft.CodeAnalysis.Testing.Verifiers; using Microsoft.CodeAnalysis.VisualBasic; using Microsoft.CodeAnalysis.VisualBasic.Testing; -using Microsoft.CodeAnalysis.Testing.Verifiers; -using Microsoft.CodeAnalysis.CodeRefactorings; #if !CODE_STYLE using System; diff --git a/src/EditorFeatures/DiagnosticsTestUtilities/Diagnostics/AbstractUserDiagnosticTest.cs b/src/EditorFeatures/DiagnosticsTestUtilities/Diagnostics/AbstractUserDiagnosticTest.cs index e658351e39cc3..cf7b84da5ba2e 100644 --- a/src/EditorFeatures/DiagnosticsTestUtilities/Diagnostics/AbstractUserDiagnosticTest.cs +++ b/src/EditorFeatures/DiagnosticsTestUtilities/Diagnostics/AbstractUserDiagnosticTest.cs @@ -13,8 +13,10 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis.CodeActions; using Microsoft.CodeAnalysis.CodeFixes; +using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; +using Microsoft.CodeAnalysis.Remote.Testing; using Microsoft.CodeAnalysis.Shared.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; @@ -22,8 +24,6 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.CodeAnalysis.Remote.Testing; using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics diff --git a/src/EditorFeatures/Test/CodeFixes/ErrorCases/CodeFixExceptionInRegisterMethodAsync.cs b/src/EditorFeatures/Test/CodeFixes/ErrorCases/CodeFixExceptionInRegisterMethodAsync.cs index 49ef3ad5c11eb..ed86db1fcd4db 100644 --- a/src/EditorFeatures/Test/CodeFixes/ErrorCases/CodeFixExceptionInRegisterMethodAsync.cs +++ b/src/EditorFeatures/Test/CodeFixes/ErrorCases/CodeFixExceptionInRegisterMethodAsync.cs @@ -5,8 +5,8 @@ #nullable disable using System; -using System.Composition; using System.Collections.Immutable; +using System.Composition; using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CodeFixes; diff --git a/src/EditorFeatures/Test/EditAndContinue/EditSessionActiveStatementsTests.cs b/src/EditorFeatures/Test/EditAndContinue/EditSessionActiveStatementsTests.cs index 9970ad51071df..ff03d0e97c76c 100644 --- a/src/EditorFeatures/Test/EditAndContinue/EditSessionActiveStatementsTests.cs +++ b/src/EditorFeatures/Test/EditAndContinue/EditSessionActiveStatementsTests.cs @@ -7,7 +7,9 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.IO; using System.Linq; +using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CSharp.EditAndContinue; @@ -16,13 +18,11 @@ using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; +using Microsoft.VisualStudio.Debugger.Contracts.EditAndContinue; using Moq; using Roslyn.Test.Utilities; using Roslyn.Utilities; -using Microsoft.VisualStudio.Debugger.Contracts.EditAndContinue; using Xunit; -using System.Text; -using System.IO; namespace Microsoft.CodeAnalysis.EditAndContinue.UnitTests { diff --git a/src/EditorFeatures/Test/ValueTracking/AbstractBaseValueTrackingTests.cs b/src/EditorFeatures/Test/ValueTracking/AbstractBaseValueTrackingTests.cs index 549ff737d21ef..9bea36c6631a3 100644 --- a/src/EditorFeatures/Test/ValueTracking/AbstractBaseValueTrackingTests.cs +++ b/src/EditorFeatures/Test/ValueTracking/AbstractBaseValueTrackingTests.cs @@ -2,18 +2,18 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Linq; +using System.Collections.Generic; using System.Collections.Immutable; +using System.Linq; +using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.ValueTracking; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Remote.Testing; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Test.Utilities; -using System.Threading; using Microsoft.CodeAnalysis.Text; +using Microsoft.CodeAnalysis.ValueTracking; using Xunit; -using System.Collections.Generic; namespace Microsoft.CodeAnalysis.Editor.UnitTests.ValueTracking { diff --git a/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb b/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb index 194417e33c655..5d34966b9f7c5 100644 --- a/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb +++ b/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Remote.Testing -Imports Microsoft.CodeAnalysis.Editor.FindUsages Imports System.Threading +Imports Microsoft.CodeAnalysis.Editor.FindUsages +Imports Microsoft.CodeAnalysis.Remote.Testing Namespace Microsoft.CodeAnalysis.Editor.UnitTests.GoToImplementation <[UseExportProvider]> diff --git a/src/EditorFeatures/Test2/Rename/CSharp/AliasTests.vb b/src/EditorFeatures/Test2/Rename/CSharp/AliasTests.vb index 3ea6cffbcd53d..9f7c3be2843ba 100644 --- a/src/EditorFeatures/Test2/Rename/CSharp/AliasTests.vb +++ b/src/EditorFeatures/Test2/Rename/CSharp/AliasTests.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Rename.ConflictEngine Imports Microsoft.CodeAnalysis.Remote.Testing +Imports Microsoft.CodeAnalysis.Rename.ConflictEngine Imports Xunit.Abstractions Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename.CSharp diff --git a/src/EditorFeatures/TestUtilities/Completion/AbstractArgumentProviderTests`1.cs b/src/EditorFeatures/TestUtilities/Completion/AbstractArgumentProviderTests`1.cs index e57bde7378c16..31572163bb980 100644 --- a/src/EditorFeatures/TestUtilities/Completion/AbstractArgumentProviderTests`1.cs +++ b/src/EditorFeatures/TestUtilities/Completion/AbstractArgumentProviderTests`1.cs @@ -10,11 +10,11 @@ using Microsoft.CodeAnalysis.Editor.UnitTests; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Options; +using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.VisualStudio.Composition; using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using Microsoft.CodeAnalysis.Shared.Extensions; namespace Microsoft.CodeAnalysis.Test.Utilities.Completion { diff --git a/src/EditorFeatures/TestUtilities/Diagnostics/TestDiagnosticAnalyzerDriver.cs b/src/EditorFeatures/TestUtilities/Diagnostics/TestDiagnosticAnalyzerDriver.cs index af046dee23461..d1d9c6a8692eb 100644 --- a/src/EditorFeatures/TestUtilities/Diagnostics/TestDiagnosticAnalyzerDriver.cs +++ b/src/EditorFeatures/TestUtilities/Diagnostics/TestDiagnosticAnalyzerDriver.cs @@ -11,10 +11,10 @@ using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics; using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Remote; using Microsoft.CodeAnalysis.Serialization; +using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; using Xunit; diff --git a/src/EditorFeatures/TestUtilities/EditAndContinue/ActiveStatementTestHelpers.cs b/src/EditorFeatures/TestUtilities/EditAndContinue/ActiveStatementTestHelpers.cs index 0f99facf7e053..b974ef3f307f1 100644 --- a/src/EditorFeatures/TestUtilities/EditAndContinue/ActiveStatementTestHelpers.cs +++ b/src/EditorFeatures/TestUtilities/EditAndContinue/ActiveStatementTestHelpers.cs @@ -6,10 +6,10 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; +using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Text; -using Roslyn.Utilities; using Microsoft.VisualStudio.Debugger.Contracts.EditAndContinue; -using Microsoft.CodeAnalysis.CSharp; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.EditAndContinue.UnitTests { diff --git a/src/EditorFeatures/TestUtilities/TextEditorFactoryExtensions.cs b/src/EditorFeatures/TestUtilities/TextEditorFactoryExtensions.cs index 910d8bda58004..93722e9ab0a47 100644 --- a/src/EditorFeatures/TestUtilities/TextEditorFactoryExtensions.cs +++ b/src/EditorFeatures/TestUtilities/TextEditorFactoryExtensions.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.VisualStudio.Text; -using Microsoft.VisualStudio.Text.Editor; using System; using System.Collections.Immutable; +using Microsoft.VisualStudio.Text; +using Microsoft.VisualStudio.Text.Editor; namespace Microsoft.CodeAnalysis.Editor.UnitTests { diff --git a/src/EditorFeatures/TestUtilities2/Intellisense/TestStateFactory.vb b/src/EditorFeatures/TestUtilities2/Intellisense/TestStateFactory.vb index 4d4608f0b69be..6199268ffad1b 100644 --- a/src/EditorFeatures/TestUtilities2/Intellisense/TestStateFactory.vb +++ b/src/EditorFeatures/TestUtilities2/Intellisense/TestStateFactory.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.CSharp Imports Microsoft.CodeAnalysis.Completion +Imports Microsoft.CodeAnalysis.CSharp Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense Friend Class TestStateFactory diff --git a/src/EditorFeatures/VisualBasic/DocumentationComments/DocumentationCommentCommandHandler.vb b/src/EditorFeatures/VisualBasic/DocumentationComments/DocumentationCommentCommandHandler.vb index 09b229ab96a33..ac160e94fac26 100644 --- a/src/EditorFeatures/VisualBasic/DocumentationComments/DocumentationCommentCommandHandler.vb +++ b/src/EditorFeatures/VisualBasic/DocumentationComments/DocumentationCommentCommandHandler.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System.ComponentModel.Composition -Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.CodeAnalysis.Editor.Host Imports Microsoft.CodeAnalysis.Editor.Implementation.DocumentationComments +Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.VisualStudio.Commanding Imports Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion Imports Microsoft.VisualStudio.Text.Operations diff --git a/src/EditorFeatures/VisualBasicTest/AddFileBanner/AddFileBannerTests.vb b/src/EditorFeatures/VisualBasicTest/AddFileBanner/AddFileBannerTests.vb index 34e51555d5cce..8645e47f4de84 100644 --- a/src/EditorFeatures/VisualBasicTest/AddFileBanner/AddFileBannerTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AddFileBanner/AddFileBannerTests.vb @@ -4,8 +4,8 @@ Imports System.Threading.Tasks Imports Microsoft.CodeAnalysis.CodeRefactorings -Imports Microsoft.CodeAnalysis.VisualBasic.AddFileBanner Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings +Imports Microsoft.CodeAnalysis.VisualBasic.AddFileBanner Imports Roslyn.Test.Utilities Imports Xunit diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb index 5777d8043472d..917049216134f 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Xml.Linq +Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService +Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion -Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion Public Class AutomaticBraceCompletionTests diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb index 13728b565e302..de177e314dc98 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Xml.Linq +Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService +Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion -Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion Public Class AutomaticBracketCompletionTests diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb index 75838e25a0686..14d30f83deea2 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Xml.Linq +Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService +Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion -Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion Public Class AutomaticInterpolatedStringExpressionCompletionTests diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb index 7da7aa798f945..db4146e75bdba 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Xml.Linq +Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService +Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion -Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion Public Class AutomaticInterpolationCompletionTests diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb index ff04188c4773d..0b836d38199fd 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Xml.Linq +Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService +Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion -Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion Public Class AutomaticLessAndGreaterThanCompletionTests diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb index 2e1c6957a158e..1764c2368fa09 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Xml.Linq +Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService +Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion -Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion Public Class AutomaticParenthesesCompletionTests diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb index e253c26cc6545..d799326d0d19a 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Xml.Linq +Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService +Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion -Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion Public Class AutomaticStringLiteralCompletionTests diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/AbstractVisualBasicDiagnosticProviderBasedUserDiagnosticTest.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/AbstractVisualBasicDiagnosticProviderBasedUserDiagnosticTest.vb index b87ec47eb3680..d7c91efc5ad3f 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/AbstractVisualBasicDiagnosticProviderBasedUserDiagnosticTest.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/AbstractVisualBasicDiagnosticProviderBasedUserDiagnosticTest.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces -Imports Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics Imports Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions +Imports Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics +Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces Imports Xunit.Abstractions Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEndConstruct/GenerateEndConstructTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEndConstruct/GenerateEndConstructTests.vb index 24f91fe56b440..18a9d2aee22ee 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEndConstruct/GenerateEndConstructTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEndConstruct/GenerateEndConstructTests.vb @@ -3,8 +3,8 @@ ' See the LICENSE file in the project root for more information. Imports Microsoft.CodeAnalysis.CodeFixes -Imports Microsoft.CodeAnalysis.VisualBasic.CodeFixes.GenerateEndConstruct Imports Microsoft.CodeAnalysis.Diagnostics +Imports Microsoft.CodeAnalysis.VisualBasic.CodeFixes.GenerateEndConstruct Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.GenerateEndConstruct Public Class GenerateEndConstructTests diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEnumMember/GenerateEnumMemberTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEnumMember/GenerateEnumMemberTests.vb index 45bdad8d11564..edffcd1d54af1 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEnumMember/GenerateEnumMemberTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEnumMember/GenerateEnumMemberTests.vb @@ -3,8 +3,8 @@ ' See the LICENSE file in the project root for more information. Imports Microsoft.CodeAnalysis.CodeFixes -Imports Microsoft.CodeAnalysis.VisualBasic.CodeFixes.GenerateEnumMember Imports Microsoft.CodeAnalysis.Diagnostics +Imports Microsoft.CodeAnalysis.VisualBasic.CodeFixes.GenerateEnumMember Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.GenerateEnumMember Public Class GenerateEnumMemberTests diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEvent/GenerateEventTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEvent/GenerateEventTests.vb index 4d2d29c791736..61622087cbbd1 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEvent/GenerateEventTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEvent/GenerateEventTests.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.CodeFixes.GenerateEvent Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions +Imports Microsoft.CodeAnalysis.VisualBasic.CodeFixes.GenerateEvent Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.GenerateEvent Public Class GenerateEventTests diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateMethod/GenerateMethodTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateMethod/GenerateMethodTests.vb index eea20a4c03ae9..c9fc119993514 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateMethod/GenerateMethodTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateMethod/GenerateMethodTests.vb @@ -3,8 +3,8 @@ ' See the LICENSE file in the project root for more information. Imports Microsoft.CodeAnalysis.CodeFixes -Imports Microsoft.CodeAnalysis.VisualBasic.CodeFixes.GenerateMethod Imports Microsoft.CodeAnalysis.Diagnostics +Imports Microsoft.CodeAnalysis.VisualBasic.CodeFixes.GenerateMethod Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.GenerateMethod Public Class GenerateMethodTests diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/Spellcheck/SpellcheckTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/Spellcheck/SpellcheckTests.vb index 8e234fee4c445..21ca3c79a3345 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/Spellcheck/SpellcheckTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/Spellcheck/SpellcheckTests.vb @@ -7,8 +7,8 @@ Imports Microsoft.CodeAnalysis.CodeActions Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions -Imports Microsoft.CodeAnalysis.VisualBasic.SpellCheck Imports Microsoft.CodeAnalysis.VisualBasic.Diagnostics +Imports Microsoft.CodeAnalysis.VisualBasic.SpellCheck Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.Spellcheck Public Class SpellCheckTests diff --git a/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/VisualBasicEditAndContinueTestHelpers.vb b/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/VisualBasicEditAndContinueTestHelpers.vb index 648d8e1319522..4d99eb8e86a48 100644 --- a/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/VisualBasicEditAndContinueTestHelpers.vb +++ b/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/VisualBasicEditAndContinueTestHelpers.vb @@ -3,12 +3,12 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports Microsoft.CodeAnalysis.VisualBasic.EditAndContinue -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.Differencing Imports Microsoft.CodeAnalysis.EditAndContinue Imports Microsoft.CodeAnalysis.EditAndContinue.UnitTests Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.Differencing +Imports Microsoft.CodeAnalysis.VisualBasic.EditAndContinue +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.EditAndContinue diff --git a/src/EditorFeatures/VisualBasicTest/Extensions/StatementSyntaxExtensionTests.vb b/src/EditorFeatures/VisualBasicTest/Extensions/StatementSyntaxExtensionTests.vb index f708962fced45..d551d36f40a73 100644 --- a/src/EditorFeatures/VisualBasicTest/Extensions/StatementSyntaxExtensionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Extensions/StatementSyntaxExtensionTests.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Threading Imports Microsoft.CodeAnalysis.VisualBasic.Extensions Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.ContextQuery -Imports System.Threading +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Extensions Public Class StatementSyntaxExtensionTests diff --git a/src/EditorFeatures/VisualBasicTest/IntroduceUsingStatement/IntroduceUsingStatementTests.vb b/src/EditorFeatures/VisualBasicTest/IntroduceUsingStatement/IntroduceUsingStatementTests.vb index cc3e59bc32017..1a035900381d3 100644 --- a/src/EditorFeatures/VisualBasicTest/IntroduceUsingStatement/IntroduceUsingStatementTests.vb +++ b/src/EditorFeatures/VisualBasicTest/IntroduceUsingStatement/IntroduceUsingStatementTests.vb @@ -3,8 +3,8 @@ ' See the LICENSE file in the project root for more information. Imports Microsoft.CodeAnalysis.CodeRefactorings -Imports Microsoft.CodeAnalysis.VisualBasic.IntroduceUsingStatement Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings +Imports Microsoft.CodeAnalysis.VisualBasic.IntroduceUsingStatement Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.IntroduceUsingStatement diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Binders/WithTypeArgumentsBinder.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Binders/WithTypeArgumentsBinder.cs index b81bf38e5353d..d540791c46a8f 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Binders/WithTypeArgumentsBinder.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Binders/WithTypeArgumentsBinder.cs @@ -4,12 +4,12 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Roslyn.Utilities; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpFrameDecoder.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpFrameDecoder.cs index 1a5d85860f086..facdafc3241d2 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpFrameDecoder.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpFrameDecoder.cs @@ -4,9 +4,9 @@ using System; using System.Diagnostics; -using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.ExpressionEvaluator; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpLanguageInstructionDecoder.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpLanguageInstructionDecoder.cs index e6642ecd7a9f6..fd725ab360b54 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpLanguageInstructionDecoder.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpLanguageInstructionDecoder.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.ExpressionEvaluator; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CompilationContext.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CompilationContext.cs index d3dab807d90fe..93ade15965527 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CompilationContext.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CompilationContext.cs @@ -2,6 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; +using System.Collections.Generic; +using System.Collections.Immutable; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using System.Threading; using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; @@ -13,13 +20,6 @@ using Microsoft.VisualStudio.Debugger.Clr; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using Roslyn.Utilities; -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Threading; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/EEAssemblyBuilder.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/EEAssemblyBuilder.cs index d7fe8de53c29e..fce99f09822bd 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/EEAssemblyBuilder.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/EEAssemblyBuilder.cs @@ -2,6 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; +using System.Collections.Immutable; +using System.Diagnostics; +using System.Reflection.Metadata; using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.CSharp.Symbols; @@ -11,10 +15,6 @@ using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Symbols; using Roslyn.Utilities; -using System; -using System.Collections.Immutable; -using System.Diagnostics; -using System.Reflection.Metadata; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/CapturedVariableRewriter.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/CapturedVariableRewriter.cs index 137fb1b98f63c..5cfb54e768d12 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/CapturedVariableRewriter.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/CapturedVariableRewriter.cs @@ -4,12 +4,12 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Roslyn.Utilities; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/LocalDeclarationRewriter.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/LocalDeclarationRewriter.cs index eac363440360d..831eba27acefe 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/LocalDeclarationRewriter.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/LocalDeclarationRewriter.cs @@ -4,12 +4,12 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.ExpressionEvaluator; -using Microsoft.CodeAnalysis.PooledObjects; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.ExpressionEvaluator; +using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/PlaceholderLocalRewriter.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/PlaceholderLocalRewriter.cs index 1eae863ab14fb..0a8275fa6912a 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/PlaceholderLocalRewriter.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/PlaceholderLocalRewriter.cs @@ -4,9 +4,9 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; using System.Collections.Generic; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Symbols; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassInstance.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassInstance.cs index 55d2dd1783de4..680bd30c944b9 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassInstance.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassInstance.cs @@ -4,9 +4,9 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; using System; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassVariable.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassVariable.cs index ac9473880375d..55aae23a9ba55 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassVariable.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassVariable.cs @@ -4,11 +4,11 @@ #nullable disable +using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; -using System.Collections.Immutable; -using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/EEDisplayClassFieldLocalSymbol.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/EEDisplayClassFieldLocalSymbol.cs index b83a057c4bc1d..407e3782f9912 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/EEDisplayClassFieldLocalSymbol.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/EEDisplayClassFieldLocalSymbol.cs @@ -4,9 +4,9 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; using System.Collections.Immutable; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ObjectIdLocalSymbol.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ObjectIdLocalSymbol.cs index 8e6c6d346ac2a..c89c2345e09d8 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ObjectIdLocalSymbol.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ObjectIdLocalSymbol.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.ExpressionEvaluator; using System.Collections.Immutable; using System.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.ExpressionEvaluator; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ReturnValueLocalSymbol.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ReturnValueLocalSymbol.cs index 9114143677872..a86d3216eba61 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ReturnValueLocalSymbol.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ReturnValueLocalSymbol.cs @@ -4,9 +4,9 @@ #nullable disable +using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.ExpressionEvaluator; -using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.cs index de45ef9551757..16d259d843a53 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Roslyn.Utilities; using System; using System.Collections.Immutable; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/SyntaxHelpers.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/SyntaxHelpers.cs index c67ee1d1d5839..fa71fda52d7f3 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/SyntaxHelpers.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/SyntaxHelpers.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis.Text; using System.Collections.ObjectModel; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.Text; using InternalSyntax = Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/AccessibilityTests.cs b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/AccessibilityTests.cs index 126c3bfeeff1a..264a3e311c656 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/AccessibilityTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/AccessibilityTests.cs @@ -4,15 +4,15 @@ #nullable disable +using System; using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.ExpressionEvaluator; +using Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; -using System; -using Xunit; using Roslyn.Test.Utilities; -using Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.UnitTests { diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/ExpressionCompilerTests.cs b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/ExpressionCompilerTests.cs index 4276cb3848c78..bea1828c90eb3 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/ExpressionCompilerTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/ExpressionCompilerTests.cs @@ -22,9 +22,9 @@ using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using Roslyn.Test.PdbUtilities; -using static Roslyn.Test.Utilities.SigningTestHelpers; using Roslyn.Test.Utilities; using Xunit; +using static Roslyn.Test.Utilities.SigningTestHelpers; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.UnitTests { diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/InstructionDecoderTests.cs b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/InstructionDecoderTests.cs index 643aac2ec98bd..5fa1c84a3d334 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/InstructionDecoderTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/InstructionDecoderTests.cs @@ -10,8 +10,8 @@ using System.Reflection.Metadata.Ecma335; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; -using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.VisualStudio.Debugger.Evaluation; using Roslyn.Test.Utilities; diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/AccessibilityTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/AccessibilityTests.cs index 4b69096e9e784..911f69f4e833b 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/AccessibilityTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/AccessibilityTests.cs @@ -4,6 +4,7 @@ #nullable disable +using System; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.CodeAnalysis.Test.Utilities; @@ -11,7 +12,6 @@ using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using Roslyn.Test.Utilities; -using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTestBase.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTestBase.cs index a7a748440564e..af13766b4a7ca 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTestBase.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTestBase.cs @@ -7,8 +7,8 @@ using System; using System.Collections.Immutable; using System.Reflection; -using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.VisualStudio.Debugger.ComponentInterfaces; using Microsoft.VisualStudio.Debugger.Evaluation; diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DebuggerTypeProxyAttributeTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DebuggerTypeProxyAttributeTests.cs index 12b3f07b5713e..7ad17bd675dc2 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DebuggerTypeProxyAttributeTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DebuggerTypeProxyAttributeTests.cs @@ -4,11 +4,11 @@ #nullable disable +using System; +using System.Linq; using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; -using System; -using System.Linq; using Roslyn.Test.Utilities; using Xunit; diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DynamicViewTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DynamicViewTests.cs index af01b1d78c3a7..e52b5c90d26a8 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DynamicViewTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DynamicViewTests.cs @@ -11,8 +11,8 @@ using Microsoft.VisualStudio.Debugger.Clr; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; -using Xunit; using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.UnitTests { diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FullNameTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FullNameTests.cs index 79d4af226b5d8..801be1e758756 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FullNameTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FullNameTests.cs @@ -9,8 +9,8 @@ using System.Linq; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.ExpressionEvaluator; -using Microsoft.VisualStudio.Debugger.ComponentInterfaces; using Microsoft.VisualStudio.Debugger.Clr; +using Microsoft.VisualStudio.Debugger.ComponentInterfaces; using Microsoft.VisualStudio.Debugger.Evaluation; using Roslyn.Test.Utilities; using Xunit; diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FunctionPointerTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FunctionPointerTests.cs index 3ea3c36009af4..f0112689c4eba 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FunctionPointerTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FunctionPointerTests.cs @@ -4,13 +4,13 @@ #nullable disable +using System; +using System.Diagnostics; using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.VisualStudio.Debugger.Clr; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using Microsoft.VisualStudio.Debugger.Metadata; -using System; -using System.Diagnostics; using Xunit; using Type = Microsoft.VisualStudio.Debugger.Metadata.Type; diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/ObjectIdTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/ObjectIdTests.cs index d807d8f45a3e8..cd965ca4f6c45 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/ObjectIdTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/ObjectIdTests.cs @@ -4,11 +4,11 @@ #nullable disable +using System; using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.VisualStudio.Debugger.Clr; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; -using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TupleTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TupleTests.cs index aef5039d02181..0435132b9c849 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TupleTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TupleTests.cs @@ -4,6 +4,9 @@ #nullable disable +using System; +using System.Collections.Immutable; +using System.Collections.ObjectModel; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.CodeAnalysis.Test.Utilities; @@ -11,9 +14,6 @@ using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using Roslyn.Test.Utilities; -using System; -using System.Collections.Immutable; -using System.Collections.ObjectModel; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TypeVariablesExpansionTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TypeVariablesExpansionTests.cs index aa5f792454780..d35aa436a99b7 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TypeVariablesExpansionTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TypeVariablesExpansionTests.cs @@ -4,10 +4,10 @@ #nullable disable +using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.VisualStudio.Debugger.Evaluation; -using System.Collections.Immutable; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/AssemblyReference.cs b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/AssemblyReference.cs index e71161d7191c7..fb1acef72006a 100644 --- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/AssemblyReference.cs +++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/AssemblyReference.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; +using System.Collections.Generic; using Microsoft.Cci; using Microsoft.CodeAnalysis.Emit; using Roslyn.Utilities; -using System; -using System.Collections.Generic; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/CustomTypeInfo.cs b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/CustomTypeInfo.cs index 3b17f46f02499..1bb4c6afa0434 100644 --- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/CustomTypeInfo.cs +++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/CustomTypeInfo.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using System; using System.Collections.ObjectModel; using System.Diagnostics; using System.Text; +using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/LocalAndMethod.cs b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/LocalAndMethod.cs index 33fc314adcc1c..96e18f76705bf 100644 --- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/LocalAndMethod.cs +++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/LocalAndMethod.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using System; using System.Collections.ObjectModel; +using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/PseudoVariableUtilities.cs b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/PseudoVariableUtilities.cs index f4527d25bd048..264923f3291ca 100644 --- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/PseudoVariableUtilities.cs +++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/PseudoVariableUtilities.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.VisualStudio.Debugger.Clr; -using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; -using Roslyn.Utilities; using System; using System.Collections.ObjectModel; using System.Diagnostics; using System.Globalization; +using Microsoft.VisualStudio.Debugger.Clr; +using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/MemberSignatureParser.cs b/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/MemberSignatureParser.cs index a5645d2b961a1..25755517127dc 100644 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/MemberSignatureParser.cs +++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/MemberSignatureParser.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.CodeAnalysis.ExpressionEvaluator; using System; using System.Collections.Immutable; using System.Diagnostics; +using Microsoft.CodeAnalysis.ExpressionEvaluator; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/Scanner.cs b/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/Scanner.cs index 77295f3bc2bad..78fe9af4e1f00 100644 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/Scanner.cs +++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/Scanner.cs @@ -4,9 +4,9 @@ #nullable disable -using Roslyn.Utilities; using System; using System.Diagnostics; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/FunctionResolverBase.cs b/src/ExpressionEvaluator/Core/Source/FunctionResolver/FunctionResolverBase.cs index 33f63123f98bd..a372beaadbcb2 100644 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/FunctionResolverBase.cs +++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/FunctionResolverBase.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.VisualStudio.Debugger.Evaluation; using System; using System.Collections.Generic; using System.Reflection.Metadata; +using Microsoft.VisualStudio.Debugger.Evaluation; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/MetadataResolver.cs b/src/ExpressionEvaluator/Core/Source/FunctionResolver/MetadataResolver.cs index 130d03f523eec..1cae1951f912b 100644 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/MetadataResolver.cs +++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/MetadataResolver.cs @@ -4,7 +4,6 @@ #nullable disable -using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.Diagnostics; @@ -12,6 +11,7 @@ using System.Reflection; using System.Reflection.Metadata; using System.Reflection.Metadata.Ecma335; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/MemberSignatureParser.cs b/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/MemberSignatureParser.cs index 63535822dc1c0..524b9dc6401ed 100644 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/MemberSignatureParser.cs +++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/MemberSignatureParser.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.CodeAnalysis.ExpressionEvaluator; using System; using System.Collections.Immutable; using System.Diagnostics; +using Microsoft.CodeAnalysis.ExpressionEvaluator; namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/Scanner.cs b/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/Scanner.cs index ada24a9cd73be..de2acad941386 100644 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/Scanner.cs +++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/Scanner.cs @@ -4,9 +4,9 @@ #nullable disable -using Roslyn.Utilities; using System; using System.Diagnostics; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/DebuggerTypeProxyExpansion.cs b/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/DebuggerTypeProxyExpansion.cs index a93e485f8c5a1..cde4876ac387e 100644 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/DebuggerTypeProxyExpansion.cs +++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/DebuggerTypeProxyExpansion.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.VisualStudio.Debugger.Evaluation; -using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using System.Collections.ObjectModel; using System.Diagnostics; +using Microsoft.VisualStudio.Debugger.Evaluation; +using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/NativeViewExpansion.cs b/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/NativeViewExpansion.cs index 01400b3a2ac05..d8e21e3746fd3 100644 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/NativeViewExpansion.cs +++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/NativeViewExpansion.cs @@ -4,10 +4,10 @@ #nullable disable +using System; using Microsoft.VisualStudio.Debugger; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; -using System; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/TupleExpansion.cs b/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/TupleExpansion.cs index e06c5febff354..ee3195ea728de 100644 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/TupleExpansion.cs +++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/TupleExpansion.cs @@ -4,13 +4,13 @@ #nullable disable +using System; +using System.Collections.ObjectModel; +using System.Diagnostics; using Microsoft.VisualStudio.Debugger.Clr; using Microsoft.VisualStudio.Debugger.ComponentInterfaces; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; -using System; -using System.Collections.ObjectModel; -using System.Diagnostics; using FieldInfo = Microsoft.VisualStudio.Debugger.Metadata.FieldInfo; using Type = Microsoft.VisualStudio.Debugger.Metadata.Type; diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/CustomTypeInfoTypeArgumentMap.cs b/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/CustomTypeInfoTypeArgumentMap.cs index d7577931736af..e9b152795bb88 100644 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/CustomTypeInfoTypeArgumentMap.cs +++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/CustomTypeInfoTypeArgumentMap.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using System; using System.Collections.ObjectModel; using System.Diagnostics; +using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using Type = Microsoft.VisualStudio.Debugger.Metadata.Type; namespace Microsoft.CodeAnalysis.ExpressionEvaluator diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/ValueHelpers.cs b/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/ValueHelpers.cs index 83cf812b482db..892dcb677d0af 100644 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/ValueHelpers.cs +++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/ValueHelpers.cs @@ -4,11 +4,11 @@ #nullable disable +using System.Diagnostics; +using System.Text; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; -using System.Diagnostics; -using System.Text; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestHelpers.cs b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestHelpers.cs index 4cb86e9d0299f..f6da8080cd5ec 100644 --- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestHelpers.cs +++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestHelpers.cs @@ -5,7 +5,6 @@ #nullable disable extern alias PDB; - using System; using System.Collections.Generic; using System.Collections.Immutable; @@ -30,10 +29,10 @@ using Microsoft.Metadata.Tools; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; +using PDB::Roslyn.Test.PdbUtilities; +using PDB::Roslyn.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using PDB::Roslyn.Test.Utilities; -using PDB::Roslyn.Test.PdbUtilities; namespace Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests { diff --git a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/NamespaceTypeDefinitionNoBase.cs b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/NamespaceTypeDefinitionNoBase.cs index d602dcf4c985e..69815529f637d 100644 --- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/NamespaceTypeDefinitionNoBase.cs +++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/NamespaceTypeDefinitionNoBase.cs @@ -4,11 +4,11 @@ #nullable disable -using Microsoft.Cci; -using Microsoft.CodeAnalysis.Emit; using System.Collections.Generic; using System.Reflection.Metadata; using System.Runtime.InteropServices; +using Microsoft.Cci; +using Microsoft.CodeAnalysis.Emit; namespace Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests { diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/CSharpFunctionResolverTests.cs b/src/ExpressionEvaluator/Core/Test/FunctionResolver/CSharpFunctionResolverTests.cs index f3d40b5802997..b9499af616172 100644 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/CSharpFunctionResolverTests.cs +++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/CSharpFunctionResolverTests.cs @@ -4,13 +4,13 @@ #nullable disable +using System; +using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.VisualStudio.Debugger.Evaluation; using Roslyn.Test.Utilities; -using System; -using System.Collections.Immutable; using Xunit; namespace Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTestBase.cs b/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTestBase.cs index 0db6d71dbda36..0f8321f3741ba 100644 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTestBase.cs +++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTestBase.cs @@ -4,8 +4,6 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Roslyn.Test.Utilities; using System; using System.Collections.Immutable; using System.Diagnostics; @@ -13,6 +11,8 @@ using System.Reflection.Metadata; using System.Reflection.Metadata.Ecma335; using System.Text; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests { diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/ParsingTestBase.cs b/src/ExpressionEvaluator/Core/Test/FunctionResolver/ParsingTestBase.cs index cbcafcf0ef785..ac805e36680f5 100644 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/ParsingTestBase.cs +++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/ParsingTestBase.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Roslyn.Test.Utilities; using System.Collections.Immutable; using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Roslyn.Test.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicFunctionResolverTests.cs b/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicFunctionResolverTests.cs index 0f09469937596..7e8d711eea94c 100644 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicFunctionResolverTests.cs +++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicFunctionResolverTests.cs @@ -4,11 +4,11 @@ #nullable disable +using System; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator; using Microsoft.VisualStudio.Debugger.Evaluation; using Roslyn.Test.Utilities; -using System; using Xunit; namespace Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicParsingTests.cs b/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicParsingTests.cs index c998701451341..e6789339a83eb 100644 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicParsingTests.cs +++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicParsingTests.cs @@ -4,12 +4,12 @@ #nullable disable -using Microsoft.CodeAnalysis.VisualBasic; -using Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator; -using Roslyn.Test.Utilities; using System; using System.Collections.Immutable; using System.Linq; +using Microsoft.CodeAnalysis.VisualBasic; +using Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator; +using Roslyn.Test.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrModuleInstance.cs b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrModuleInstance.cs index b6940815f033d..f999c8466e92a 100644 --- a/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrModuleInstance.cs +++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrModuleInstance.cs @@ -9,14 +9,14 @@ #endregion -using Microsoft.CodeAnalysis.ExpressionEvaluator; -using Microsoft.VisualStudio.Debugger.Symbols; using System; using System.Collections.ObjectModel; using System.Diagnostics; using System.Linq; using System.Reflection; using System.Threading; +using Microsoft.CodeAnalysis.ExpressionEvaluator; +using Microsoft.VisualStudio.Debugger.Symbols; namespace Microsoft.VisualStudio.Debugger.Clr { diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/ReflectionUtilities.cs b/src/ExpressionEvaluator/Core/Test/ResultProvider/ReflectionUtilities.cs index 37b9599074121..8f1fb4cbe27e1 100644 --- a/src/ExpressionEvaluator/Core/Test/ResultProvider/ReflectionUtilities.cs +++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/ReflectionUtilities.cs @@ -4,11 +4,11 @@ #nullable disable -using Microsoft.VisualStudio.Debugger.Clr; using System; using System.Collections.Immutable; using System.Linq; using System.Reflection; +using Microsoft.VisualStudio.Debugger.Clr; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestBase.cs b/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestBase.cs index 634ef933a7c6d..49c15aa8362b6 100644 --- a/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestBase.cs +++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestBase.cs @@ -5,8 +5,8 @@ #nullable disable using System; -using System.Collections.ObjectModel; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Runtime.ExceptionServices; using Microsoft.CodeAnalysis.Collections; diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/EEAssemblyBuilder.vb b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/EEAssemblyBuilder.vb index dc8dfea4640be..09b33137f7a0f 100644 --- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/EEAssemblyBuilder.vb +++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/EEAssemblyBuilder.vb @@ -2,6 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Collections.Immutable +Imports System.Diagnostics +Imports System.Reflection.Metadata +Imports System.Runtime.InteropServices Imports Microsoft.Cci Imports Microsoft.CodeAnalysis.CodeGen Imports Microsoft.CodeAnalysis.Emit @@ -11,10 +15,6 @@ Imports Microsoft.CodeAnalysis.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Emit Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE -Imports System.Collections.Immutable -Imports System.Diagnostics -Imports System.Reflection.Metadata -Imports System.Runtime.InteropServices Imports Roslyn.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicEESymbolProvider.vb b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicEESymbolProvider.vb index ad61fb053d091..1a36ab9ed5db1 100644 --- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicEESymbolProvider.vb +++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicEESymbolProvider.vb @@ -5,10 +5,10 @@ Imports System Imports System.Collections.Immutable Imports System.Reflection.Metadata -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.ExpressionEvaluator Imports Microsoft.CodeAnalysis.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicInstructionDecoder.vb b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicInstructionDecoder.vb index 137dcd41d6a1a..52c3ed187b2b6 100644 --- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicInstructionDecoder.vb +++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicInstructionDecoder.vb @@ -5,12 +5,12 @@ Imports System.Collections.Immutable Imports System.Reflection.Metadata Imports System.Reflection.Metadata.Ecma335 +Imports System.Text Imports Microsoft.CodeAnalysis.ExpressionEvaluator Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.VisualStudio.Debugger Imports Microsoft.VisualStudio.Debugger.Clr -Imports System.Text Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/LocalsTests.vb b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/LocalsTests.vb index 5324abefe0c83..a94ed46c0670a 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/LocalsTests.vb +++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/LocalsTests.vb @@ -7,9 +7,9 @@ Imports Microsoft.CodeAnalysis.CodeGen Imports Microsoft.CodeAnalysis.ExpressionEvaluator Imports Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests Imports Microsoft.CodeAnalysis.PooledObjects +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.VisualStudio.Debugger.Evaluation Imports Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation Imports Roslyn.Test.Utilities diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/ResultPropertiesTests.vb b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/ResultPropertiesTests.vb index e9bbe29077ed7..dcc71728de381 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/ResultPropertiesTests.vb +++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/ResultPropertiesTests.vb @@ -6,9 +6,9 @@ Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis.CodeGen Imports Microsoft.CodeAnalysis.ExpressionEvaluator Imports Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests +Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Microsoft.VisualStudio.Debugger.Evaluation Imports Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation -Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Roslyn.Test.PdbUtilities Imports Roslyn.Test.Utilities Imports Xunit diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/ResultsViewTests.vb b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/ResultsViewTests.vb index bd826b6e7d8fb..87c4f4f7e2115 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/ResultsViewTests.vb +++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/ResultsViewTests.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Reflection Imports Microsoft.CodeAnalysis.ExpressionEvaluator Imports Microsoft.VisualStudio.Debugger.Clr Imports Microsoft.VisualStudio.Debugger.Evaluation -Imports System.Reflection Imports Roslyn.Test.Utilities Imports Xunit diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TupleTests.vb b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TupleTests.vb index 4030e47c2e289..54a75a5802c38 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TupleTests.vb +++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TupleTests.vb @@ -2,6 +2,7 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis.CSharp Imports Microsoft.CodeAnalysis.ExpressionEvaluator Imports Microsoft.CodeAnalysis.Test.Utilities @@ -9,7 +10,6 @@ Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Microsoft.VisualStudio.Debugger.Clr Imports Microsoft.VisualStudio.Debugger.Evaluation Imports Roslyn.Test.Utilities -Imports System.Collections.Immutable Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TypeVariablesExpansionTests.vb b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TypeVariablesExpansionTests.vb index 370e60fd32502..82a66029c8fe4 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TypeVariablesExpansionTests.vb +++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TypeVariablesExpansionTests.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis.ExpressionEvaluator Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Microsoft.VisualStudio.Debugger.Evaluation -Imports System.Collections.Immutable Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.UnitTests diff --git a/src/Features/CSharp/Portable/CodeFixes/HideBase/HideBaseCodeFixProvider.AddNewKeywordAction.cs b/src/Features/CSharp/Portable/CodeFixes/HideBase/HideBaseCodeFixProvider.AddNewKeywordAction.cs index b7e5b04f8a007..980e72dd18eb7 100644 --- a/src/Features/CSharp/Portable/CodeFixes/HideBase/HideBaseCodeFixProvider.AddNewKeywordAction.cs +++ b/src/Features/CSharp/Portable/CodeFixes/HideBase/HideBaseCodeFixProvider.AddNewKeywordAction.cs @@ -5,13 +5,13 @@ #nullable disable using System.Linq; -using System.Threading.Tasks; using System.Threading; +using System.Threading.Tasks; using Microsoft.CodeAnalysis.CSharp.CodeStyle; +using Microsoft.CodeAnalysis.CSharp.LanguageServices; using Microsoft.CodeAnalysis.CSharp.OrderModifiers; using Microsoft.CodeAnalysis.OrderModifiers; using Roslyn.Utilities; -using Microsoft.CodeAnalysis.CSharp.LanguageServices; namespace Microsoft.CodeAnalysis.CSharp.CodeFixes.HideBase { diff --git a/src/Features/CSharp/Portable/Completion/KeywordRecommenders/RefKeywordRecommender.cs b/src/Features/CSharp/Portable/Completion/KeywordRecommenders/RefKeywordRecommender.cs index 09d24f5ede379..5691416eecb4f 100644 --- a/src/Features/CSharp/Portable/Completion/KeywordRecommenders/RefKeywordRecommender.cs +++ b/src/Features/CSharp/Portable/Completion/KeywordRecommenders/RefKeywordRecommender.cs @@ -4,9 +4,9 @@ #nullable disable +using System.Collections.Generic; using System.Threading; using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery; -using System.Collections.Generic; using Microsoft.CodeAnalysis.CSharp.Utilities; using Microsoft.CodeAnalysis.Shared.Extensions; diff --git a/src/Features/CSharp/Portable/Completion/KeywordRecommenders/StringKeywordRecommender.cs b/src/Features/CSharp/Portable/Completion/KeywordRecommenders/StringKeywordRecommender.cs index c1224ccde8710..27c3b061fe716 100644 --- a/src/Features/CSharp/Portable/Completion/KeywordRecommenders/StringKeywordRecommender.cs +++ b/src/Features/CSharp/Portable/Completion/KeywordRecommenders/StringKeywordRecommender.cs @@ -5,9 +5,9 @@ #nullable disable using System.Threading; -using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Extensions; using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery; +using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Utilities; using Microsoft.CodeAnalysis.Shared.Extensions; diff --git a/src/Features/CSharp/Portable/Debugging/BreakpointResolver.cs b/src/Features/CSharp/Portable/Debugging/BreakpointResolver.cs index 915669299135c..c9ec9885ab5e0 100644 --- a/src/Features/CSharp/Portable/Debugging/BreakpointResolver.cs +++ b/src/Features/CSharp/Portable/Debugging/BreakpointResolver.cs @@ -11,8 +11,8 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Extensions; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Debugging; +using Microsoft.CodeAnalysis.Shared.Extensions; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Debugging diff --git a/src/Features/CSharp/Portable/ExternalAccess/Pythia/PythiaSignatureHelpProvider.cs b/src/Features/CSharp/Portable/ExternalAccess/Pythia/PythiaSignatureHelpProvider.cs index df31038cc9e84..38b5a12fa8202 100644 --- a/src/Features/CSharp/Portable/ExternalAccess/Pythia/PythiaSignatureHelpProvider.cs +++ b/src/Features/CSharp/Portable/ExternalAccess/Pythia/PythiaSignatureHelpProvider.cs @@ -2,16 +2,16 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using System.Collections.Immutable; using System.Composition; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CSharp.SignatureHelp; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.SignatureHelp; using Microsoft.CodeAnalysis.ExternalAccess.Pythia.Api; -using System; using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.CodeAnalysis.SignatureHelp; namespace Microsoft.CodeAnalysis.ExternalAccess.Pythia { diff --git a/src/Features/CSharp/Portable/InitializeParameter/CSharpAddParameterCheckCodeRefactoringProvider.cs b/src/Features/CSharp/Portable/InitializeParameter/CSharpAddParameterCheckCodeRefactoringProvider.cs index e11ffcac31b0b..c5621c35c33ce 100644 --- a/src/Features/CSharp/Portable/InitializeParameter/CSharpAddParameterCheckCodeRefactoringProvider.cs +++ b/src/Features/CSharp/Portable/InitializeParameter/CSharpAddParameterCheckCodeRefactoringProvider.cs @@ -8,10 +8,10 @@ using System.Composition; using System.Diagnostics.CodeAnalysis; using Microsoft.CodeAnalysis.CodeRefactorings; -using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.CSharp.CodeStyle; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Editing; +using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.InitializeParameter; using Microsoft.CodeAnalysis.Options; using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory; diff --git a/src/Features/CSharp/Portable/InternalUtilities/InternalExtensions.cs b/src/Features/CSharp/Portable/InternalUtilities/InternalExtensions.cs index 16b125fb8edd9..3e762f3661ec1 100644 --- a/src/Features/CSharp/Portable/InternalUtilities/InternalExtensions.cs +++ b/src/Features/CSharp/Portable/InternalUtilities/InternalExtensions.cs @@ -4,10 +4,10 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Shared.Extensions; using System; using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Shared.Extensions; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Features/CSharp/Portable/SignatureHelp/SignatureHelpUtilities.cs b/src/Features/CSharp/Portable/SignatureHelp/SignatureHelpUtilities.cs index 46e4c738a3187..5773f051e3fff 100644 --- a/src/Features/CSharp/Portable/SignatureHelp/SignatureHelpUtilities.cs +++ b/src/Features/CSharp/Portable/SignatureHelp/SignatureHelpUtilities.cs @@ -7,9 +7,9 @@ using System.Linq; using Microsoft.CodeAnalysis.CSharp.Extensions; using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.SignatureHelp; using Microsoft.CodeAnalysis.Text; -using Microsoft.CodeAnalysis.Shared.Extensions; namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp { diff --git a/src/Features/CSharp/Portable/UsePatternCombinators/CSharpUsePatternCombinatorsCodeFixProvider.cs b/src/Features/CSharp/Portable/UsePatternCombinators/CSharpUsePatternCombinatorsCodeFixProvider.cs index 987149659bbe3..20716531c90df 100644 --- a/src/Features/CSharp/Portable/UsePatternCombinators/CSharpUsePatternCombinatorsCodeFixProvider.cs +++ b/src/Features/CSharp/Portable/UsePatternCombinators/CSharpUsePatternCombinatorsCodeFixProvider.cs @@ -24,8 +24,8 @@ namespace Microsoft.CodeAnalysis.CSharp.UsePatternCombinators { - using static SyntaxFactory; using static AnalyzedPattern; + using static SyntaxFactory; [ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.UsePatternCombinators), Shared] internal class CSharpUsePatternCombinatorsCodeFixProvider : SyntaxEditorBasedCodeFixProvider diff --git a/src/Features/Core/Portable/CodeCleanup/DiagnosticSet.cs b/src/Features/Core/Portable/CodeCleanup/DiagnosticSet.cs index 79843492db80d..29fd7b4dbd97e 100644 --- a/src/Features/Core/Portable/CodeCleanup/DiagnosticSet.cs +++ b/src/Features/Core/Portable/CodeCleanup/DiagnosticSet.cs @@ -21,4 +21,4 @@ public DiagnosticSet(string description, params string[] diagnosticIds) DiagnosticIds = ImmutableArray.Create(diagnosticIds); } } -} \ No newline at end of file +} diff --git a/src/Features/Core/Portable/Completion/Providers/Scripting/AbstractDirectivePathCompletionProvider.cs b/src/Features/Core/Portable/Completion/Providers/Scripting/AbstractDirectivePathCompletionProvider.cs index 9c443daa0e12f..901436dc922a3 100644 --- a/src/Features/Core/Portable/Completion/Providers/Scripting/AbstractDirectivePathCompletionProvider.cs +++ b/src/Features/Core/Portable/Completion/Providers/Scripting/AbstractDirectivePathCompletionProvider.cs @@ -4,17 +4,17 @@ using System; using System.Collections.Immutable; +using System.Diagnostics; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Completion; +using Microsoft.CodeAnalysis.ErrorReporting; using Microsoft.CodeAnalysis.Options; -using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.Scripting; -using Roslyn.Utilities; -using Microsoft.CodeAnalysis.ErrorReporting; -using System.Diagnostics; using Microsoft.CodeAnalysis.Scripting.Hosting; using Microsoft.CodeAnalysis.Shared.Extensions; +using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Completion.Providers { diff --git a/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerLanguageService.cs b/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerLanguageService.cs index 9cd7494600492..ce1d4e2d30037 100644 --- a/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerLanguageService.cs +++ b/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerLanguageService.cs @@ -4,9 +4,9 @@ using System; using System.Composition; +using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api; using Microsoft.CodeAnalysis.Host; using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api; namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript { diff --git a/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerService.cs b/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerService.cs index 48a9d4d5008d3..5ef825303488c 100644 --- a/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerService.cs +++ b/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerService.cs @@ -3,11 +3,11 @@ // See the LICENSE file in the project root for more information. using System; -using System.Composition; -using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api; using System.Collections.Generic; +using System.Composition; using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api; +using Microsoft.CodeAnalysis.Host.Mef; namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript { diff --git a/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs b/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs index d3187efe61d82..b05633d3cf97f 100644 --- a/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs +++ b/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Features/Core/Portable/ReplaceMethodWithProperty/AbstractReplaceMethodWithPropertyService.cs b/src/Features/Core/Portable/ReplaceMethodWithProperty/AbstractReplaceMethodWithPropertyService.cs index 91ea835f19368..4d143a100de8c 100644 --- a/src/Features/Core/Portable/ReplaceMethodWithProperty/AbstractReplaceMethodWithPropertyService.cs +++ b/src/Features/Core/Portable/ReplaceMethodWithProperty/AbstractReplaceMethodWithPropertyService.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using System.Collections.Generic; using Microsoft.CodeAnalysis.CodeRefactorings; using Microsoft.CodeAnalysis.LanguageServices; diff --git a/src/Features/Core/Portable/ValueTracking/ValueTrackedItem.cs b/src/Features/Core/Portable/ValueTracking/ValueTrackedItem.cs index 5d4654fd52358..786885aab25b0 100644 --- a/src/Features/Core/Portable/ValueTracking/ValueTrackedItem.cs +++ b/src/Features/Core/Portable/ValueTracking/ValueTrackedItem.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Linq; using System.Collections.Immutable; +using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Classification; diff --git a/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs b/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs index a0bb3496df8ec..6489a8023e4c7 100644 --- a/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs +++ b/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Diagnostics; +using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.ErrorReporting; diff --git a/src/Features/VisualBasic/Portable/CodeFixes/IncorrectExitContinue/IncorrectExitContinueCodeFixProvider.ReplaceTokenKeywordCodeAction.vb b/src/Features/VisualBasic/Portable/CodeFixes/IncorrectExitContinue/IncorrectExitContinueCodeFixProvider.ReplaceTokenKeywordCodeAction.vb index 9fec4c378d81a..3481fd5ca2726 100644 --- a/src/Features/VisualBasic/Portable/CodeFixes/IncorrectExitContinue/IncorrectExitContinueCodeFixProvider.ReplaceTokenKeywordCodeAction.vb +++ b/src/Features/VisualBasic/Portable/CodeFixes/IncorrectExitContinue/IncorrectExitContinueCodeFixProvider.ReplaceTokenKeywordCodeAction.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Threading Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.CodeActions -Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.CodeFixes.IncorrectExitContinue Partial Friend Class IncorrectExitContinueCodeFixProvider diff --git a/src/Features/VisualBasic/Portable/CodeRefactorings/VisualBasicRefactoringHelpersService.vb b/src/Features/VisualBasic/Portable/CodeRefactorings/VisualBasicRefactoringHelpersService.vb index d72eba291c950..eb4a0645007f3 100644 --- a/src/Features/VisualBasic/Portable/CodeRefactorings/VisualBasicRefactoringHelpersService.vb +++ b/src/Features/VisualBasic/Portable/CodeRefactorings/VisualBasicRefactoringHelpersService.vb @@ -4,9 +4,9 @@ Imports System.Composition Imports Microsoft.CodeAnalysis.CodeRefactorings -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.CodeAnalysis.LanguageServices +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings diff --git a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/KeywordCompletionProvider.vb b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/KeywordCompletionProvider.vb index 956551f202227..a794c67c19a06 100644 --- a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/KeywordCompletionProvider.vb +++ b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/KeywordCompletionProvider.vb @@ -2,16 +2,16 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Threading Imports System.Collections.Immutable +Imports System.Composition +Imports System.Threading +Imports Microsoft.CodeAnalysis.Completion Imports Microsoft.CodeAnalysis.Completion.Providers +Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.CodeAnalysis.Options +Imports Microsoft.CodeAnalysis.Tags Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.ContextQuery -Imports Microsoft.CodeAnalysis.Completion -Imports System.Composition -Imports Microsoft.CodeAnalysis.Host.Mef -Imports Microsoft.CodeAnalysis.Tags Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers diff --git a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.vb b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.vb index 5afcb1cb1455e..62531cd7ee106 100644 --- a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.vb +++ b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.vb @@ -3,16 +3,16 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable +Imports System.Composition Imports System.Threading Imports Microsoft.CodeAnalysis.Completion Imports Microsoft.CodeAnalysis.Completion.Providers -Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.Options -Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.ContextQuery Imports Microsoft.CodeAnalysis.ErrorReporting -Imports System.Composition Imports Microsoft.CodeAnalysis.Host.Mef +Imports Microsoft.CodeAnalysis.Options +Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.ContextQuery +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers diff --git a/src/Features/VisualBasic/Portable/ConvertIfToSwitch/VisualBasicConvertIfToSwitchCodeRefactoringProvider.Rewriting.vb b/src/Features/VisualBasic/Portable/ConvertIfToSwitch/VisualBasicConvertIfToSwitchCodeRefactoringProvider.Rewriting.vb index 26a4c2cc134be..3594aec102ec6 100644 --- a/src/Features/VisualBasic/Portable/ConvertIfToSwitch/VisualBasicConvertIfToSwitchCodeRefactoringProvider.Rewriting.vb +++ b/src/Features/VisualBasic/Portable/ConvertIfToSwitch/VisualBasicConvertIfToSwitchCodeRefactoringProvider.Rewriting.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Operations Imports Microsoft.CodeAnalysis.VisualBasic.CodeGeneration +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.ConvertIfToSwitch Partial Friend NotInheritable Class VisualBasicConvertIfToSwitchCodeRefactoringProvider diff --git a/src/Features/VisualBasic/Portable/Debugging/BreakpointResolver.vb b/src/Features/VisualBasic/Portable/Debugging/BreakpointResolver.vb index a4563ab669c04..efd51e4abecff 100644 --- a/src/Features/VisualBasic/Portable/Debugging/BreakpointResolver.vb +++ b/src/Features/VisualBasic/Portable/Debugging/BreakpointResolver.vb @@ -4,8 +4,8 @@ Imports System.Threading Imports Microsoft.CodeAnalysis -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Debugging +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.Debugging diff --git a/src/Features/VisualBasic/Portable/EditAndContinue/BreakpointSpans.vb b/src/Features/VisualBasic/Portable/EditAndContinue/BreakpointSpans.vb index a8fb76ddbc6c0..db0303e168c5e 100644 --- a/src/Features/VisualBasic/Portable/EditAndContinue/BreakpointSpans.vb +++ b/src/Features/VisualBasic/Portable/EditAndContinue/BreakpointSpans.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Runtime.InteropServices +Imports System.Threading +Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.Text -Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue Friend Module BreakpointSpans diff --git a/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicMethodExtractor.VisualBasicCodeGenerator.vb b/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicMethodExtractor.VisualBasicCodeGenerator.vb index 7a92589b69c61..575af60bc0a60 100644 --- a/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicMethodExtractor.VisualBasicCodeGenerator.vb +++ b/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicMethodExtractor.VisualBasicCodeGenerator.vb @@ -2,16 +2,16 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Collections.Immutable Imports System.Threading Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.CodeGeneration Imports Microsoft.CodeAnalysis.Editing Imports Microsoft.CodeAnalysis.ExtractMethod Imports Microsoft.CodeAnalysis.Formatting +Imports Microsoft.CodeAnalysis.Simplification Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.Simplification -Imports System.Collections.Immutable Namespace Microsoft.CodeAnalysis.VisualBasic.ExtractMethod Partial Friend Class VisualBasicMethodExtractor diff --git a/src/Features/VisualBasic/Portable/GenerateMember/GenerateParameterizedMember/VisualBasicGenerateParameterizedMemberService.vb b/src/Features/VisualBasic/Portable/GenerateMember/GenerateParameterizedMember/VisualBasicGenerateParameterizedMemberService.vb index 279a1e3e2a737..6cfb9cd4416c5 100644 --- a/src/Features/VisualBasic/Portable/GenerateMember/GenerateParameterizedMember/VisualBasicGenerateParameterizedMemberService.vb +++ b/src/Features/VisualBasic/Portable/GenerateMember/GenerateParameterizedMember/VisualBasicGenerateParameterizedMemberService.vb @@ -2,16 +2,16 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Collections.Immutable Imports System.Threading Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.CodeGeneration +Imports Microsoft.CodeAnalysis.GenerateMember.GenerateParameterizedMember Imports Microsoft.CodeAnalysis.LanguageServices Imports Microsoft.CodeAnalysis.PooledObjects +Imports Microsoft.CodeAnalysis.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.GenerateMember.GenerateParameterizedMember -Imports Microsoft.CodeAnalysis.Utilities -Imports System.Collections.Immutable Namespace Microsoft.CodeAnalysis.VisualBasic.GenerateMember.GenerateMethod Partial Friend MustInherit Class VisualBasicGenerateParameterizedMemberService(Of TService As AbstractGenerateParameterizedMemberService(Of TService, SimpleNameSyntax, ExpressionSyntax, InvocationExpressionSyntax)) diff --git a/src/Features/VisualBasic/Portable/IntroduceVariable/VisualBasicIntroduceVariableService.vb b/src/Features/VisualBasic/Portable/IntroduceVariable/VisualBasicIntroduceVariableService.vb index 1500f8128a0b6..28a3cd368a134 100644 --- a/src/Features/VisualBasic/Portable/IntroduceVariable/VisualBasicIntroduceVariableService.vb +++ b/src/Features/VisualBasic/Portable/IntroduceVariable/VisualBasicIntroduceVariableService.vb @@ -2,13 +2,13 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Composition Imports System.Threading Imports Microsoft.CodeAnalysis -Imports Microsoft.CodeAnalysis.IntroduceVariable Imports Microsoft.CodeAnalysis.Host.Mef +Imports Microsoft.CodeAnalysis.IntroduceVariable Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports System.Composition Namespace Microsoft.CodeAnalysis.VisualBasic.IntroduceVariable diff --git a/src/Features/VisualBasic/Portable/ReplaceMethodWithProperty/VisualBasicReplaceMethodWithPropertyService.vb b/src/Features/VisualBasic/Portable/ReplaceMethodWithProperty/VisualBasicReplaceMethodWithPropertyService.vb index 623bfd254d72c..03e6798d29a95 100644 --- a/src/Features/VisualBasic/Portable/ReplaceMethodWithProperty/VisualBasicReplaceMethodWithPropertyService.vb +++ b/src/Features/VisualBasic/Portable/ReplaceMethodWithProperty/VisualBasicReplaceMethodWithPropertyService.vb @@ -9,8 +9,8 @@ Imports Microsoft.CodeAnalysis.Formatting Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.CodeAnalysis.Options Imports Microsoft.CodeAnalysis.ReplaceMethodWithProperty -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.ReplaceMethodWithProperty diff --git a/src/Interactive/Host/Interactive/Core/InteractiveHost.LazyRemoteService.cs b/src/Interactive/Host/Interactive/Core/InteractiveHost.LazyRemoteService.cs index 6e3d51c9bf249..3359bf966f8f9 100644 --- a/src/Interactive/Host/Interactive/Core/InteractiveHost.LazyRemoteService.cs +++ b/src/Interactive/Host/Interactive/Core/InteractiveHost.LazyRemoteService.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. extern alias Scripting; - using System; using System.Collections.Immutable; using System.Diagnostics; @@ -15,8 +14,8 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis.ErrorReporting; using Roslyn.Utilities; -using StreamJsonRpc; using Scripting::Microsoft.CodeAnalysis.Scripting.Hosting; +using StreamJsonRpc; namespace Microsoft.CodeAnalysis.Interactive { diff --git a/src/Scripting/CSharpTest.Desktop/InteractiveSessionReferencesTests.cs b/src/Scripting/CSharpTest.Desktop/InteractiveSessionReferencesTests.cs index af94d57047929..947c34ec78e3c 100644 --- a/src/Scripting/CSharpTest.Desktop/InteractiveSessionReferencesTests.cs +++ b/src/Scripting/CSharpTest.Desktop/InteractiveSessionReferencesTests.cs @@ -5,7 +5,6 @@ #nullable disable extern alias PortableTestUtils; - using System; using System.Collections.Generic; using System.Diagnostics; @@ -21,11 +20,11 @@ using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using static Microsoft.CodeAnalysis.Scripting.TestCompilationFactory; +using static Roslyn.Test.Utilities.TestMetadata; using AssertEx = PortableTestUtils::Roslyn.Test.Utilities.AssertEx; using TestBase = PortableTestUtils::Roslyn.Test.Utilities.TestBase; using WorkItemAttribute = PortableTestUtils::Roslyn.Test.Utilities.WorkItemAttribute; -using static Microsoft.CodeAnalysis.Scripting.TestCompilationFactory; -using static Roslyn.Test.Utilities.TestMetadata; namespace Microsoft.CodeAnalysis.CSharp.Scripting.Test { diff --git a/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatter.cs b/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatter.cs index 16a56641938e2..906307e40a5ed 100644 --- a/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatter.cs +++ b/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatter.cs @@ -8,9 +8,9 @@ using System.Globalization; using System.Reflection; using System.Text; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Collections; +using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.CodeAnalysis.Scripting.Hosting { diff --git a/src/Scripting/Core/Script.cs b/src/Scripting/Core/Script.cs index 98b3f5be4bee6..268b55348af58 100644 --- a/src/Scripting/Core/Script.cs +++ b/src/Scripting/Core/Script.cs @@ -10,17 +10,17 @@ using System.Collections.Immutable; using System.Diagnostics; using System.Globalization; +using System.IO; using System.Linq; +using System.Reflection; +using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; -using System.Reflection; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; -using Roslyn.Utilities; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Scripting.Hosting; -using System.Runtime.CompilerServices; using Microsoft.CodeAnalysis.Text; -using System.IO; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Scripting { diff --git a/src/Scripting/Core/ScriptState.cs b/src/Scripting/Core/ScriptState.cs index 39dd690f97052..a6d1b0277d226 100644 --- a/src/Scripting/Core/ScriptState.cs +++ b/src/Scripting/Core/ScriptState.cs @@ -5,12 +5,12 @@ #nullable disable using System; +using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; +using System.Reflection; using System.Threading; using System.Threading.Tasks; -using System.Reflection; -using System.Collections.Generic; using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.CodeAnalysis.Scripting diff --git a/src/Scripting/CoreTest.Desktop/GlobalAssemblyCacheTests.cs b/src/Scripting/CoreTest.Desktop/GlobalAssemblyCacheTests.cs index eb62f635ebb37..6dbe5ef1c92fb 100644 --- a/src/Scripting/CoreTest.Desktop/GlobalAssemblyCacheTests.cs +++ b/src/Scripting/CoreTest.Desktop/GlobalAssemblyCacheTests.cs @@ -5,12 +5,12 @@ #nullable disable using System; +using System.Collections.Immutable; using System.IO; using System.Linq; using System.Reflection; -using Xunit; -using System.Collections.Immutable; using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Scripting/CoreTest.Desktop/MetadataShadowCopyProviderTests.cs b/src/Scripting/CoreTest.Desktop/MetadataShadowCopyProviderTests.cs index a9dea8d201ae3..311dd261e5dd3 100644 --- a/src/Scripting/CoreTest.Desktop/MetadataShadowCopyProviderTests.cs +++ b/src/Scripting/CoreTest.Desktop/MetadataShadowCopyProviderTests.cs @@ -5,17 +5,16 @@ #nullable disable using System; -using System.Linq; +using System.Collections.Immutable; +using System.Globalization; using System.IO; -using Roslyn.Test.Utilities; -using Microsoft.CodeAnalysis.Test.Utilities; -using Xunit; +using System.Linq; +using System.Runtime.InteropServices; using Microsoft.CodeAnalysis; -using System.Collections.Immutable; +using Microsoft.CodeAnalysis.Test.Utilities; +using Roslyn.Test.Utilities; using Roslyn.Utilities; -using System.Runtime.InteropServices; -using System.Globalization; - +using Xunit; using static Roslyn.Utilities.PlatformInformation; namespace Microsoft.CodeAnalysis.Scripting.Hosting.UnitTests diff --git a/src/Scripting/CoreTest/RuntimeMetadataReferenceResolverTests.cs b/src/Scripting/CoreTest/RuntimeMetadataReferenceResolverTests.cs index d56d4b7c12708..803ddaa9bea64 100644 --- a/src/Scripting/CoreTest/RuntimeMetadataReferenceResolverTests.cs +++ b/src/Scripting/CoreTest/RuntimeMetadataReferenceResolverTests.cs @@ -5,11 +5,10 @@ #nullable disable extern alias Scripting; - +using System.Collections.Immutable; using Microsoft.CodeAnalysis.Scripting.Hosting; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using System.Collections.Immutable; using Xunit; namespace Microsoft.CodeAnalysis.UnitTests.Interactive diff --git a/src/Scripting/CoreTestUtilities/ScriptingTestHelpers.cs b/src/Scripting/CoreTestUtilities/ScriptingTestHelpers.cs index 649d0240210f1..df635ac778984 100644 --- a/src/Scripting/CoreTestUtilities/ScriptingTestHelpers.cs +++ b/src/Scripting/CoreTestUtilities/ScriptingTestHelpers.cs @@ -4,13 +4,13 @@ #nullable disable +using System; using System.Linq; +using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Test.Utilities; -using Xunit; -using System; -using System.Threading.Tasks; using Roslyn.Test.Utilities; +using Xunit; namespace Microsoft.CodeAnalysis.Scripting.Test { diff --git a/src/Test/PdbUtilities/Reader/CustomDebugInfoUtilities.cs b/src/Test/PdbUtilities/Reader/CustomDebugInfoUtilities.cs index 10e7ad6b4a2ba..18cbb3414c4c2 100644 --- a/src/Test/PdbUtilities/Reader/CustomDebugInfoUtilities.cs +++ b/src/Test/PdbUtilities/Reader/CustomDebugInfoUtilities.cs @@ -5,12 +5,11 @@ #nullable disable extern alias DSR; - using System.Collections.Immutable; using System.Reflection.Metadata; using System.Reflection.Metadata.Ecma335; -using Microsoft.CodeAnalysis.Debugging; using DSR::Microsoft.DiaSymReader; +using Microsoft.CodeAnalysis.Debugging; namespace Roslyn.Test.PdbUtilities { diff --git a/src/Test/PdbUtilities/Reader/PdbTestUtilities.cs b/src/Test/PdbUtilities/Reader/PdbTestUtilities.cs index 0845b48e57a42..a7d477a28e6e3 100644 --- a/src/Test/PdbUtilities/Reader/PdbTestUtilities.cs +++ b/src/Test/PdbUtilities/Reader/PdbTestUtilities.cs @@ -5,18 +5,17 @@ #nullable disable extern alias DSR; - using System; using System.Collections.Immutable; using System.IO; using System.Reflection.Metadata; using System.Runtime.InteropServices; +using DSR::Microsoft.DiaSymReader; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.Debugging; using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Test.Utilities; -using DSR::Microsoft.DiaSymReader; using Roslyn.Test.PdbUtilities; namespace Roslyn.Test.Utilities diff --git a/src/Test/PdbUtilities/Shared/DummyMetadataImport.cs b/src/Test/PdbUtilities/Shared/DummyMetadataImport.cs index 8d8737776f385..d04cc7d7ea3a6 100644 --- a/src/Test/PdbUtilities/Shared/DummyMetadataImport.cs +++ b/src/Test/PdbUtilities/Shared/DummyMetadataImport.cs @@ -5,14 +5,14 @@ #nullable disable using System; -using System.IO; -using System.Runtime.InteropServices; -using System.Text; using System.Collections.Generic; +using System.IO; +using System.Reflection; using System.Reflection.Metadata; using System.Reflection.Metadata.Ecma335; +using System.Runtime.InteropServices; +using System.Text; using Microsoft.DiaSymReader.PortablePdb; -using System.Reflection; namespace Roslyn.Test.PdbUtilities { diff --git a/src/Test/Perf/StackDepthTest/Program.cs b/src/Test/Perf/StackDepthTest/Program.cs index fba85a290f88c..c737ec86b409c 100644 --- a/src/Test/Perf/StackDepthTest/Program.cs +++ b/src/Test/Perf/StackDepthTest/Program.cs @@ -4,11 +4,11 @@ #nullable disable -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp; using System; using System.Runtime.InteropServices; using System.Text; +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp; namespace OverflowSensitivity { diff --git a/src/Test/Perf/Utilities/TraceManager.cs b/src/Test/Perf/Utilities/TraceManager.cs index 61342fa1e60c0..01053853feaa6 100644 --- a/src/Test/Perf/Utilities/TraceManager.cs +++ b/src/Test/Perf/Utilities/TraceManager.cs @@ -4,11 +4,11 @@ #nullable disable -using Roslyn.Test.Performance.Utilities; using System.Collections.Generic; using System.Diagnostics; -using System.Linq; using System.IO; +using System.Linq; +using Roslyn.Test.Performance.Utilities; using static Roslyn.Test.Performance.Utilities.TestUtilities; namespace Roslyn.Test.Performance.Utilities diff --git a/src/Tools/ExternalAccess/FSharp/Internal/DocumentHighlighting/FSharpDocumentHighlightsService.cs b/src/Tools/ExternalAccess/FSharp/Internal/DocumentHighlighting/FSharpDocumentHighlightsService.cs index 4c4a64efee832..a9b19e96d11c2 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/DocumentHighlighting/FSharpDocumentHighlightsService.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/DocumentHighlighting/FSharpDocumentHighlightsService.cs @@ -5,14 +5,14 @@ #nullable disable using System; -using System.Linq; -using System.Composition; using System.Collections.Immutable; +using System.Composition; +using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.DocumentHighlighting; -using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.ExternalAccess.FSharp.DocumentHighlighting; +using Microsoft.CodeAnalysis.Host.Mef; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.DocumentHighlighting diff --git a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpContentTypeLanguageService.cs b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpContentTypeLanguageService.cs index df4a382adf2df..b8a9ac5ebf37d 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpContentTypeLanguageService.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpContentTypeLanguageService.cs @@ -7,9 +7,9 @@ using System; using System.Composition; using Microsoft.CodeAnalysis.Editor; -using Microsoft.VisualStudio.Utilities; using Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor; using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.VisualStudio.Utilities; namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.Editor { diff --git a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpEditorInlineRenameService.cs b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpEditorInlineRenameService.cs index 0f645ef1565e3..42da07ea93d32 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpEditorInlineRenameService.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpEditorInlineRenameService.cs @@ -5,9 +5,10 @@ #nullable disable using System; -using System.Linq; using System.Collections.Generic; +using System.Collections.Immutable; using System.Composition; +using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Editor; @@ -16,7 +17,6 @@ using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.Editor { diff --git a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpGoToDefinitionService.cs b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpGoToDefinitionService.cs index 3c62db841dc00..23dc3febe8e59 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpGoToDefinitionService.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpGoToDefinitionService.cs @@ -5,16 +5,16 @@ #nullable disable using System; -using System.Linq; -using System.Composition; using System.Collections.Generic; +using System.Composition; +using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Editor; -using Microsoft.CodeAnalysis.Navigation; -using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor; using Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.Navigation; +using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.CodeAnalysis.Navigation; namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.Editor { diff --git a/src/Tools/ExternalAccess/FSharp/Internal/SignatureHelp/FSharpSignatureHelpProvider.cs b/src/Tools/ExternalAccess/FSharp/Internal/SignatureHelp/FSharpSignatureHelpProvider.cs index 0447ba2e03b44..315c5dab120cd 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/SignatureHelp/FSharpSignatureHelpProvider.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/SignatureHelp/FSharpSignatureHelpProvider.cs @@ -5,8 +5,8 @@ #nullable disable using System; -using System.Linq; using System.Composition; +using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.ExternalAccess.FSharp.SignatureHelp; diff --git a/src/Tools/ExternalAccess/FSharp/Internal/Structure/FSharpBlockStructureService.cs b/src/Tools/ExternalAccess/FSharp/Internal/Structure/FSharpBlockStructureService.cs index 588bc7fb239ef..be34ea522a584 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/Structure/FSharpBlockStructureService.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/Structure/FSharpBlockStructureService.cs @@ -4,13 +4,13 @@ #nullable disable +using System; using System.Composition; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Structure; using Microsoft.CodeAnalysis.ExternalAccess.FSharp.Structure; using Microsoft.CodeAnalysis.Host.Mef; -using System; +using Microsoft.CodeAnalysis.Structure; namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.Structure { diff --git a/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/FSharpProjectExternalErrorReporterFactory.cs b/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/FSharpProjectExternalErrorReporterFactory.cs index 0a24fc5cee25c..618d6c4b32586 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/FSharpProjectExternalErrorReporterFactory.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/FSharpProjectExternalErrorReporterFactory.cs @@ -5,12 +5,12 @@ #nullable disable using System; -using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.LanguageServices; -using Microsoft.VisualStudio.LanguageServices.Implementation.TaskList; using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem; using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem.Extensions; +using Microsoft.VisualStudio.LanguageServices.Implementation.TaskList; using Microsoft.VisualStudio.Shell; +using Microsoft.VisualStudio.Shell.Interop; namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.VisualStudio { diff --git a/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/Text/Classification/FSharpSignatureHelpClassifierProvider.cs b/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/Text/Classification/FSharpSignatureHelpClassifierProvider.cs index d19b2188f4081..b1d06f68cc6ef 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/Text/Classification/FSharpSignatureHelpClassifierProvider.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/Text/Classification/FSharpSignatureHelpClassifierProvider.cs @@ -6,13 +6,13 @@ using System; using System.ComponentModel.Composition; -using Microsoft.VisualStudio.Text.Classification; -using Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor; -using Microsoft.VisualStudio.Utilities; +using Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.SignatureHelp.Presentation; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; +using Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Text; -using Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.SignatureHelp.Presentation; +using Microsoft.VisualStudio.Text.Classification; +using Microsoft.VisualStudio.Utilities; namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.VisualStudio.Text.Classification { diff --git a/src/Tools/ExternalAccess/OmniSharp/Structure/OmniSharpBlockStructureService.cs b/src/Tools/ExternalAccess/OmniSharp/Structure/OmniSharpBlockStructureService.cs index 7b56f4a38cf46..9c47b8a1e0e33 100644 --- a/src/Tools/ExternalAccess/OmniSharp/Structure/OmniSharpBlockStructureService.cs +++ b/src/Tools/ExternalAccess/OmniSharp/Structure/OmniSharpBlockStructureService.cs @@ -6,8 +6,8 @@ using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Structure; using Microsoft.CodeAnalysis.Shared.Extensions; +using Microsoft.CodeAnalysis.Structure; namespace Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.Structure { diff --git a/src/Tools/Source/RunTests/Program.cs b/src/Tools/Source/RunTests/Program.cs index 40f16e82681d9..c98c1d916c49b 100644 --- a/src/Tools/Source/RunTests/Program.cs +++ b/src/Tools/Source/RunTests/Program.cs @@ -6,13 +6,13 @@ using System; using System.Collections.Generic; +using System.Collections.Immutable; +using System.Diagnostics; using System.IO; using System.Linq; +using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; -using System.Collections.Immutable; -using System.Diagnostics; -using System.Text.RegularExpressions; namespace RunTests { diff --git a/src/VisualStudio/CSharp/Impl/Interactive/CSharpVsResetInteractiveCommand.cs b/src/VisualStudio/CSharp/Impl/Interactive/CSharpVsResetInteractiveCommand.cs index f2afd8c007cda..44b7842505d89 100644 --- a/src/VisualStudio/CSharp/Impl/Interactive/CSharpVsResetInteractiveCommand.cs +++ b/src/VisualStudio/CSharp/Impl/Interactive/CSharpVsResetInteractiveCommand.cs @@ -4,12 +4,12 @@ #nullable disable +using System; +using System.ComponentModel.Composition; using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Shell; using Roslyn.VisualStudio.Services.Interactive; -using System; -using System.ComponentModel.Composition; namespace Microsoft.VisualStudio.LanguageServices.CSharp.Interactive { diff --git a/src/VisualStudio/CSharp/Impl/LanguageService/CSharpCodeCleanupFixerProvider.cs b/src/VisualStudio/CSharp/Impl/LanguageService/CSharpCodeCleanupFixerProvider.cs index 93823b5ae6970..45b98a5af483a 100644 --- a/src/VisualStudio/CSharp/Impl/LanguageService/CSharpCodeCleanupFixerProvider.cs +++ b/src/VisualStudio/CSharp/Impl/LanguageService/CSharpCodeCleanupFixerProvider.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -26,4 +26,4 @@ public CSharpCodeCleanUpFixerProvider( { } } -} \ No newline at end of file +} diff --git a/src/VisualStudio/CSharp/Impl/LanguageService/CSharpLanguageService.cs b/src/VisualStudio/CSharp/Impl/LanguageService/CSharpLanguageService.cs index 72e8f3d593b12..91bbb31caeafc 100644 --- a/src/VisualStudio/CSharp/Impl/LanguageService/CSharpLanguageService.cs +++ b/src/VisualStudio/CSharp/Impl/LanguageService/CSharpLanguageService.cs @@ -14,11 +14,11 @@ using Microsoft.VisualStudio.LanguageServices.CSharp.ProjectSystemShim; using Microsoft.VisualStudio.LanguageServices.Implementation.DebuggerIntelliSense; using Microsoft.VisualStudio.LanguageServices.Implementation.LanguageService; +using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.TextManager.Interop; -using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem; namespace Microsoft.VisualStudio.LanguageServices.CSharp.LanguageService { diff --git a/src/VisualStudio/CSharp/Impl/Options/Formatting/FormattingOptionPageControl.xaml.cs b/src/VisualStudio/CSharp/Impl/Options/Formatting/FormattingOptionPageControl.xaml.cs index b595de2c15574..9a414abfb4e61 100644 --- a/src/VisualStudio/CSharp/Impl/Options/Formatting/FormattingOptionPageControl.xaml.cs +++ b/src/VisualStudio/CSharp/Impl/Options/Formatting/FormattingOptionPageControl.xaml.cs @@ -4,11 +4,11 @@ #nullable disable +using System.Runtime.CompilerServices; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.BraceCompletion; using Microsoft.CodeAnalysis.Formatting; using Microsoft.VisualStudio.LanguageServices.Implementation.Options; -using System.Runtime.CompilerServices; // 🐉 The XAML markup compiler does not recognize InternalsVisibleTo. However, since it allows type // forwarding, we use TypeForwardedTo to make CodeStyleNoticeTextBlock appear to the markup compiler diff --git a/src/VisualStudio/CSharp/Test/Interactive/Commands/ResetInteractiveTests.cs b/src/VisualStudio/CSharp/Test/Interactive/Commands/ResetInteractiveTests.cs index 39e463281d2cc..a27131538ef95 100644 --- a/src/VisualStudio/CSharp/Test/Interactive/Commands/ResetInteractiveTests.cs +++ b/src/VisualStudio/CSharp/Test/Interactive/Commands/ResetInteractiveTests.cs @@ -5,22 +5,21 @@ #nullable disable extern alias InteractiveHost; - using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; using System.Threading.Tasks; +using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Microsoft.CodeAnalysis.Editor.Host; +using Microsoft.CodeAnalysis.Editor.UnitTests; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.VisualStudio.InteractiveWindow; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods; +using Microsoft.VisualStudio.Utilities; using Roslyn.Test.Utilities; using Xunit; -using InteractiveHost::Microsoft.CodeAnalysis.Interactive; -using Microsoft.CodeAnalysis.Editor.UnitTests; -using Microsoft.VisualStudio.InteractiveWindow; -using Microsoft.VisualStudio.Utilities; namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Interactive.Commands { diff --git a/src/VisualStudio/CSharp/Test/Interactive/Commands/TestResetInteractive.cs b/src/VisualStudio/CSharp/Test/Interactive/Commands/TestResetInteractive.cs index 30ae70228355a..bf94db871e10c 100644 --- a/src/VisualStudio/CSharp/Test/Interactive/Commands/TestResetInteractive.cs +++ b/src/VisualStudio/CSharp/Test/Interactive/Commands/TestResetInteractive.cs @@ -5,18 +5,17 @@ #nullable disable extern alias InteractiveHost; - -using Microsoft.CodeAnalysis.Editor.Host; -using Microsoft.VisualStudio.LanguageServices.Interactive; -using Microsoft.VisualStudio.Text.Editor; using System; +using System.Collections.Generic; using System.Collections.Immutable; using System.Threading.Tasks; -using Microsoft.VisualStudio.InteractiveWindow; -using System.Collections.Generic; using InteractiveHost::Microsoft.CodeAnalysis.Interactive; -using Microsoft.VisualStudio.Utilities; +using Microsoft.CodeAnalysis.Editor.Host; +using Microsoft.VisualStudio.InteractiveWindow; using Microsoft.VisualStudio.Language.Intellisense.Utilities; +using Microsoft.VisualStudio.LanguageServices.Interactive; +using Microsoft.VisualStudio.Text.Editor; +using Microsoft.VisualStudio.Utilities; namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Interactive.Commands { diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml.cs index 2e1bbac25a334..830be56ff9abb 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml.cs @@ -6,12 +6,12 @@ using System.Linq; using System.Windows.Controls; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Editor.Shared.Utilities; +using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.VisualStudio.Editor; using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common; using Microsoft.VisualStudio.Shell.TableControl; using Microsoft.VisualStudio.TextManager.Interop; -using Microsoft.CodeAnalysis.Shared.Extensions; -using Microsoft.CodeAnalysis.Editor.Shared.Utilities; namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings { diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorPane.SearchFilter.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorPane.SearchFilter.cs index 8148321792dea..906772e16580e 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorPane.SearchFilter.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorPane.SearchFilter.cs @@ -3,10 +3,10 @@ // See the LICENSE file in the project root for more information. using System; +using System.Collections.Generic; using Microsoft.VisualStudio.PlatformUI; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.Shell.TableControl; -using System.Collections.Generic; namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings { diff --git a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyChecker.cs b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyChecker.cs index 6ddd4b292c651..bb83165ff0dd3 100644 --- a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyChecker.cs +++ b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyChecker.cs @@ -7,14 +7,14 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; using System.IO; using System.Linq; +using System.Reflection; using System.Reflection.Metadata; using System.Reflection.PortableExecutable; using System.Threading; using Microsoft.CodeAnalysis; -using System.Reflection; -using System.Diagnostics; using SystemMetadataReader = System.Reflection.Metadata.MetadataReader; namespace Microsoft.VisualStudio.LanguageServices.Implementation diff --git a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyConflict.cs b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyConflict.cs index ebeb90aaedf65..041735604c88a 100644 --- a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyConflict.cs +++ b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyConflict.cs @@ -4,8 +4,8 @@ #nullable disable -using Microsoft.CodeAnalysis; using System.Diagnostics; +using Microsoft.CodeAnalysis; namespace Microsoft.VisualStudio.LanguageServices.Implementation { diff --git a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/IgnorableAssemblyNameList.cs b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/IgnorableAssemblyNameList.cs index 1444eeff1cff3..5d86b3f74716a 100644 --- a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/IgnorableAssemblyNameList.cs +++ b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/IgnorableAssemblyNameList.cs @@ -4,8 +4,8 @@ #nullable disable -using System.Diagnostics; using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.CodeAnalysis; namespace Microsoft.VisualStudio.LanguageServices.Implementation diff --git a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/MissingAnalyzerDependency.cs b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/MissingAnalyzerDependency.cs index a4ba5d81e3b46..94e638cd30b9e 100644 --- a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/MissingAnalyzerDependency.cs +++ b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/MissingAnalyzerDependency.cs @@ -4,8 +4,8 @@ #nullable disable -using Microsoft.CodeAnalysis; using System.Diagnostics; +using Microsoft.CodeAnalysis; namespace Microsoft.VisualStudio.LanguageServices.Implementation { diff --git a/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerService.cs b/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerService.cs index 72361d8369cc2..88e0ea123ac84 100644 --- a/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerService.cs +++ b/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerService.cs @@ -12,15 +12,15 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; +using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.CodeAnalysis.Shared.TestHooks; using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem; using Microsoft.VisualStudio.LanguageServices.Implementation.TaskList; -using Microsoft.CodeAnalysis.Shared.TestHooks; +using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; using Roslyn.Utilities; using Task = System.Threading.Tasks.Task; -using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Diagnostics { diff --git a/src/VisualStudio/Core/Def/Implementation/FindReferences/FindReferencesTableControlEventProcessorProvider.cs b/src/VisualStudio/Core/Def/Implementation/FindReferences/FindReferencesTableControlEventProcessorProvider.cs index 182db6c5dc3fb..8ad8a8b4c8852 100644 --- a/src/VisualStudio/Core/Def/Implementation/FindReferences/FindReferencesTableControlEventProcessorProvider.cs +++ b/src/VisualStudio/Core/Def/Implementation/FindReferences/FindReferencesTableControlEventProcessorProvider.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.VisualStudio.Utilities; +using System; using System.ComponentModel.Composition; +using System.Threading; +using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Shell.TableControl; using Microsoft.VisualStudio.Text.Classification; -using System; -using Microsoft.CodeAnalysis.Host.Mef; -using System.Threading; +using Microsoft.VisualStudio.Utilities; namespace Microsoft.VisualStudio.LanguageServices.FindUsages { diff --git a/src/VisualStudio/Core/Def/Implementation/Interactive/AbstractResetInteractiveMenuCommand.cs b/src/VisualStudio/Core/Def/Implementation/Interactive/AbstractResetInteractiveMenuCommand.cs index 055135a5c5e1f..1382c2a3fb8d8 100644 --- a/src/VisualStudio/Core/Def/Implementation/Interactive/AbstractResetInteractiveMenuCommand.cs +++ b/src/VisualStudio/Core/Def/Implementation/Interactive/AbstractResetInteractiveMenuCommand.cs @@ -4,17 +4,17 @@ #nullable disable -using Microsoft.VisualStudio.Shell; -using Microsoft.VisualStudio.Shell.Interop; -using Roslyn.VisualStudio.Services.Interactive; using System; +using System.ComponentModel.Design; using System.Linq; using System.Runtime.InteropServices; using System.Runtime.Versioning; -using System.ComponentModel.Design; -using Microsoft.VisualStudio.ComponentModelHost; -using Microsoft.CodeAnalysis.Editor; using System.Threading; +using Microsoft.CodeAnalysis.Editor; +using Microsoft.VisualStudio.ComponentModelHost; +using Microsoft.VisualStudio.Shell; +using Microsoft.VisualStudio.Shell.Interop; +using Roslyn.VisualStudio.Services.Interactive; using Task = System.Threading.Tasks.Task; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Interactive diff --git a/src/VisualStudio/Core/Def/Implementation/Interactive/CSharpResetInteractiveMenuCommand.cs b/src/VisualStudio/Core/Def/Implementation/Interactive/CSharpResetInteractiveMenuCommand.cs index 0c1bc81389e51..b7772cafb3f68 100644 --- a/src/VisualStudio/Core/Def/Implementation/Interactive/CSharpResetInteractiveMenuCommand.cs +++ b/src/VisualStudio/Core/Def/Implementation/Interactive/CSharpResetInteractiveMenuCommand.cs @@ -4,11 +4,11 @@ #nullable disable +using System.ComponentModel.Design; using Microsoft.CodeAnalysis.Editor; using Microsoft.VisualStudio.ComponentModelHost; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; -using System.ComponentModel.Design; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Interactive { diff --git a/src/VisualStudio/Core/Def/Implementation/Interactive/VisualBasicResetInteractiveMenuCommand.cs b/src/VisualStudio/Core/Def/Implementation/Interactive/VisualBasicResetInteractiveMenuCommand.cs index 8ca97337ef305..cc4cdd14ab2c1 100644 --- a/src/VisualStudio/Core/Def/Implementation/Interactive/VisualBasicResetInteractiveMenuCommand.cs +++ b/src/VisualStudio/Core/Def/Implementation/Interactive/VisualBasicResetInteractiveMenuCommand.cs @@ -4,11 +4,11 @@ #nullable disable +using System.ComponentModel.Design; using Microsoft.CodeAnalysis.Editor; using Microsoft.VisualStudio.ComponentModelHost; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; -using System.ComponentModel.Design; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Interactive { diff --git a/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractListItemFactory.cs b/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractListItemFactory.cs index ab1e2c7197596..66f1219ce17c9 100644 --- a/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractListItemFactory.cs +++ b/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractListItemFactory.cs @@ -10,9 +10,9 @@ using System.Diagnostics; using System.Linq; using System.Threading; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.LanguageServices; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Shared.Utilities; using Microsoft.VisualStudio.LanguageServices.Implementation.Library.ObjectBrowser.Lists; diff --git a/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/ObjectBrowserTaskExtensions.cs b/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/ObjectBrowserTaskExtensions.cs index 75ac5718e31dd..27dcb0cd5004d 100644 --- a/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/ObjectBrowserTaskExtensions.cs +++ b/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/ObjectBrowserTaskExtensions.cs @@ -8,9 +8,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; using Roslyn.Utilities; -using System.Threading; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Library.ObjectBrowser { diff --git a/src/VisualStudio/Core/Def/Implementation/Preview/ReferenceChange.cs b/src/VisualStudio/Core/Def/Implementation/Preview/ReferenceChange.cs index c9501b51f0f01..39997b65a9c35 100644 --- a/src/VisualStudio/Core/Def/Implementation/Preview/ReferenceChange.cs +++ b/src/VisualStudio/Core/Def/Implementation/Preview/ReferenceChange.cs @@ -7,8 +7,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.VisualStudio.Language.Intellisense; using Microsoft.VisualStudio.Shell.Interop; diff --git a/src/VisualStudio/Core/Def/Implementation/PreviewPane/PreviewPane.xaml.cs b/src/VisualStudio/Core/Def/Implementation/PreviewPane/PreviewPane.xaml.cs index ce07bc5ac6bce..4d5ac5b5e7a9c 100644 --- a/src/VisualStudio/Core/Def/Implementation/PreviewPane/PreviewPane.xaml.cs +++ b/src/VisualStudio/Core/Def/Implementation/PreviewPane/PreviewPane.xaml.cs @@ -12,12 +12,12 @@ using System.Windows.Documents; using System.Windows.Navigation; using Microsoft.CodeAnalysis.Diagnostics.Log; +using Microsoft.CodeAnalysis.Editor.Implementation.Preview; using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities; +using Microsoft.VisualStudio.Text.Differencing; using Roslyn.Utilities; -using Microsoft.CodeAnalysis.Editor.Implementation.Preview; using IVsUIShell = Microsoft.VisualStudio.Shell.Interop.IVsUIShell; using OLECMDEXECOPT = Microsoft.VisualStudio.OLE.Interop.OLECMDEXECOPT; -using Microsoft.VisualStudio.Text.Differencing; namespace Microsoft.VisualStudio.LanguageServices.Implementation.PreviewPane { diff --git a/src/VisualStudio/Core/Def/Implementation/Progression/GraphQueries/SearchGraphQuery.cs b/src/VisualStudio/Core/Def/Implementation/Progression/GraphQueries/SearchGraphQuery.cs index 9839277a77d9f..7cad8392ba633 100644 --- a/src/VisualStudio/Core/Def/Implementation/Progression/GraphQueries/SearchGraphQuery.cs +++ b/src/VisualStudio/Core/Def/Implementation/Progression/GraphQueries/SearchGraphQuery.cs @@ -7,15 +7,15 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; +using System.Runtime.ExceptionServices; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.FindSymbols; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.VisualStudio.GraphModel; using Roslyn.Utilities; -using System.Runtime.ExceptionServices; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Progression { diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeTracker.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeTracker.cs index 7a41ce6cac66e..4d92cf2c3ce43 100644 --- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeTracker.cs +++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeTracker.cs @@ -10,9 +10,9 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.ErrorReporting; -using IVsAsyncFileChangeEx = Microsoft.VisualStudio.Shell.IVsAsyncFileChangeEx; using Microsoft.VisualStudio.Shell.Interop; using Roslyn.Utilities; +using IVsAsyncFileChangeEx = Microsoft.VisualStudio.Shell.IVsAsyncFileChangeEx; namespace Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem { diff --git a/src/VisualStudio/Core/Def/Implementation/Utilities/AutomationDelegatingListView.cs b/src/VisualStudio/Core/Def/Implementation/Utilities/AutomationDelegatingListView.cs index c668c0eefa5bf..7fca803c000e1 100644 --- a/src/VisualStudio/Core/Def/Implementation/Utilities/AutomationDelegatingListView.cs +++ b/src/VisualStudio/Core/Def/Implementation/Utilities/AutomationDelegatingListView.cs @@ -5,15 +5,14 @@ #nullable disable extern alias slowautomation; - using System.Collections.Generic; using System.Linq; using System.Windows; -using slowautomation::System.Windows.Automation; using System.Windows.Automation.Peers; using System.Windows.Controls; using System.Windows.Input; using Roslyn.Utilities; +using slowautomation::System.Windows.Automation; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Utilities { diff --git a/src/VisualStudio/Core/Def/Implementation/Venus/VenusTaskExtensions.cs b/src/VisualStudio/Core/Def/Implementation/Venus/VenusTaskExtensions.cs index 28294671cedaa..480e0cd8334bd 100644 --- a/src/VisualStudio/Core/Def/Implementation/Venus/VenusTaskExtensions.cs +++ b/src/VisualStudio/Core/Def/Implementation/Venus/VenusTaskExtensions.cs @@ -8,9 +8,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; using Roslyn.Utilities; -using System.Threading; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Venus { diff --git a/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioWorkspaceStatusServiceFactory.cs b/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioWorkspaceStatusServiceFactory.cs index 6dab746014f7b..68ba817cde14f 100644 --- a/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioWorkspaceStatusServiceFactory.cs +++ b/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioWorkspaceStatusServiceFactory.cs @@ -17,9 +17,8 @@ using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.Threading; -using Task = System.Threading.Tasks.Task; - using IAsyncServiceProvider2 = Microsoft.VisualStudio.Shell.IAsyncServiceProvider2; +using Task = System.Threading.Tasks.Task; namespace Microsoft.VisualStudio.LanguageServices.Implementation { diff --git a/src/VisualStudio/Core/Def/Interactive/AbstractResetInteractiveCommand.cs b/src/VisualStudio/Core/Def/Interactive/AbstractResetInteractiveCommand.cs index e1496699080d2..307a58d36db74 100644 --- a/src/VisualStudio/Core/Def/Interactive/AbstractResetInteractiveCommand.cs +++ b/src/VisualStudio/Core/Def/Interactive/AbstractResetInteractiveCommand.cs @@ -4,12 +4,12 @@ #nullable disable +using System; using EnvDTE; using Microsoft.VisualStudio.ComponentModelHost; using Microsoft.VisualStudio.LanguageServices; using Microsoft.VisualStudio.LanguageServices.Interactive; using Microsoft.VisualStudio.Shell.Interop; -using System; namespace Roslyn.VisualStudio.Services.Interactive { diff --git a/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowProvider.cs b/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowProvider.cs index bb5c04a0853b8..27553f0d7d9aa 100644 --- a/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowProvider.cs +++ b/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowProvider.cs @@ -5,25 +5,24 @@ #nullable disable extern alias InteractiveHost; - using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; +using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Microsoft.CodeAnalysis.Editor.Interactive; +using Microsoft.CodeAnalysis.Internal.Log; using Microsoft.VisualStudio.Editor.Interactive; +using Microsoft.VisualStudio.InteractiveWindow; using Microsoft.VisualStudio.InteractiveWindow.Commands; using Microsoft.VisualStudio.InteractiveWindow.Shell; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.Text.Classification; -using Microsoft.VisualStudio.Utilities; using Microsoft.VisualStudio.Text.Editor; -using Microsoft.VisualStudio.InteractiveWindow; -using Microsoft.CodeAnalysis.Internal.Log; +using Microsoft.VisualStudio.Utilities; using Roslyn.Utilities; -using InteractiveHost::Microsoft.CodeAnalysis.Interactive; namespace Microsoft.VisualStudio.LanguageServices.Interactive { diff --git a/src/VisualStudio/Core/Def/Interactive/VsResetInteractive.cs b/src/VisualStudio/Core/Def/Interactive/VsResetInteractive.cs index e55001a37dc47..3c38b8902c02a 100644 --- a/src/VisualStudio/Core/Def/Interactive/VsResetInteractive.cs +++ b/src/VisualStudio/Core/Def/Interactive/VsResetInteractive.cs @@ -5,7 +5,6 @@ #nullable disable extern alias InteractiveHost; - using System; using System.Collections.Generic; using System.Collections.Immutable; @@ -14,6 +13,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; +using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Editor.Host; using Microsoft.CodeAnalysis.Shared.Extensions; @@ -22,9 +22,8 @@ using Microsoft.VisualStudio.InteractiveWindow; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.Text.Editor; -using Roslyn.Utilities; -using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Microsoft.VisualStudio.Utilities; +using Roslyn.Utilities; namespace Microsoft.VisualStudio.LanguageServices.Interactive { diff --git a/src/VisualStudio/Core/Def/ValueTracking/ValueTrackedTreeItemViewModel.cs b/src/VisualStudio/Core/Def/ValueTracking/ValueTrackedTreeItemViewModel.cs index af14262cd990d..e064ff8bc0b58 100644 --- a/src/VisualStudio/Core/Def/ValueTracking/ValueTrackedTreeItemViewModel.cs +++ b/src/VisualStudio/Core/Def/ValueTracking/ValueTrackedTreeItemViewModel.cs @@ -9,10 +9,10 @@ using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Navigation; using Microsoft.CodeAnalysis.Options; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.ValueTracking; using Microsoft.VisualStudio.Language.Intellisense; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.VisualStudio.Shell; namespace Microsoft.VisualStudio.LanguageServices.ValueTracking diff --git a/src/VisualStudio/Core/Def/ValueTracking/ValueTrackingToolWindow.cs b/src/VisualStudio/Core/Def/ValueTracking/ValueTrackingToolWindow.cs index 35e8fe5ab766b..9b613a3dcfff7 100644 --- a/src/VisualStudio/Core/Def/ValueTracking/ValueTrackingToolWindow.cs +++ b/src/VisualStudio/Core/Def/ValueTracking/ValueTrackingToolWindow.cs @@ -4,8 +4,8 @@ using System; using System.Linq; -using System.Windows.Controls; using System.Runtime.InteropServices; +using System.Windows.Controls; using Microsoft.VisualStudio.Shell; using Roslyn.Utilities; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/CodeElementSnapshot.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/CodeElementSnapshot.cs index 06366442f8934..ffaa7c0d2eb32 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/CodeElementSnapshot.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/CodeElementSnapshot.cs @@ -6,8 +6,8 @@ using System; using System.Collections.Immutable; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.VisualStudio; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalMemberCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalMemberCollection.cs index 8ae84323f557d..4be9be6099e6b 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalMemberCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalMemberCollection.cs @@ -6,8 +6,8 @@ using System.Collections.Immutable; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalNamespaceCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalNamespaceCollection.cs index 98863c7df7748..51b515e16fff5 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalNamespaceCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalNamespaceCollection.cs @@ -7,8 +7,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalOverloadsCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalOverloadsCollection.cs index 7abaa6666bac6..a1e409c88ae59 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalOverloadsCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalOverloadsCollection.cs @@ -6,8 +6,8 @@ using System.Collections.Immutable; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.ExternalElements; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/InheritsImplementsCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/InheritsImplementsCollection.cs index e10589427e33d..3a276fc383ea4 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/InheritsImplementsCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/InheritsImplementsCollection.cs @@ -8,8 +8,8 @@ using System.Diagnostics; using System.Linq; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.InternalElements; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/NamespaceCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/NamespaceCollection.cs index 03f81d3b3432b..a8c54eb66a0cb 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/NamespaceCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/NamespaceCollection.cs @@ -8,8 +8,8 @@ using System.Diagnostics; using System.Linq; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.InternalElements; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/OverloadsCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/OverloadsCollection.cs index a14adab265119..df9dca4b14715 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/OverloadsCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/OverloadsCollection.cs @@ -7,8 +7,8 @@ using System.Collections.Immutable; using System.Linq; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.InternalElements; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/PartialTypeCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/PartialTypeCollection.cs index df9be25dedf62..c14b577d65f75 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/PartialTypeCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/PartialTypeCollection.cs @@ -7,8 +7,8 @@ using System.Collections.Immutable; using System.Linq; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.InternalElements; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/TypeCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/TypeCollection.cs index 6e341b5093a6d..07c43dfd77b0c 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/TypeCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/TypeCollection.cs @@ -9,8 +9,8 @@ using System.Diagnostics; using System.Linq; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.InternalElements; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/ExternalElements/AbstractExternalCodeType.cs b/src/VisualStudio/Core/Impl/CodeModel/ExternalElements/AbstractExternalCodeType.cs index 1274f3c33d546..9b7cad5ba4fd8 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/ExternalElements/AbstractExternalCodeType.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/ExternalElements/AbstractExternalCodeType.cs @@ -7,8 +7,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics.CodeAnalysis; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Collections; using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities; diff --git a/src/VisualStudio/Core/Test/ObjectBrowser/Helpers.vb b/src/VisualStudio/Core/Test/ObjectBrowser/Helpers.vb index 4b01cb60f5181..98540e0e0514e 100644 --- a/src/VisualStudio/Core/Test/ObjectBrowser/Helpers.vb +++ b/src/VisualStudio/Core/Test/ObjectBrowser/Helpers.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Runtime.CompilerServices -Imports Microsoft.VisualStudio.Shell.Interop +Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces Imports Microsoft.VisualStudio.LanguageServices.Implementation.Library.ObjectBrowser Imports Microsoft.VisualStudio.LanguageServices.UnitTests.ObjectBrowser.Mocks -Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces +Imports Microsoft.VisualStudio.Shell.Interop Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ObjectBrowser Friend Module Helpers diff --git a/src/VisualStudio/LiveShare/Impl/Client/RoslynLSPClientService.cs b/src/VisualStudio/LiveShare/Impl/Client/RoslynLSPClientService.cs index 1a5916c8956c4..f90ea88064a11 100644 --- a/src/VisualStudio/LiveShare/Impl/Client/RoslynLSPClientService.cs +++ b/src/VisualStudio/LiveShare/Impl/Client/RoslynLSPClientService.cs @@ -9,12 +9,12 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.LanguageServer.Protocol; using Microsoft.VisualStudio.LiveShare; using Newtonsoft.Json.Linq; -using Task = System.Threading.Tasks.Task; using LS = Microsoft.VisualStudio.LiveShare.LanguageServices; -using Microsoft.CodeAnalysis.Host.Mef; +using Task = System.Threading.Tasks.Task; namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client { diff --git a/src/VisualStudio/LiveShare/Impl/CustomProtocol/LspRequestExtensions.cs b/src/VisualStudio/LiveShare/Impl/CustomProtocol/LspRequestExtensions.cs index 25907cadabd8f..6f72799a25ca8 100644 --- a/src/VisualStudio/LiveShare/Impl/CustomProtocol/LspRequestExtensions.cs +++ b/src/VisualStudio/LiveShare/Impl/CustomProtocol/LspRequestExtensions.cs @@ -5,8 +5,8 @@ #nullable disable using Microsoft.VisualStudio.LanguageServices.Implementation.LanguageService; -using LSP = Microsoft.VisualStudio.LanguageServer.Protocol; using LS = Microsoft.VisualStudio.LiveShare.LanguageServices; +using LSP = Microsoft.VisualStudio.LanguageServer.Protocol; namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Protocol { diff --git a/src/VisualStudio/TestUtilities2/CodeModel/CodeModelTestState.vb b/src/VisualStudio/TestUtilities2/CodeModel/CodeModelTestState.vb index cc5803a6da2f3..69265130f2cfc 100644 --- a/src/VisualStudio/TestUtilities2/CodeModel/CodeModelTestState.vb +++ b/src/VisualStudio/TestUtilities2/CodeModel/CodeModelTestState.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces Imports Microsoft.CodeAnalysis +Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces Imports Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel Imports Microsoft.VisualStudio.LanguageServices.Implementation.Interop diff --git a/src/VisualStudio/TestUtilities2/ProjectSystemShim/Framework/MockHierarchy.vb b/src/VisualStudio/TestUtilities2/ProjectSystemShim/Framework/MockHierarchy.vb index fbe57c1b08659..e9344a09f0235 100644 --- a/src/VisualStudio/TestUtilities2/ProjectSystemShim/Framework/MockHierarchy.vb +++ b/src/VisualStudio/TestUtilities2/ProjectSystemShim/Framework/MockHierarchy.vb @@ -2,14 +2,14 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.VisualStudio.Shell.Interop -Imports Microsoft.VisualStudio.OLE.Interop +Imports System.IO Imports System.Runtime.InteropServices +Imports Microsoft.VisualStudio.LanguageServices.ProjectSystem +Imports Microsoft.VisualStudio.OLE.Interop Imports Microsoft.VisualStudio.Shell -Imports Roslyn.Utilities -Imports System.IO +Imports Microsoft.VisualStudio.Shell.Interop Imports Moq -Imports Microsoft.VisualStudio.LanguageServices.ProjectSystem +Imports Roslyn.Utilities Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim.Framework Public NotInheritable Class MockHierarchy diff --git a/src/VisualStudio/TestUtilities2/PropertyChangedTestMonitor.vb b/src/VisualStudio/TestUtilities2/PropertyChangedTestMonitor.vb index f47ad8a1205b8..f999bde630118 100644 --- a/src/VisualStudio/TestUtilities2/PropertyChangedTestMonitor.vb +++ b/src/VisualStudio/TestUtilities2/PropertyChangedTestMonitor.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Linq.Expressions Imports System.ComponentModel +Imports System.Linq.Expressions Namespace Microsoft.VisualStudio.LanguageServices.UnitTests Public Class PropertyChangedTestMonitor diff --git a/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicCodeCleanupFixerProvider.vb b/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicCodeCleanupFixerProvider.vb index d1df51e52f392..850c805e40da7 100644 --- a/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicCodeCleanupFixerProvider.vb +++ b/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicCodeCleanupFixerProvider.vb @@ -1,4 +1,4 @@ -' Licensed to the .NET Foundation under one or more agreements. +' Licensed to the .NET Foundation under one or more agreements. ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. @@ -23,4 +23,4 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeCleanup MyBase.New(codeCleanUpFixers) End Sub End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/DescriptionBuilder.vb b/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/DescriptionBuilder.vb index 9a0d12b5cc9e4..36acd18072f6e 100644 --- a/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/DescriptionBuilder.vb +++ b/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/DescriptionBuilder.vb @@ -4,8 +4,8 @@ Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis -Imports Microsoft.VisualStudio.Shell.Interop Imports Microsoft.VisualStudio.LanguageServices.Implementation.Library.ObjectBrowser +Imports Microsoft.VisualStudio.Shell.Interop Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.ObjectBrowser Friend Class DescriptionBuilder diff --git a/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/ObjectBrowserLibraryManager.vb b/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/ObjectBrowserLibraryManager.vb index 7ef52cd3126ee..6675c5c1b3815 100644 --- a/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/ObjectBrowserLibraryManager.vb +++ b/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/ObjectBrowserLibraryManager.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports Microsoft.CodeAnalysis -Imports Microsoft.VisualStudio.Shell.Interop -Imports Microsoft.VisualStudio.LanguageServices.Implementation.Library.ObjectBrowser Imports Microsoft.VisualStudio.ComponentModelHost +Imports Microsoft.VisualStudio.LanguageServices.Implementation.Library.ObjectBrowser +Imports Microsoft.VisualStudio.Shell.Interop Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.ObjectBrowser Friend Class ObjectBrowserLibraryManager diff --git a/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionClassName.vb b/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionClassName.vb index 59882fec379e2..0d2efe2991548 100644 --- a/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionClassName.vb +++ b/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionClassName.vb @@ -7,8 +7,8 @@ Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.Shared.Extensions Imports Microsoft.CodeAnalysis.VisualBasic.Extensions Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.VisualStudio.Text Imports Microsoft.VisualStudio.LanguageServices.Implementation.Snippets +Imports Microsoft.VisualStudio.Text Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Snippets.SnippetFunctions Friend NotInheritable Class SnippetFunctionClassName diff --git a/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionSimpleTypeName.vb b/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionSimpleTypeName.vb index 1aff2bcfecd7e..5b487f494b120 100644 --- a/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionSimpleTypeName.vb +++ b/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionSimpleTypeName.vb @@ -6,8 +6,8 @@ Imports System.Threading Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.Simplification Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.VisualStudio.Text Imports Microsoft.VisualStudio.LanguageServices.Implementation.Snippets.SnippetFunctions +Imports Microsoft.VisualStudio.Text Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Snippets.SnippetFunctions Friend NotInheritable Class SnippetFunctionSimpleTypeName diff --git a/src/Workspaces/CSharp/Portable/CodeGeneration/ParameterGenerator.cs b/src/Workspaces/CSharp/Portable/CodeGeneration/ParameterGenerator.cs index e74ceef5ade30..c6245f3333f28 100644 --- a/src/Workspaces/CSharp/Portable/CodeGeneration/ParameterGenerator.cs +++ b/src/Workspaces/CSharp/Portable/CodeGeneration/ParameterGenerator.cs @@ -10,9 +10,8 @@ using Microsoft.CodeAnalysis.CodeGeneration; using Microsoft.CodeAnalysis.CSharp.Extensions; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Shared.Extensions; - using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.Shared.Extensions; using static Microsoft.CodeAnalysis.CodeGeneration.CodeGenerationHelpers; namespace Microsoft.CodeAnalysis.CSharp.CodeGeneration diff --git a/src/Workspaces/CSharp/Portable/Extensions/SemanticModelExtensions.cs b/src/Workspaces/CSharp/Portable/Extensions/SemanticModelExtensions.cs index 5c682c504e4e6..5f3f6d95ef6de 100644 --- a/src/Workspaces/CSharp/Portable/Extensions/SemanticModelExtensions.cs +++ b/src/Workspaces/CSharp/Portable/Extensions/SemanticModelExtensions.cs @@ -8,15 +8,15 @@ using System.Collections.Immutable; using System.Linq; using System.Threading; +using Humanizer; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp.LanguageServices; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles; +using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Shared.Utilities; using Microsoft.CodeAnalysis.Utilities; -using Humanizer; using Roslyn.Utilities; -using Microsoft.CodeAnalysis.Shared.Extensions; -using Microsoft.CodeAnalysis.CSharp.LanguageServices; namespace Microsoft.CodeAnalysis.CSharp.Extensions { diff --git a/src/Workspaces/CSharpTest/Formatting/FormattingTriviaTests.cs b/src/Workspaces/CSharpTest/Formatting/FormattingTriviaTests.cs index eb7f5943341f9..10941ddc17e68 100644 --- a/src/Workspaces/CSharpTest/Formatting/FormattingTriviaTests.cs +++ b/src/Workspaces/CSharpTest/Formatting/FormattingTriviaTests.cs @@ -5,11 +5,11 @@ #nullable disable using System.Linq; -using Microsoft.CodeAnalysis.Test.Utilities; +using System.Threading.Tasks; using Microsoft.CodeAnalysis.Formatting; +using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using System.Threading.Tasks; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Formatting { diff --git a/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs b/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs index f1c98c4de478f..d08e55cfcf188 100644 --- a/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs +++ b/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker_ResolveReferences.cs b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker_ResolveReferences.cs index cd64608f7bc44..5b1c167ea3511 100644 --- a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker_ResolveReferences.cs +++ b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker_ResolveReferences.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.cs b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.cs index ad504f88f359a..2f323d373ff82 100644 --- a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.cs +++ b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/Extensions.cs b/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/Extensions.cs index eec1823393a06..a21ee61b0a180 100644 --- a/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/Extensions.cs +++ b/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/Extensions.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Workspaces/Core/MSBuild/MSBuild/ProjectMap.cs b/src/Workspaces/Core/MSBuild/MSBuild/ProjectMap.cs index cae640133d341..242809c13f33d 100644 --- a/src/Workspaces/Core/MSBuild/MSBuild/ProjectMap.cs +++ b/src/Workspaces/Core/MSBuild/MSBuild/ProjectMap.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Workspaces/Core/Portable/Classification/AbstractClassificationService.cs b/src/Workspaces/Core/Portable/Classification/AbstractClassificationService.cs index d25611e3fcb6e..66269ab783707 100644 --- a/src/Workspaces/Core/Portable/Classification/AbstractClassificationService.cs +++ b/src/Workspaces/Core/Portable/Classification/AbstractClassificationService.cs @@ -8,10 +8,10 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis.Extensions; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.ReassignedVariable; using Microsoft.CodeAnalysis.Remote; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Text; -using Microsoft.CodeAnalysis.ReassignedVariable; namespace Microsoft.CodeAnalysis.Classification { diff --git a/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs b/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs index 0148466ebcc7e..6e5f47622c7cb 100644 --- a/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs +++ b/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs @@ -7,8 +7,8 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.ErrorReporting; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Options.EditorConfig { diff --git a/src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs b/src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs index 4ea7f93f3debe..4f77bdfce35f1 100644 --- a/src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs +++ b/src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs @@ -8,8 +8,8 @@ using System.IO.Pipelines; using System.Threading; using System.Threading.Tasks; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.Host; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Remote { diff --git a/src/Workspaces/Core/Portable/Rename/RenameLocation.ReferenceProcessing.cs b/src/Workspaces/Core/Portable/Rename/RenameLocation.ReferenceProcessing.cs index 0fbb42ff3b1a9..b7a6562be21d6 100644 --- a/src/Workspaces/Core/Portable/Rename/RenameLocation.ReferenceProcessing.cs +++ b/src/Workspaces/Core/Portable/Rename/RenameLocation.ReferenceProcessing.cs @@ -4,8 +4,11 @@ using System; using System.Collections.Generic; +using System.Collections.Immutable; using System.Diagnostics; using System.Linq; +using System.Text; +using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.FindSymbols; @@ -14,9 +17,6 @@ using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System.Text.RegularExpressions; -using System.Collections.Immutable; -using System.Text; namespace Microsoft.CodeAnalysis.Rename { diff --git a/src/Workspaces/Core/Portable/Rename/Renamer.RenameSymbolDocumentAction.cs b/src/Workspaces/Core/Portable/Rename/Renamer.RenameSymbolDocumentAction.cs index 023f3a26b0f94..16e518ed34fd5 100644 --- a/src/Workspaces/Core/Portable/Rename/Renamer.RenameSymbolDocumentAction.cs +++ b/src/Workspaces/Core/Portable/Rename/Renamer.RenameSymbolDocumentAction.cs @@ -4,12 +4,12 @@ using System.Collections.Immutable; using System.Globalization; +using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.LanguageServices; using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Shared.Extensions; -using System.Linq; using Microsoft.CodeAnalysis.Utilities; namespace Microsoft.CodeAnalysis.Rename diff --git a/src/Workspaces/Core/Portable/SymbolKey/SymbolKey.TupleTypeSymbolKey.cs b/src/Workspaces/Core/Portable/SymbolKey/SymbolKey.TupleTypeSymbolKey.cs index 26bb5a200a1b4..3316f77f2a944 100644 --- a/src/Workspaces/Core/Portable/SymbolKey/SymbolKey.TupleTypeSymbolKey.cs +++ b/src/Workspaces/Core/Portable/SymbolKey/SymbolKey.TupleTypeSymbolKey.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using System; -using System.Linq; using System.Collections.Immutable; using System.Diagnostics; +using System.Linq; using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.CodeAnalysis diff --git a/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/TaskSchedulerProvider.cs b/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/TaskSchedulerProvider.cs index 7ba81127bffa6..9368b5fe79c08 100644 --- a/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/TaskSchedulerProvider.cs +++ b/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/TaskSchedulerProvider.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.Host.Mef; using System; using System.Composition; using System.Threading; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.Host.Mef; namespace Microsoft.CodeAnalysis.Host { diff --git a/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/WorkspaceAsynchronousOperationListenerProvider.cs b/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/WorkspaceAsynchronousOperationListenerProvider.cs index 431161c07ebb8..1427894468b42 100644 --- a/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/WorkspaceAsynchronousOperationListenerProvider.cs +++ b/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/WorkspaceAsynchronousOperationListenerProvider.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.CodeAnalysis.Shared.TestHooks; using System; using System.Composition; +using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.CodeAnalysis.Shared.TestHooks; namespace Microsoft.CodeAnalysis.Host { diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/Checksum_Factory.cs b/src/Workspaces/Core/Portable/Workspace/Solution/Checksum_Factory.cs index 40099c259dfdc..3df26598044a5 100644 --- a/src/Workspaces/Core/Portable/Workspace/Solution/Checksum_Factory.cs +++ b/src/Workspaces/Core/Portable/Workspace/Solution/Checksum_Factory.cs @@ -7,14 +7,14 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; using System.IO; -using System.Security.Cryptography; using System.Runtime.InteropServices; +using System.Security.Cryptography; using System.Threading; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Serialization; using Roslyn.Utilities; -using System.Diagnostics; namespace Microsoft.CodeAnalysis { diff --git a/src/Workspaces/CoreTest/Differencing/LongestCommonSubsequenceTests.cs b/src/Workspaces/CoreTest/Differencing/LongestCommonSubsequenceTests.cs index 76bd073234001..ed39996eed540 100644 --- a/src/Workspaces/CoreTest/Differencing/LongestCommonSubsequenceTests.cs +++ b/src/Workspaces/CoreTest/Differencing/LongestCommonSubsequenceTests.cs @@ -5,9 +5,9 @@ #nullable disable using System; +using System.Collections.Generic; using System.Text; using Xunit; -using System.Collections.Generic; namespace Microsoft.CodeAnalysis.Differencing.UnitTests { diff --git a/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs b/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs index 5978c4fc4b511..f9ef136d18e51 100644 --- a/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs +++ b/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs @@ -32,8 +32,8 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using CS = Microsoft.CodeAnalysis.CSharp; using static Microsoft.CodeAnalysis.UnitTests.SolutionTestHelpers; +using CS = Microsoft.CodeAnalysis.CSharp; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Workspaces/CoreTest/WorkspaceTests/GeneralWorkspaceTests.cs b/src/Workspaces/CoreTest/WorkspaceTests/GeneralWorkspaceTests.cs index 725174528d573..a101afa53eec8 100644 --- a/src/Workspaces/CoreTest/WorkspaceTests/GeneralWorkspaceTests.cs +++ b/src/Workspaces/CoreTest/WorkspaceTests/GeneralWorkspaceTests.cs @@ -4,11 +4,11 @@ #nullable disable +using System; using Microsoft.CodeAnalysis.Host; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Xunit; -using System; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Workspaces/MSBuildTest/MSBuildWorkspaceTests.cs b/src/Workspaces/MSBuildTest/MSBuildWorkspaceTests.cs index 2e88834903b65..2a049e2ad5432 100644 --- a/src/Workspaces/MSBuildTest/MSBuildWorkspaceTests.cs +++ b/src/Workspaces/MSBuildTest/MSBuildWorkspaceTests.cs @@ -25,8 +25,8 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using static Microsoft.CodeAnalysis.MSBuild.UnitTests.SolutionGeneration; using static Microsoft.CodeAnalysis.CSharp.LanguageVersionFacts; +using static Microsoft.CodeAnalysis.MSBuild.UnitTests.SolutionGeneration; using CS = Microsoft.CodeAnalysis.CSharp; using VB = Microsoft.CodeAnalysis.VisualBasic; diff --git a/src/Workspaces/Remote/Core/SolutionAssetProvider.cs b/src/Workspaces/Remote/Core/SolutionAssetProvider.cs index 5323a236e5866..c59a0d7d115a1 100644 --- a/src/Workspaces/Remote/Core/SolutionAssetProvider.cs +++ b/src/Workspaces/Remote/Core/SolutionAssetProvider.cs @@ -15,8 +15,8 @@ using Microsoft.CodeAnalysis.Host; using Microsoft.CodeAnalysis.Serialization; using Microsoft.VisualStudio.Threading; -using Roslyn.Utilities; using Nerdbank.Streams; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Remote { diff --git a/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.SolutionCreator.cs b/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.SolutionCreator.cs index b1e4b22cebb2a..054563ce21b23 100644 --- a/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.SolutionCreator.cs +++ b/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.SolutionCreator.cs @@ -2,19 +2,19 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.ErrorReporting; +using Microsoft.CodeAnalysis.Host; +using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Serialization; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using System; -using Microsoft.CodeAnalysis.Options; -using Microsoft.CodeAnalysis.ErrorReporting; -using Microsoft.CodeAnalysis.Host; namespace Microsoft.CodeAnalysis.Remote { diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Formatting/CSharpFormattingOptions2.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Formatting/CSharpFormattingOptions2.cs index cc4d342d9f158..b8832955c6c92 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Formatting/CSharpFormattingOptions2.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Formatting/CSharpFormattingOptions2.cs @@ -4,8 +4,8 @@ using System.Collections.Immutable; using System.Diagnostics; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.Options; +using Roslyn.Utilities; #if CODE_STYLE using CSharpWorkspaceResources = Microsoft.CodeAnalysis.CSharp.CSharpCodeStyleResources; diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/FormattingOptions2.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/FormattingOptions2.cs index 3e3a9dc2fbfe0..54a99aa74136d 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/FormattingOptions2.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/FormattingOptions2.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Immutable; -using Roslyn.Utilities; using Microsoft.CodeAnalysis.Options; +using Roslyn.Utilities; #if CODE_STYLE using WorkspacesResources = Microsoft.CodeAnalysis.CodeStyleResources; diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/Rules/Operations/FormattingOperations.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/Rules/Operations/FormattingOperations.cs index 2bc00ddbaf6b1..08be1a345bb7c 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/Rules/Operations/FormattingOperations.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/Rules/Operations/FormattingOperations.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; +using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Shared.Utilities; using Microsoft.CodeAnalysis.Text; -using Microsoft.CodeAnalysis.Diagnostics; namespace Microsoft.CodeAnalysis.Formatting.Rules { diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/AbstractDocumentationCommentService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/AbstractDocumentationCommentService.cs index 4f08f053b65bf..1a8840ef9e32d 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/AbstractDocumentationCommentService.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/AbstractDocumentationCommentService.cs @@ -6,9 +6,9 @@ using System.Diagnostics; using System.Linq; +using System.Text; using System.Threading; using Roslyn.Utilities; -using System.Text; namespace Microsoft.CodeAnalysis.LanguageServices { diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/BKTree.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/BKTree.cs index 4cabf69b29df9..4004feae54eb1 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/BKTree.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/BKTree.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Utilities; -using System; namespace Roslyn.Utilities { diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ContextQuery/SyntaxTreeExtensions.vb b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ContextQuery/SyntaxTreeExtensions.vb index 610820363645e..430998296ed06 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ContextQuery/SyntaxTreeExtensions.vb +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ContextQuery/SyntaxTreeExtensions.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System.Runtime.CompilerServices +Imports System.Threading Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.Utilities -Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions.ContextQuery Friend Module SyntaxTreeExtensions diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ParameterSyntaxExtensions.vb b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ParameterSyntaxExtensions.vb index b5331f3297c29..ccc67843337a2 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ParameterSyntaxExtensions.vb +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ParameterSyntaxExtensions.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System.Runtime.CompilerServices +Imports System.Threading Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.Utilities -Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions Friend Module ParameterSyntaxExtensions diff --git a/src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicCodeGenerationServiceFactory.vb b/src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicCodeGenerationServiceFactory.vb index ca86268e822da..04bf283872943 100644 --- a/src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicCodeGenerationServiceFactory.vb +++ b/src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicCodeGenerationServiceFactory.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports System.Composition +Imports Microsoft.CodeAnalysis.CodeGeneration Imports Microsoft.CodeAnalysis.Host Imports Microsoft.CodeAnalysis.Host.Mef -Imports Microsoft.CodeAnalysis.CodeGeneration -Imports System.Composition Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGeneration diff --git a/src/Workspaces/VisualBasic/Portable/Extensions/SemanticModelExtensions.vb b/src/Workspaces/VisualBasic/Portable/Extensions/SemanticModelExtensions.vb index 7d59fb71e21f1..f04026d8e8bad 100644 --- a/src/Workspaces/VisualBasic/Portable/Extensions/SemanticModelExtensions.vb +++ b/src/Workspaces/VisualBasic/Portable/Extensions/SemanticModelExtensions.vb @@ -8,8 +8,8 @@ Imports System.Threading Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles Imports Microsoft.CodeAnalysis.Utilities -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions Partial Friend Module SemanticModelExtensions diff --git a/src/Workspaces/VisualBasic/Portable/Serialization/VisualBasicOptionsSerializationService.vb b/src/Workspaces/VisualBasic/Portable/Serialization/VisualBasicOptionsSerializationService.vb index 7d57111fce0ca..5f8cad0a1341f 100644 --- a/src/Workspaces/VisualBasic/Portable/Serialization/VisualBasicOptionsSerializationService.vb +++ b/src/Workspaces/VisualBasic/Portable/Serialization/VisualBasicOptionsSerializationService.vb @@ -5,8 +5,8 @@ Imports System.Collections.Immutable Imports System.Composition Imports System.Threading -Imports Microsoft.CodeAnalysis.Serialization Imports Microsoft.CodeAnalysis.Host.Mef +Imports Microsoft.CodeAnalysis.Serialization Namespace Microsoft.CodeAnalysis.VisualBasic.Serialization diff --git a/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.Expander.vb b/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.Expander.vb index 0fb536a4880ed..bd16c7c09dce2 100644 --- a/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.Expander.vb +++ b/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.Expander.vb @@ -5,9 +5,9 @@ Imports System.Threading Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.Simplification +Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.ContextQuery Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.Utilities -Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.ContextQuery Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification Partial Friend Class VisualBasicSimplificationService diff --git a/src/Workspaces/VisualBasicTest/OrganizeImports/OrganizeImportsTests.vb b/src/Workspaces/VisualBasicTest/OrganizeImports/OrganizeImportsTests.vb index c70ebd02137dc..a0f6abcac81bd 100644 --- a/src/Workspaces/VisualBasicTest/OrganizeImports/OrganizeImportsTests.vb +++ b/src/Workspaces/VisualBasicTest/OrganizeImports/OrganizeImportsTests.vb @@ -5,12 +5,12 @@ Imports System.Threading Imports Microsoft.CodeAnalysis.Editing Imports Microsoft.CodeAnalysis.Formatting +Imports Microsoft.CodeAnalysis.Options +Imports Microsoft.CodeAnalysis.[Shared].Extensions Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.Options Imports Roslyn.Test.Utilities Imports Xunit -Imports Microsoft.CodeAnalysis.[Shared].Extensions Namespace Microsoft.CodeAnalysis.VisualBasic.Workspaces.UnitTests.OrganizeImports <[UseExportProvider]> diff --git a/src/Workspaces/VisualBasicTest/VisualBasicExtensionsTests.vb b/src/Workspaces/VisualBasicTest/VisualBasicExtensionsTests.vb index 91f875cafeea6..0e24ae1e2d0e9 100644 --- a/src/Workspaces/VisualBasicTest/VisualBasicExtensionsTests.vb +++ b/src/Workspaces/VisualBasicTest/VisualBasicExtensionsTests.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Text +Imports System.Threading +Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.SyntaxTreeExtensions Imports Roslyn.Test.Utilities Imports Xunit -Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.SyntaxTreeExtensions -Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests From 40c25c2e1157660cbcca3548af6102d54e53b7cb Mon Sep 17 00:00:00 2001 From: Andrew Hall Date: Thu, 17 Jun 2021 16:37:28 -0700 Subject: [PATCH 13/24] Add ignore-revs file for formatting change --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000000000..dfb46f6f9249f --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Dotnet-format -w Roslyn.sln +57278e7dcbf7bffb310e8b14105f657f0fdbab78 \ No newline at end of file From f4363b7acd20d41ae757418b4a070bb90918fc9f Mon Sep 17 00:00:00 2001 From: Andrew Hall Date: Fri, 18 Jun 2021 14:50:33 -0700 Subject: [PATCH 14/24] Update dotnet-format version --- dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet-tools.json b/dotnet-tools.json index 10d642464725d..6ab0998319770 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -2,7 +2,7 @@ "isRoot": true, "tools": { "dotnet-format": { - "version": "5.0.141503", + "version": "6.0.231801", "commands": [ "dotnet-format" ] From fbdb56063e761643707f6bc1e1ba469f6fb9a31a Mon Sep 17 00:00:00 2001 From: Andrew Hall Date: Fri, 18 Jun 2021 14:51:19 -0700 Subject: [PATCH 15/24] Revert "dotnet-format -w Roslyn.sln" This reverts commit 57278e7dcbf7bffb310e8b14105f657f0fdbab78. --- ...atchFolderAndNamespaceDiagnosticAnalyzer.cs | 6 +++--- .../Helpers/UseExpressionBodyHelper.cs | 2 +- .../CSharpUsePatternCombinatorsAnalyzer.cs | 2 +- ...mentToExpressionCodeFixProvider.Rewriter.cs | 2 +- ...CSharpRemoveUnusedMembersCodeFixProvider.cs | 4 ++-- .../AbstractOrderModifiersCodeFixProvider.cs | 4 ++-- ...alExpressionForAssignmentCodeFixProvider.cs | 4 ++-- ...AccessibilityModifiersDiagnosticAnalyzer.vb | 2 +- ...opulateSwitchStatementDiagnosticAnalyzer.vb | 2 +- ...UnnecessaryParenthesesDiagnosticAnalyzer.vb | 10 +++++----- ...sicSimplifyConditionalDiagnosticAnalyzer.vb | 4 ++-- ...cUseCompoundAssignmentDiagnosticAnalyzer.vb | 2 +- .../QualifyMemberAccessTests.vb | 2 +- .../UseIsNullCheckForReferenceEqualsTests.vb | 2 +- .../Analyzers/Formatting/FormatterHelper.cs | 2 +- .../Portable/Binder/Binder_Deconstruct.cs | 2 +- .../Portable/Binder/Binder_Expressions.cs | 10 +++++----- .../CSharp/Portable/Binder/Binder_Flags.cs | 2 +- .../Portable/Binder/Binder_QueryErrors.cs | 2 +- .../Portable/Binder/Binder_XmlNameAttribute.cs | 2 +- .../Portable/Binder/ExecutableCodeBinder.cs | 8 ++++---- .../Binder/ExpressionListVariableBinder.cs | 4 ++-- .../Binder/ExpressionVariableBinder.cs | 2 +- .../Binder/ExpressionVariableFinder.cs | 4 ++-- .../CSharp/Portable/Binder/ForLoopBinder.cs | 2 +- .../Portable/Binder/LocalBinderFactory.cs | 6 +++--- .../CSharp/Portable/Binder/LockBinder.cs | 2 +- .../Portable/Binder/MethodArgumentInfo.cs | 2 +- .../Portable/Binder/ScriptLocalScopeBinder.cs | 2 +- .../Binder/Semantics/Conversions/Conversion.cs | 8 ++++---- .../Semantics/Conversions/TypeConversions.cs | 4 ++-- .../Conversions/UserDefinedConversions.cs | 2 +- .../UserDefinedExplicitConversions.cs | 2 +- .../Portable/Binder/SimpleLocalScopeBinder.cs | 4 ++-- .../CSharp/Portable/Binder/TypeofBinder.cs | 2 +- .../CSharp/Portable/Binder/WhileBinder.cs | 4 ++-- .../BoundTree/BoundDiscardExpression.cs | 2 +- .../Portable/BoundTree/BoundExpression.cs | 2 +- .../Portable/BoundTree/BoundTreeRewriter.cs | 4 ++-- .../Portable/BoundTree/BoundTreeVisitors.cs | 4 ++-- .../CSharp/Portable/BoundTree/Formatting.cs | 4 ++-- .../OutDeconstructVarPendingInference.cs | 2 +- .../BoundTree/VariablePendingInference.cs | 8 ++++---- .../Compilation/LexicalOrderSymbolComparer.cs | 2 +- .../MemberSemanticModel.NodeMapBuilder.cs | 6 +++--- .../Portable/Compilation/QueryClauseInfo.cs | 2 +- .../Compilation/SyntaxAndDeclarationManager.cs | 2 +- .../CSharp/Portable/Compilation/TypeInfo.cs | 2 +- ...ocumentationCommentIDVisitor.PartVisitor.cs | 2 +- .../PEDocumentationCommentUtils.cs | 2 +- .../EditAndContinue/CSharpSymbolMatcher.cs | 10 +++++----- .../Emitter/Model/AssemblyReference.cs | 4 ++-- .../Emitter/Model/CustomModifierAdapter.cs | 2 +- .../Model/GenericTypeInstanceReference.cs | 8 ++++---- .../Model/SourceAssemblySymbolAdapter.cs | 2 +- ...alizedGenericNestedTypeInstanceReference.cs | 4 ++-- .../Model/SpecializedNestedTypeReference.cs | 2 +- .../Model/TypeParameterSymbolAdapter.cs | 6 +++--- .../Portable/Emitter/NoPia/EmbeddedEvent.cs | 2 +- .../Portable/Emitter/NoPia/EmbeddedField.cs | 4 ++-- .../Emitter/NoPia/EmbeddedParameter.cs | 8 ++++---- .../Emitter/NoPia/EmbeddedTypeParameter.cs | 4 ++-- .../Emitter/NoPia/EmbeddedTypesManager.cs | 2 +- .../FlowAnalysis/DataFlowsOutWalker.cs | 4 ++-- .../DefiniteAssignment.LocalFunctions.cs | 2 +- .../FlowAnalysis/EmptyStructTypeCache.cs | 2 +- .../Portable/FlowAnalysis/FlowAnalysisPass.cs | 2 +- .../Portable/FlowAnalysis/ReadWriteWalker.cs | 4 ++-- .../FlowAnalysis/VariablesDeclaredWalker.cs | 2 +- .../LambdaCapturedVariable.cs | 2 +- .../SynthesizedClosureMethod.cs | 4 ++-- .../Instrumentation/DebugInfoInjector.cs | 6 +++--- ...tateMachineRewriter.IteratorFinallyFrame.cs | 2 +- ...StateMachineRewriter.YieldsInTryAnalysis.cs | 2 +- .../IteratorMethodToStateMachineRewriter.cs | 8 ++++---- .../LocalRewriter/DynamicSiteContainer.cs | 2 +- .../LocalRewriter/LocalRewriter_Call.cs | 2 +- .../LocalRewriter/LocalRewriter_DoStatement.cs | 2 +- .../LocalRewriter/LocalRewriter_Event.cs | 2 +- .../LocalRewriter/LocalRewriter_IfStatement.cs | 2 +- ..._ObjectOrCollectionInitializerExpression.cs | 6 +++--- .../LocalRewriter/LocalRewriter_Range.cs | 6 +++--- .../LocalRewriter/LocalRewriter_StackAlloc.cs | 2 +- .../LocalRewriter_StringInterpolation.cs | 2 +- .../LocalRewriter_TupleCreationExpression.cs | 4 ++-- .../LocalRewriter_WhileStatement.cs | 2 +- .../Lowering/SynthesizedSubmissionFields.cs | 2 +- .../CSharp/Portable/Parser/Blender.Cursor.cs | 2 +- .../CSharp/Portable/Parser/LexerCache.cs | 2 +- .../Portable/Parser/Lexer_StringLiteral.cs | 4 ++-- .../SourceGeneration/CSharpGeneratorDriver.cs | 2 +- .../AnonymousType.SynthesizedMethodBase.cs | 2 +- .../Symbols/Attributes/AttributeData.cs | 6 +++--- .../Symbols/Attributes/SourceAttributeData.cs | 4 ++-- .../Portable/Symbols/ConstantValueUtils.cs | 2 +- .../Portable/Symbols/ConstraintsHelper.cs | 2 +- .../CSharp/Portable/Symbols/ErrorTypeSymbol.cs | 2 +- .../Symbols/Metadata/PE/PEEventSymbol.cs | 8 ++++---- .../Metadata/PE/PEGlobalNamespaceSymbol.cs | 10 +++++----- .../Symbols/Metadata/PE/PENamedTypeSymbol.cs | 2 +- .../Symbols/Metadata/PE/PENamespaceSymbol.cs | 4 ++-- .../Metadata/PE/PENestedNamespaceSymbol.cs | 2 +- .../Symbols/Metadata/PE/TupleTypeDecoder.cs | 4 ++-- .../Portable/Symbols/MethodSymbolExtensions.cs | 8 ++++---- .../Portable/Symbols/MissingModuleSymbol.cs | 4 ++-- .../Portable/Symbols/MissingNamespaceSymbol.cs | 2 +- .../Symbols/NonMissingAssemblySymbol.cs | 2 +- .../Symbols/OverriddenOrHiddenMembersResult.cs | 2 +- .../Portable/Symbols/PointerTypeSymbol.cs | 2 +- .../Portable/Symbols/ReferenceManager.cs | 5 +++-- .../Retargeting/RetargetingAssemblySymbol.cs | 8 ++++---- .../Retargeting/RetargetingEventSymbol.cs | 8 ++++---- .../Retargeting/RetargetingFieldSymbol.cs | 2 +- .../Retargeting/RetargetingNamespaceSymbol.cs | 6 +++--- .../Retargeting/RetargetingSymbolTranslator.cs | 2 +- .../RetargetingTypeParameterSymbol.cs | 4 ++-- .../Symbols/SignatureOnlyMethodSymbol.cs | 4 ++-- .../Symbols/Source/CustomModifierUtils.cs | 4 ++-- .../Symbols/Source/SourceEventSymbol.cs | 8 ++++---- .../Symbols/Source/SourceMemberFieldSymbol.cs | 8 ++++---- .../Source/SourceNamedTypeSymbol_Bases.cs | 4 ++-- .../Portable/Symbols/SubstitutedFieldSymbol.cs | 2 +- .../Portable/Symbols/SymbolCompletionState.cs | 4 ++-- .../Portable/Symbols/SymbolDistinguisher.cs | 4 ++-- .../Synthesized/SynthesizedContainer.cs | 2 +- .../SynthesizedEmbeddedAttributeSymbol.cs | 6 +++--- .../SynthesizedEnumValueFieldSymbol.cs | 2 +- .../Synthesized/SynthesizedFieldSymbolBase.cs | 2 +- .../SynthesizedInteractiveInitializerMethod.cs | 4 ++-- .../SynthesizedIntrinsicOperatorSymbol.cs | 2 +- .../Symbols/SynthesizedNamespaceSymbol.cs | 4 ++-- .../Symbols/Tuples/TupleFieldSymbol.cs | 2 +- .../Symbols/Wrapped/WrappedParameterSymbol.cs | 2 +- .../Portable/Syntax/EventDeclarationSyntax.cs | 2 +- .../Syntax/IndexerDeclarationSyntax.cs | 2 +- .../SyntaxToken.SyntaxLiteral.cs | 2 +- .../Syntax/PropertyDeclarationSyntax.cs | 2 +- .../Emit/Attributes/AttributeTests_Embedded.cs | 2 +- .../Attributes/AttributeTests_IsUnmanaged.cs | 6 +++--- .../AttributeTests_ReadOnlyStruct.cs | 4 ++-- .../Attributes/EmitTestStrongNameProvider.cs | 2 +- .../Attributes/WellKnownAttributesTestBase.cs | 6 +++--- .../Test/Emit/CodeGen/CodeGenCapturing.cs | 12 ++++++------ .../Test/Emit/CodeGen/CodeGenIterators.cs | 2 +- .../Test/Emit/CodeGen/CodeGenOperators.cs | 4 ++-- .../Test/Emit/CodeGen/CodeGenTupleTest.cs | 2 +- .../CSharp/Test/Emit/CodeGen/EventTests.cs | 4 ++-- .../Test/Emit/CodeGen/FixedSizeBufferTests.cs | 4 ++-- .../Test/Emit/CodeGen/WinMdDelegateTests.cs | 8 ++++---- .../Test/Emit/Emit/DeterministicTests.cs | 6 +++--- .../DynamicInstrumentationTests.cs | 2 +- .../Test/Emit/Emit/EmitCustomModifiers.cs | 2 +- .../CSharp/Test/Emit/Emit/EmitErrorTests.cs | 4 ++-- .../CSharp/Test/Emit/Emit/EndToEndTests.cs | 8 ++++---- .../CSharp/Test/Emit/Emit/ResourceTests.cs | 2 +- .../CSharp/Test/Emit/PrivateProtected.cs | 4 ++-- .../IOperationTests_ISymbolInitializer.cs | 2 +- .../IOperationTests_InvalidExpression.cs | 2 +- .../IOperationTests_InvalidStatement.cs | 2 +- .../Diagnostics/OperationAnalyzerTests.cs | 2 +- .../Test/Semantic/FlowAnalysis/StructTests.cs | 2 +- .../Semantic/Semantics/AwaitExpressionTests.cs | 2 +- .../Semantic/Semantics/BetterCandidates.cs | 6 +++--- .../Test/Semantic/Semantics/BindingTests.cs | 2 +- .../Test/Semantic/Semantics/DynamicTests.cs | 8 ++++---- .../Semantics/ExpressionBodiedMemberTests.cs | 2 +- .../Test/Semantic/Semantics/FuzzTests.cs | 2 +- .../Test/Semantic/Semantics/ImportsTests.cs | 2 +- .../Semantics/InteractiveUsingTests.cs | 2 +- .../Semantic/Semantics/InterpolationTests.cs | 2 +- .../Test/Semantic/Semantics/IteratorTests.cs | 10 +++++----- .../Semantic/Semantics/LocalFunctionTests.cs | 6 +++--- .../Semantics/MemberResolutionResultTests.cs | 2 +- .../Test/Semantic/Semantics/NameLengthTests.cs | 4 ++-- .../Test/Semantic/Semantics/NameOfTests.cs | 4 ++-- .../Test/Semantic/Semantics/OperatorTests.cs | 4 ++-- .../Test/Semantic/Semantics/OutVarTests.cs | 4 ++-- .../Semantics/OverloadResolutionPerfTests.cs | 4 ++-- .../Semantics/OverloadResolutionTestBase.cs | 10 +++++----- .../Semantics/PatternMatchingTestBase.cs | 2 +- .../Semantics/PatternMatchingTests_Global.cs | 2 +- .../Semantic/Semantics/PropertyAccessTests.cs | 4 ++-- .../Semantic/Semantics/ReadOnlyStructsTests.cs | 2 +- .../Semantics/RefExtensionMethodsTests.cs | 2 +- .../Semantics/RefLocalsAndReturnsTests.cs | 10 +++++----- .../Test/Semantic/Semantics/StructsTests.cs | 2 +- .../Test/Semantic/Semantics/SwitchTests.cs | 2 +- .../Semantic/Semantics/SyntaxTreeRootTests.cs | 6 +++--- .../Semantics/TargetTypedDefaultTests.cs | 4 ++-- .../Test/Semantic/Semantics/TypeOfTests.cs | 2 +- .../Semantic/Semantics/WarningVersionTests.cs | 2 +- .../Symbol/Compilation/CompilationAPITests.cs | 6 +++--- .../Symbol/Compilation/QueryClauseInfoTests.cs | 2 +- .../Symbols/AnonymousTypesSymbolTests.cs | 6 +++--- .../Symbol/Symbols/ExtensionMethodTests.cs | 2 +- .../Symbols/Metadata/PE/BaseTypeResolution.cs | 6 +++--- .../Symbols/Metadata/PE/LoadingEvents.cs | 4 ++-- .../Symbols/Metadata/PE/LoadingFields.cs | 4 ++-- .../Symbols/Metadata/PE/LoadingIndexers.cs | 2 +- .../Symbols/Metadata/PE/LoadingMethods.cs | 4 ++-- .../Test/Symbol/Symbols/Retargeting/NoPia.cs | 2 +- .../Retargeting/RetargetCustomAttributes.cs | 2 +- .../Retargeting/RetargetCustomModifiers.cs | 4 ++-- .../Symbols/Retargeting/RetargetingTests.cs | 2 +- .../Symbol/Symbols/Source/BaseClassTests.cs | 2 +- .../Test/Symbol/Symbols/Source/EventTests.cs | 4 ++-- .../Source/ExpressionBodiedPropertyTests.cs | 4 ++-- .../Test/Symbol/Symbols/Source/MethodTests.cs | 2 +- .../Symbol/Symbols/Source/PropertyTests.cs | 4 ++-- .../Symbol/Symbols/Source/UsingAliasTests.cs | 2 +- .../Symbol/Symbols/SymbolExtensionTests.cs | 2 +- .../Test/Symbol/Symbols/TypedConstantTests.cs | 2 +- .../DiagnosticTest.MockSyntaxTree.cs | 6 +++--- .../Syntax/LexicalAndXml/XmlDocCommentTests.cs | 4 ++-- .../Test/Syntax/Parsing/AsyncParsingTests.cs | 2 +- .../Test/Syntax/Parsing/CrefParsingTests.cs | 4 ++-- .../Parsing/LocalFunctionParsingTests.cs | 2 +- .../Syntax/Parsing/ParserRegressionTests.cs | 6 +++--- .../Test/Syntax/Parsing/ReadOnlyStructs.cs | 2 +- .../Test/Syntax/Parsing/RefReadonlyTests.cs | 2 +- .../CSharp/Test/Syntax/Parsing/RefStructs.cs | 2 +- .../StackAllocInitializerParsingTests.cs | 2 +- .../Test/Syntax/Parsing/ValueTupleTests.cs | 2 +- .../Test/Syntax/Syntax/ChildSyntaxListTests.cs | 2 +- .../Test/Syntax/Syntax/SyntaxFactoryTests.cs | 2 +- .../Test/Syntax/Syntax/SyntaxListTests.cs | 6 +++--- .../Syntax/SyntaxNodeOrTokenListTests.cs | 2 +- .../Test/Syntax/Syntax/SyntaxNodeTests.cs | 2 +- .../Syntax/Syntax/SyntaxNormalizerTests.cs | 2 +- .../Test/Syntax/Syntax/SyntaxTokenListTests.cs | 2 +- .../Syntax/Syntax/SyntaxTriviaListTests.cs | 2 +- .../Test/WinRT/CodeGen/WinRTCollectionTests.cs | 4 ++-- .../Test/WinRT/Metadata/WinMdEventTests.cs | 4 ++-- .../Test/WinRT/Metadata/WinMdMetadataTests.cs | 8 ++++++-- .../Core/CodeAnalysisTest/CommonSyntaxTests.cs | 2 +- .../CommonTypedConstantTests.cs | 6 +++--- .../CodeAnalysisTest/CryptoBlobParserTests.cs | 2 +- ...SuppressMessageTargetSymbolResolverTests.cs | 4 ++-- .../Core/CodeAnalysisTest/EmbeddedTextTests.cs | 8 ++++---- .../SpecializedCollectionsTests.cs | 2 +- .../InternalUtilities/StreamExtensionsTests.cs | 4 ++-- .../AssemblyMetadataTests.cs | 2 +- .../FusionAssemblyIdentityTests.cs | 2 +- .../FusionAssemblyPortabilityPolicy.cs | 4 ++-- .../MetadataReferenceTests.cs | 2 +- .../MetadataReferences/ModuleMetadataTests.cs | 4 ++-- .../CodeAnalysisTest/SourceFileResolverTest.cs | 4 ++-- .../CodeAnalysisTest/Text/StringTextTest.cs | 10 +++++----- .../CodeAnalysisTest/VersionHelperTests.cs | 2 +- .../Core/CodeAnalysisTest/Win32Res.cs | 6 +++--- .../Core/CommandLine/BuildProtocol.cs | 2 +- .../Core/CommandLine/CompilerServerLogger.cs | 2 +- src/Compilers/Core/CommandLine/ConsoleUtil.cs | 2 +- src/Compilers/Core/MSBuildTask/Csc.cs | 2 +- .../Core/MSBuildTask/ManagedCompiler.cs | 4 ++-- .../Core/MSBuildTask/RCWForCurrentContext.cs | 2 +- src/Compilers/Core/MSBuildTask/Utilities.cs | 4 ++-- src/Compilers/Core/MSBuildTask/Vbc.cs | 6 +++--- .../Core/MSBuildTaskTests/CscTests.cs | 6 +++--- .../Core/MSBuildTaskTests/MiscTests.cs | 6 +++--- .../Core/MSBuildTaskTests/TargetTests.cs | 2 +- .../TestUtilities/MSBuildUtil.cs | 4 ++-- .../Core/Portable/CodeGen/ArrayMembers.cs | 4 ++-- .../Portable/CodeGen/CompilationTestData.cs | 6 +++--- .../Portable/CodeGen/PermissionSetAttribute.cs | 10 +++++----- ...tchIntegralJumpTableEmitter.SwitchBucket.cs | 2 +- .../Collections/IdentifierCollection.cs | 2 +- .../Portable/Collections/UnionCollection.cs | 4 ++-- .../Portable/CommandLine/TouchedFileLogger.cs | 2 +- .../Compilation/PreprocessingSymbolInfo.cs | 2 +- .../Core/Portable/Compilation/SymbolInfo.cs | 2 +- src/Compilers/Core/Portable/CvtRes.cs | 6 +++--- .../Metadata/MetadataAdapterBase.cs | 2 +- .../Metadata/SymWriterMetadataAdapter.cs | 4 ++-- .../DiaSymReader/Utilities/ComMemoryStream.cs | 4 ++-- .../Core/Portable/Diagnostic/DiagnosticBag.cs | 2 +- .../Core/Portable/Diagnostic/DiagnosticInfo.cs | 2 +- .../Core/Portable/Diagnostic/XmlLocation.cs | 6 +++--- .../Core/Portable/Emit/AnonymousTypeValue.cs | 2 +- .../Portable/Emit/DebugDocumentsBuilder.cs | 2 +- .../EditAndContinue/DeltaMetadataWriter.cs | 4 ++-- .../Emit/EditAndContinue/SymbolChanges.cs | 6 +++--- .../Emit/NoPia/CommonEmbeddedMethod.cs | 2 +- .../Portable/Emit/NoPia/CommonEmbeddedType.cs | 6 +++--- .../Emit/NoPia/CommonEmbeddedTypeParameter.cs | 2 +- .../Emit/NoPia/EmbeddedTypesManager.cs | 6 +++--- .../Core/Portable/Emit/NoPia/VtblGap.cs | 2 +- .../Core/Portable/Emit/SemanticEdit.cs | 2 +- .../FileSystem/RelativePathResolver.cs | 2 +- .../InternalUtilities/AssemblyIdentityUtils.cs | 2 +- .../InternalUtilities/BlobBuildingStream.cs | 2 +- .../InternalUtilities/EncodingExtensions.cs | 2 +- .../Portable/InternalUtilities/EnumField.cs | 2 +- .../InternalUtilities/IsExternalInit.cs | 2 +- .../Portable/InternalUtilities/JsonWriter.cs | 2 +- .../Portable/InternalUtilities/OneOrMany.cs | 2 +- .../InternalUtilities/SpanUtilities.cs | 2 +- .../InternalUtilities/TextKeyedCache.cs | 4 ++-- .../Core/Portable/MemberDescriptor.cs | 2 +- .../MetadataTypeCodeExtensions.cs | 2 +- .../Core/Portable/MetadataReader/PEAssembly.cs | 2 +- .../MetadataReference/AssemblyMetadata.cs | 4 ++-- .../MetadataReferenceProperties.cs | 2 +- .../PortableExecutableReference.cs | 4 ++-- .../MetadataReference/ReferenceDirective.cs | 2 +- ...uilder.ConditionalAccessOperationTracker.cs | 2 +- .../Operations/Operation.Enumerable.cs | 8 ++++---- .../Core/Portable/Operations/Operation.cs | 2 +- .../Portable/Operations/OperationMapBuilder.cs | 2 +- src/Compilers/Core/Portable/OutputKind.cs | 2 +- .../Portable/PEWriter/DebugSourceDocument.cs | 6 +++--- .../Core/Portable/PEWriter/DebugSourceInfo.cs | 4 ++-- .../Portable/PEWriter/ExtendedPEBuilder.cs | 2 +- .../PEWriter/ITypeReferenceExtensions.cs | 2 +- .../Core/Portable/PEWriter/MetadataVisitor.cs | 6 +++--- .../Portable/PEWriter/PooledBlobBuilder.cs | 2 +- .../Core/Portable/PEWriter/ReferenceIndexer.cs | 2 +- .../Portable/PEWriter/ReferenceIndexerBase.cs | 2 +- .../Portable/PEWriter/TypeNameSerializer.cs | 4 ++-- .../Core/Portable/ResourceDescription.cs | 8 ++++---- .../Core/Portable/RuleSet/RuleSetProcessor.cs | 2 +- .../Portable/Serialization/ObjectReader.cs | 2 +- .../Portable/Serialization/ObjectWriter.cs | 2 +- .../Portable/StrongName/CryptoBlobParser.cs | 4 ++-- .../Portable/SymbolDisplay/FormattedSymbol.cs | 4 ++-- .../Symbols/Attributes/AttributeDescription.cs | 2 +- .../CommonAssemblyWellKnownAttributeData.cs | 2 +- .../Symbols/Attributes/CustomAttributesBag.cs | 2 +- .../MarshalPseudoCustomAttributeData.cs | 4 ++-- .../Core/Portable/Symbols/IModuleSymbol.cs | 2 +- .../SyntaxList.WithLotsOfChildren.cs | 2 +- .../Syntax/InternalSyntax/SyntaxNodeCache.cs | 3 ++- .../Core/Portable/Syntax/LineDirectiveMap.cs | 2 +- src/Compilers/Core/Portable/Text/LargeText.cs | 2 +- src/Compilers/Core/Portable/TreeDumper.cs | 2 +- .../Core/Rebuild/MetadataCompilationOptions.cs | 4 ++-- .../CompilationOptionsReaderTests.cs | 6 +++--- .../Core/RebuildTest/RoundTripUtil.cs | 4 ++-- .../VBCSCompiler/AnalyzerConsistencyChecker.cs | 4 ++-- .../VBCSCompiler/BuildServerController.cs | 6 +++--- .../Server/VBCSCompiler/CompletionData.cs | 4 ++-- .../VBCSCompiler/NamedPipeClientConnection.cs | 4 ++-- .../Server/VBCSCompiler/ServerDispatcher.cs | 4 ++-- .../Server/VBCSCompiler/VBCSCompiler.cs | 2 +- .../VBCSCompilerTests/BuildClientTests.cs | 17 +++++++++-------- .../ClientConnectionHandlerTests.cs | 8 ++++---- .../VBCSCompilerTests/CompilerServerApiTest.cs | 10 +++++----- .../VBCSCompilerTests/NamedPipeTestUtil.cs | 2 +- .../Server/VBCSCompilerTests/ServerUtil.cs | 7 ++++--- .../TestableClientConnectionHost.cs | 2 +- .../TestableCompilerServerHost.cs | 2 +- .../TouchedFileLoggingTests.cs | 8 ++++---- .../VBCSCompilerServerTests.cs | 6 +++--- src/Compilers/Shared/CoreClrShim.cs | 2 +- .../Core/Diagnostics/DiagnosticDescription.cs | 6 +++--- .../Diagnostics/TrackingDiagnosticAnalyzer.cs | 2 +- .../Test/Core/MarkedSource/MarkupTestFile.cs | 2 +- .../Test/Core/Metadata/ILBuilderVisualizer.cs | 6 +++--- src/Compilers/Test/Core/Mocks/MoqExtensions.cs | 2 +- .../CoreClr/CoreCLRRuntimeEnvironment.cs | 2 +- .../Test/Core/Syntax/SourceUtilities.cs | 2 +- src/Compilers/Test/Core/TargetFrameworkUtil.cs | 2 +- .../Test/Core/TempFiles/DisposableFile.cs | 2 +- src/Compilers/Test/Core/TempFiles/TempFile.cs | 6 +++--- src/Compilers/Test/Core/TestBase.cs | 4 ++-- .../Core/Traits/CompilerTraitDiscoverer.cs | 2 +- src/Compilers/Test/Core/Win32Res.cs | 4 ++-- .../Utilities/CSharp/BasicCompilationUtils.cs | 2 +- .../Utilities/CSharp/CompilationTestUtils.cs | 18 +++++++++--------- .../Test/Utilities/CSharp/TestOptions.cs | 2 +- .../VisualBasic/ParserTestUtilities.vb | 4 ++-- .../Test/Utilities/VisualBasic/VBParser.vb | 2 +- .../Analysis/FlowAnalysis/AbstractFlowPass.vb | 2 +- .../IteratorAndAsyncCaptureWalker.vb | 2 +- .../Binding/Binder_DocumentationComments.vb | 2 +- .../Binding/DocumentationCommentBinder.vb | 2 +- .../Binding/DocumentationCommentCrefBinder.vb | 4 ++-- .../DocumentationCommentCrefBinder_Compat.vb | 2 +- ...entationCommentCrefBinder_TypeParameters.vb | 2 +- .../Binding/DocumentationCommentParamBinder.vb | 2 +- .../DocumentationCommentTypeParamBinder.vb | 2 +- .../DocumentationCommentTypeParamRefBinder.vb | 2 +- .../Portable/Binding/MemberSemanticModel.vb | 2 +- .../Portable/BoundTree/BoundLateInvocation.vb | 2 +- .../Portable/BoundTree/BoundMethodGroup.vb | 4 ++-- .../Portable/BoundTree/Statement.vb | 2 +- .../DocumentationComments/DocWriter.vb | 2 +- .../DocumentationCommentCompiler.Event.vb | 2 +- .../DocumentationCommentCompiler.Field.vb | 2 +- .../DocumentationCommentCompiler.Includes.vb | 2 +- .../DocumentationCommentCompiler.Method.vb | 2 +- .../DocumentationCommentCompiler.NamedType.vb | 2 +- .../DocumentationCommentCompiler.Namespace.vb | 2 +- .../DocumentationCommentCompiler.Property.vb | 2 +- .../DocumentationCommentCompiler.vb | 4 ++-- .../DocumentationCommentWalker.vb | 2 +- .../UnprocessedDocumentationCommentFinder.vb | 4 ++-- .../Compilation/NamespaceScopeBuilder.vb | 2 +- .../Portable/Compilation/SemanticModel.vb | 2 +- .../Compilation/SyntaxTreeSemanticModel.vb | 2 +- .../Compilation/VisualBasicDiagnosticFilter.vb | 2 +- .../PEDocumenationCommentUtils.vb | 2 +- .../Emit/NoPia/EmbeddedTypesManager.vb | 4 ++-- .../VisualBasic/Portable/Parser/ParseScan.vb | 4 ++-- .../VisualBasic/Portable/Scanner/Scanner.vb | 4 ++-- .../Portable/Semantics/AccessCheck.vb | 5 +++-- .../Symbols/AccessibilityExtensions.vb | 2 +- .../Portable/Symbols/ArrayTypeSymbol.vb | 2 +- .../Portable/Symbols/AssemblySymbol.vb | 6 +++--- .../Symbols/Attributes/PEAttributeData.vb | 2 +- .../Symbols/Attributes/SourceAttributeData.vb | 4 ++-- .../Portable/Symbols/BaseTypeAnalysis.vb | 2 +- .../Symbols/Metadata/PE/PEAssemblySymbol.vb | 2 +- .../Symbols/Metadata/PE/PEEventSymbol.vb | 2 +- .../Symbols/Metadata/PE/PEFieldSymbol.vb | 4 ++-- .../Metadata/PE/PEGlobalNamespaceSymbol.vb | 2 +- .../Symbols/Metadata/PE/PEMethodSymbol.vb | 4 ++-- .../Symbols/Metadata/PE/PENamedTypeSymbol.vb | 6 +++--- .../Metadata/PE/PENestedNamespaceSymbol.vb | 2 +- .../Symbols/Metadata/PE/PEParameterSymbol.vb | 4 ++-- .../Symbols/Metadata/PE/PEPropertySymbol.vb | 2 +- .../Metadata/PE/PETypeParameterSymbol.vb | 4 ++-- .../Portable/Symbols/NamedTypeSymbol.vb | 2 +- .../Portable/Symbols/NamespaceOrTypeSymbol.vb | 2 +- .../Portable/Symbols/NamespaceSymbol.vb | 2 +- .../Retargeting/RetargetingAssemblySymbol.vb | 6 +++--- .../Retargeting/RetargetingModuleSymbol.vb | 6 +++--- .../Retargeting/RetargetingSymbolTranslator.vb | 2 +- .../Source/SourceSimpleParameterSymbol.vb | 2 +- .../Portable/Symbols/TypeParameterSymbol.vb | 2 +- .../VisualBasic/Portable/Symbols/TypeSymbol.vb | 2 +- .../Symbols/UnsupportedMetadataTypeSymbol.vb | 2 +- .../Portable/Syntax/LambdaUtilities.vb | 2 +- .../Portable/Syntax/SyntaxFactory.vb | 4 ++-- .../Portable/Syntax/SyntaxNodeFactories.vb | 8 ++++---- .../CommandLine/CommandLineBreakingChanges.vb | 2 +- .../Test/CommandLine/SarifErrorLoggerTests.vb | 4 ++-- .../CommandLine/SarifV1ErrorLoggerTests.vb | 4 ++-- .../CommandLine/SarifV2ErrorLoggerTests.vb | 2 +- .../CommandLine/TouchedFileLoggingTests.vb | 2 +- .../Attributes/AttributeTests_Conditional.vb | 2 +- .../Attributes/AttributeTests_MarshalAs.vb | 2 +- .../Emit/Attributes/AttributeTests_Tuples.vb | 2 +- .../Test/Emit/CodeGen/CodeGenNullable.vb | 2 +- .../Test/Emit/CodeGen/CodeGenTuples.vb | 2 +- .../Test/Emit/CodeGen/CodeGenWinMdDelegates.vb | 4 ++-- .../Test/Emit/Emit/DeterministicTests.vb | 4 ++-- .../EditAndContinue/AssemblyReferencesTests.vb | 4 ++-- .../EditAndContinue/EditAndContinuePdbTests.vb | 4 ++-- .../Emit/EditAndContinue/SymbolMatcherTests.vb | 8 ++++---- .../Test/Emit/Emit/NoPiaEmbedTypes.vb | 14 +++++++------- .../VisualBasic/Test/Emit/PDB/ChecksumTests.vb | 6 +++--- .../Test/Emit/PDB/PDBConstLocalTests.vb | 2 +- .../Test/Emit/PDB/PDBLambdaTests.vb | 2 +- .../Test/Emit/PDB/PDBWinMdExpTests.vb | 2 +- .../IOperation/IOperationTests_IArgument.vb | 4 ++-- ...onTests_IArrayElementReferenceExpression.vb | 2 +- .../IOperationTests_IAwaitExpression.vb | 2 +- ...OperationTests_IBinaryOperatorExpression.vb | 2 +- ...rationTests_IBlockStatement_MethodBlocks.vb | 2 +- ...rationTests_ICompoundAssignmentOperation.vb | 4 ++-- .../IOperationTests_IConversionExpression.vb | 4 ++-- ...rationTests_IDynamicInvocationExpression.vb | 2 +- ...nTests_IDynamicMemberReferenceExpression.vb | 2 +- .../IOperation/IOperationTests_IIfStatement.vb | 2 +- ...ationTests_IInterpolatedStringExpression.vb | 2 +- ...ationTests_INoPiaObjectCreationOperation.vb | 2 +- ...OperationTests_IObjectCreationExpression.vb | 2 +- .../IOperationTests_IReturnStatement.vb | 2 +- .../IOperationTests_ITupleExpression.vb | 2 +- .../IOperationTests_ITypeOfExpression.vb | 2 +- ...IOperationTests_IUnaryOperatorExpression.vb | 2 +- .../IOperationTests_IUsingStatement.vb | 4 ++-- .../IOperationTests_IVariableDeclaration.vb | 2 +- .../IOperationTests_IWithStatement.vb | 2 +- .../IOperation/IOperationTests_TryCatch.vb | 2 +- .../Binding/Binder_Statements_Tests.vb | 2 +- .../Test/Semantic/Binding/LookupTests.vb | 2 +- .../Compilation/CompilationAPITests.vb | 2 +- .../FlowAnalysis/FlowDiagnosticTests.vb | 2 +- .../Test/Semantic/Semantics/AsyncAwait.vb | 3 ++- .../Semantic/Semantics/GetSemanticInfoTests.vb | 3 ++- .../Test/Semantic/Semantics/MethodCalls.vb | 2 +- .../Test/Semantic/Semantics/NameLengthTests.vb | 6 +++--- .../DocumentationComments/DocCommentTests.vb | 10 +++++----- .../AnonymousTypesEmittedSymbolsTests.vb | 3 ++- .../AnonymousTypesSemanticsTests.vb | 3 ++- .../SymbolsTests/AssemblyAndNamespaceTests.vb | 2 +- .../Symbol/SymbolsTests/CorLibrary/Choosing.vb | 2 +- .../InterfaceImplementationTests.vb | 2 +- .../Metadata/PE/BaseTypeResolution.vb | 2 +- .../Metadata/PE/HasUnsupportedMetadata.vb | 2 +- .../Metadata/PE/LoadCustomModifiers.vb | 4 ++-- .../Metadata/PE/LoadingAttributes.vb | 2 +- .../SymbolsTests/Metadata/PE/LoadingEvents.vb | 2 +- .../SymbolsTests/Metadata/PE/LoadingFields.vb | 2 +- .../Metadata/PE/LoadingWithEvents.vb | 2 +- .../Symbol/SymbolsTests/Metadata/PE/NoPia.vb | 2 +- ...oPiaInstantiationOfGenericClassAndStruct.vb | 2 +- .../NoPiaLocalHideAndTypeSubstitutionTests.vb | 4 ++-- .../SymbolsTests/Metadata/WinMdEventTest.vb | 3 ++- .../SymbolsTests/Metadata/WinMdTypeTests.vb | 2 +- .../MyBaseMyClassSemanticsTests.vb | 3 ++- .../Symbol/SymbolsTests/Retargeting/NoPia.vb | 4 ++-- .../Retargeting/RetargetCustomModifiers.vb | 6 +++--- .../Retargeting/RetargetingCustomAttributes.vb | 4 ++-- .../Retargeting/RetargetingTests.vb | 2 +- .../SymbolsTests/Source/BaseClassTests.vb | 2 +- .../Symbol/SymbolsTests/Source/EventTests.vb | 3 ++- .../SymbolsTests/Source/GroupClassTests.vb | 2 +- .../SymbolsTests/Source/PropertyTests.vb | 2 +- .../SymbolsTests/Source/SyntheticEntryPoint.vb | 2 +- .../SymbolsTests/WithStatementSymbolsTests.vb | 3 ++- .../Test/Syntax/Syntax/GeneratedTests.vb | 2 +- .../Test/Syntax/Syntax/SerializationTests.vb | 2 +- .../ConvertAnonymousTypeToClassTests.cs | 4 ++-- .../ProximityExpressionsGetterTests.cs | 2 +- .../EditAndContinue/ActiveStatementTests.cs | 8 ++++---- .../ExtractMethod/ExtractMethodBase.cs | 2 +- .../MakeMemberStatic/MakeMemberStaticTests.cs | 2 +- .../PullMemberUp/CSharpPullMemberUpTests.cs | 10 +++++----- .../FindDerivedSymbolsCommandHandler.cs | 4 ++-- .../FindMemberOverloadsCommandHandler.cs | 6 +++--- ...ractiveCommandContentTypeLanguageService.cs | 6 +++--- .../Interactive/InteractiveCommandHandler.cs | 10 +++++----- .../InteractiveSupportsFeatureService.cs | 6 +++--- .../InteractiveWindowResetCommand.cs | 3 ++- .../Core.Wpf/Interactive/ResetInteractive.cs | 11 ++++++----- ...eviewReferenceHighlightingTaggerProvider.cs | 6 +++--- .../PreviewWarningViewTaggerProvider.cs | 6 +++--- ...VSTypeScriptFormattingInteractionService.cs | 2 +- .../VSTypeScriptEditorInlineRenameService.cs | 8 ++++---- ...VSTypeScriptFormattingInteractionService.cs | 4 ++-- .../ISendToInteractiveSubmissionProvider.cs | 2 +- .../SendToInteractiveSubmissionProvider.cs | 10 +++++----- .../Core/Undo/EditorSourceTextUndoService.cs | 4 ++-- ...isualBasicCodeRefactoringVerifier`1+Test.cs | 4 ++-- .../Diagnostics/AbstractUserDiagnosticTest.cs | 4 ++-- .../CodeFixExceptionInRegisterMethodAsync.cs | 2 +- .../EditSessionActiveStatementsTests.cs | 6 +++--- .../AbstractBaseValueTrackingTests.cs | 8 ++++---- .../GoToImplementationTests.vb | 4 ++-- .../Test2/Rename/CSharp/AliasTests.vb | 2 +- .../AbstractArgumentProviderTests`1.cs | 2 +- .../TestDiagnosticAnalyzerDriver.cs | 2 +- .../ActiveStatementTestHelpers.cs | 4 ++-- .../TextEditorFactoryExtensions.cs | 4 ++-- .../Intellisense/TestStateFactory.vb | 2 +- .../DocumentationCommentCommandHandler.vb | 2 +- .../AddFileBanner/AddFileBannerTests.vb | 2 +- .../AutomaticBraceCompletionTests.vb | 4 ++-- .../AutomaticBracketCompletionTests.vb | 4 ++-- ...erpolatedStringExpressionCompletionTests.vb | 4 ++-- .../AutomaticInterpolationCompletionTests.vb | 4 ++-- ...tomaticLessAndGreaterThanCompletionTests.vb | 4 ++-- .../AutomaticParenthesesCompletion.vb | 4 ++-- .../AutomaticStringLiteralCompletionTests.vb | 4 ++-- ...iagnosticProviderBasedUserDiagnosticTest.vb | 4 ++-- .../GenerateEndConstructTests.vb | 2 +- .../GenerateEnumMemberTests.vb | 2 +- .../GenerateEvent/GenerateEventTests.vb | 2 +- .../GenerateMethod/GenerateMethodTests.vb | 2 +- .../Diagnostics/Spellcheck/SpellcheckTests.vb | 2 +- .../VisualBasicEditAndContinueTestHelpers.vb | 6 +++--- .../StatementSyntaxExtensionTests.vb | 4 ++-- .../IntroduceUsingStatementTests.vb | 2 +- .../Binders/WithTypeArgumentsBinder.cs | 4 ++-- .../ExpressionCompiler/CSharpFrameDecoder.cs | 2 +- .../CSharpLanguageInstructionDecoder.cs | 2 +- .../ExpressionCompiler/CompilationContext.cs | 14 +++++++------- .../ExpressionCompiler/EEAssemblyBuilder.cs | 8 ++++---- .../Rewriters/CapturedVariableRewriter.cs | 4 ++-- .../Rewriters/LocalDeclarationRewriter.cs | 6 +++--- .../Rewriters/PlaceholderLocalRewriter.cs | 2 +- .../Symbols/DisplayClassInstance.cs | 2 +- .../Symbols/DisplayClassVariable.cs | 4 ++-- .../Symbols/EEDisplayClassFieldLocalSymbol.cs | 2 +- .../Symbols/ObjectIdLocalSymbol.cs | 4 ++-- .../Symbols/ReturnValueLocalSymbol.cs | 2 +- .../Symbols/SimpleTypeParameterSymbol.cs | 4 ++-- .../Source/ExpressionCompiler/SyntaxHelpers.cs | 6 +++--- .../ExpressionCompiler/AccessibilityTests.cs | 6 +++--- .../ExpressionCompilerTests.cs | 2 +- .../InstructionDecoderTests.cs | 2 +- .../Test/ResultProvider/AccessibilityTests.cs | 2 +- .../CSharpResultProviderTestBase.cs | 2 +- .../DebuggerTypeProxyAttributeTests.cs | 4 ++-- .../Test/ResultProvider/DynamicViewTests.cs | 2 +- .../Test/ResultProvider/FullNameTests.cs | 2 +- .../ResultProvider/FunctionPointerTests.cs | 4 ++-- .../Test/ResultProvider/ObjectIdTests.cs | 2 +- .../CSharp/Test/ResultProvider/TupleTests.cs | 6 +++--- .../TypeVariablesExpansionTests.cs | 2 +- .../ExpressionCompiler/AssemblyReference.cs | 4 ++-- .../ExpressionCompiler/CustomTypeInfo.cs | 4 ++-- .../ExpressionCompiler/LocalAndMethod.cs | 2 +- .../PseudoVariableUtilities.cs | 6 +++--- .../CSharp/MemberSignatureParser.cs | 2 +- .../Source/FunctionResolver/CSharp/Scanner.cs | 2 +- .../FunctionResolver/FunctionResolverBase.cs | 2 +- .../FunctionResolver/MetadataResolver.cs | 2 +- .../VisualBasic/MemberSignatureParser.cs | 2 +- .../FunctionResolver/VisualBasic/Scanner.cs | 2 +- .../Expansion/DebuggerTypeProxyExpansion.cs | 4 ++-- .../Expansion/NativeViewExpansion.cs | 2 +- .../ResultProvider/Expansion/TupleExpansion.cs | 6 +++--- .../Helpers/CustomTypeInfoTypeArgumentMap.cs | 2 +- .../ResultProvider/Helpers/ValueHelpers.cs | 4 ++-- .../ExpressionCompilerTestHelpers.cs | 5 +++-- .../NamespaceTypeDefinitionNoBase.cs | 4 ++-- .../CSharpFunctionResolverTests.cs | 4 ++-- .../FunctionResolverTestBase.cs | 4 ++-- .../Test/FunctionResolver/ParsingTestBase.cs | 4 ++-- .../VisualBasicFunctionResolverTests.cs | 2 +- .../VisualBasicParsingTests.cs | 6 +++--- .../Debugger/Engine/DkmClrModuleInstance.cs | 4 ++-- .../Test/ResultProvider/ReflectionUtilities.cs | 2 +- .../ResultProvider/ResultProviderTestBase.cs | 2 +- .../ExpressionCompiler/EEAssemblyBuilder.vb | 8 ++++---- .../VisualBasicEESymbolProvider.vb | 4 ++-- .../VisualBasicInstructionDecoder.vb | 2 +- .../Test/ExpressionCompiler/LocalsTests.vb | 2 +- .../ResultPropertiesTests.vb | 2 +- .../Test/ResultProvider/ResultsViewTests.vb | 2 +- .../Test/ResultProvider/TupleTests.vb | 2 +- .../TypeVariablesExpansionTests.vb | 2 +- ...eBaseCodeFixProvider.AddNewKeywordAction.cs | 4 ++-- .../RefKeywordRecommender.cs | 2 +- .../StringKeywordRecommender.cs | 2 +- .../Portable/Debugging/BreakpointResolver.cs | 2 +- .../Pythia/PythiaSignatureHelpProvider.cs | 4 ++-- ...AddParameterCheckCodeRefactoringProvider.cs | 2 +- .../InternalUtilities/InternalExtensions.cs | 4 ++-- .../SignatureHelp/SignatureHelpUtilities.cs | 2 +- ...harpUsePatternCombinatorsCodeFixProvider.cs | 2 +- .../Core/Portable/CodeCleanup/DiagnosticSet.cs | 2 +- .../AbstractDirectivePathCompletionProvider.cs | 8 ++++---- ...eScriptDiagnosticAnalyzerLanguageService.cs | 2 +- .../VSTypeScriptDiagnosticAnalyzerService.cs | 6 +++--- .../MetadataAsSourceFileService.cs | 2 +- ...AbstractReplaceMethodWithPropertyService.cs | 2 +- .../Portable/ValueTracking/ValueTrackedItem.cs | 2 +- .../Protocol/Handler/RequestExecutionQueue.cs | 2 +- ...ixProvider.ReplaceTokenKeywordCodeAction.vb | 2 +- .../VisualBasicRefactoringHelpersService.vb | 2 +- .../KeywordCompletionProvider.vb | 10 +++++----- .../NamedParameterCompletionProvider.vb | 10 +++++----- ...oSwitchCodeRefactoringProvider.Rewriting.vb | 2 +- .../Portable/Debugging/BreakpointResolver.vb | 2 +- .../EditAndContinue/BreakpointSpans.vb | 4 ++-- ...MethodExtractor.VisualBasicCodeGenerator.vb | 4 ++-- ...lBasicGenerateParameterizedMemberService.vb | 6 +++--- .../VisualBasicIntroduceVariableService.vb | 4 ++-- ...ualBasicReplaceMethodWithPropertyService.vb | 2 +- .../Core/InteractiveHost.LazyRemoteService.cs | 3 ++- .../InteractiveSessionReferencesTests.cs | 5 +++-- .../ObjectFormatter/CommonTypeNameFormatter.cs | 2 +- src/Scripting/Core/Script.cs | 10 +++++----- src/Scripting/Core/ScriptState.cs | 4 ++-- .../GlobalAssemblyCacheTests.cs | 4 ++-- .../MetadataShadowCopyProviderTests.cs | 15 ++++++++------- .../RuntimeMetadataReferenceResolverTests.cs | 3 ++- .../CoreTestUtilities/ScriptingTestHelpers.cs | 6 +++--- .../Reader/CustomDebugInfoUtilities.cs | 3 ++- .../PdbUtilities/Reader/PdbTestUtilities.cs | 3 ++- .../PdbUtilities/Shared/DummyMetadataImport.cs | 8 ++++---- src/Test/Perf/StackDepthTest/Program.cs | 4 ++-- src/Test/Perf/Utilities/TraceManager.cs | 4 ++-- .../FSharpDocumentHighlightsService.cs | 6 +++--- .../Editor/FSharpContentTypeLanguageService.cs | 2 +- .../Editor/FSharpEditorInlineRenameService.cs | 4 ++-- .../Editor/FSharpGoToDefinitionService.cs | 8 ++++---- .../FSharpSignatureHelpProvider.cs | 2 +- .../Structure/FSharpBlockStructureService.cs | 4 ++-- ...SharpProjectExternalErrorReporterFactory.cs | 4 ++-- .../FSharpSignatureHelpClassifierProvider.cs | 8 ++++---- .../OmniSharpBlockStructureService.cs | 2 +- src/Tools/Source/RunTests/Program.cs | 6 +++--- .../CSharpVsResetInteractiveCommand.cs | 4 ++-- .../CSharpCodeCleanupFixerProvider.cs | 4 ++-- .../LanguageService/CSharpLanguageService.cs | 2 +- .../FormattingOptionPageControl.xaml.cs | 2 +- .../Commands/ResetInteractiveTests.cs | 9 +++++---- .../Commands/TestResetInteractive.cs | 13 +++++++------ .../SettingsEditorControl.xaml.cs | 4 ++-- .../SettingsEditorPane.SearchFilter.cs | 2 +- .../AnalyzerDependencyChecker.cs | 4 ++-- .../AnalyzerDependencyConflict.cs | 2 +- .../IgnorableAssemblyNameList.cs | 2 +- .../MissingAnalyzerDependency.cs | 2 +- .../VisualStudioDiagnosticAnalyzerService.cs | 6 +++--- ...rencesTableControlEventProcessorProvider.cs | 8 ++++---- .../AbstractResetInteractiveMenuCommand.cs | 12 ++++++------ .../CSharpResetInteractiveMenuCommand.cs | 2 +- .../VisualBasicResetInteractiveMenuCommand.cs | 2 +- .../ObjectBrowser/AbstractListItemFactory.cs | 2 +- .../ObjectBrowserTaskExtensions.cs | 2 +- .../Implementation/Preview/ReferenceChange.cs | 2 +- .../PreviewPane/PreviewPane.xaml.cs | 4 ++-- .../GraphQueries/SearchGraphQuery.cs | 4 ++-- .../ProjectSystem/FileChangeTracker.cs | 2 +- .../Utilities/AutomationDelegatingListView.cs | 3 ++- .../Venus/VenusTaskExtensions.cs | 2 +- ...isualStudioWorkspaceStatusServiceFactory.cs | 3 ++- .../AbstractResetInteractiveCommand.cs | 2 +- .../Interactive/VsInteractiveWindowProvider.cs | 9 +++++---- .../Core/Def/Interactive/VsResetInteractive.cs | 5 +++-- .../ValueTrackedTreeItemViewModel.cs | 2 +- .../ValueTracking/ValueTrackingToolWindow.cs | 2 +- .../Collections/CodeElementSnapshot.cs | 2 +- .../Collections/ExternalMemberCollection.cs | 2 +- .../Collections/ExternalNamespaceCollection.cs | 2 +- .../Collections/ExternalOverloadsCollection.cs | 2 +- .../InheritsImplementsCollection.cs | 2 +- .../Collections/NamespaceCollection.cs | 2 +- .../Collections/OverloadsCollection.cs | 2 +- .../Collections/PartialTypeCollection.cs | 2 +- .../CodeModel/Collections/TypeCollection.cs | 2 +- .../AbstractExternalCodeType.cs | 2 +- .../Core/Test/ObjectBrowser/Helpers.vb | 4 ++-- .../Impl/Client/RoslynLSPClientService.cs | 4 ++-- .../CustomProtocol/LspRequestExtensions.cs | 2 +- .../CodeModel/CodeModelTestState.vb | 2 +- .../Framework/MockHierarchy.vb | 10 +++++----- .../PropertyChangedTestMonitor.vb | 2 +- .../VisualBasicCodeCleanupFixerProvider.vb | 4 ++-- .../Impl/ObjectBrowser/DescriptionBuilder.vb | 2 +- .../ObjectBrowserLibraryManager.vb | 4 ++-- .../SnippetFunctionClassName.vb | 2 +- .../SnippetFunctionSimpleTypeName.vb | 2 +- .../CodeGeneration/ParameterGenerator.cs | 3 ++- .../Extensions/SemanticModelExtensions.cs | 6 +++--- .../Formatting/FormattingTriviaTests.cs | 4 ++-- .../MSBuild/Build/ProjectBuildManager.cs | 2 +- ...ldProjectLoader.Worker_ResolveReferences.cs | 2 +- .../MSBuild/MSBuild/MSBuildProjectLoader.cs | 2 +- .../MSBuild/MSBuild/ProjectFile/Extensions.cs | 2 +- .../Core/MSBuild/MSBuild/ProjectMap.cs | 2 +- .../AbstractClassificationService.cs | 2 +- ...itorConfigDocumentOptionsProviderFactory.cs | 2 +- .../Core/Portable/Remote/RemoteHostClient.cs | 2 +- .../RenameLocation.ReferenceProcessing.cs | 6 +++--- .../Renamer.RenameSymbolDocumentAction.cs | 2 +- .../SymbolKey/SymbolKey.TupleTypeSymbolKey.cs | 2 +- .../TaskScheduler/TaskSchedulerProvider.cs | 2 +- ...aceAsynchronousOperationListenerProvider.cs | 4 ++-- .../Workspace/Solution/Checksum_Factory.cs | 4 ++-- .../LongestCommonSubsequenceTests.cs | 2 +- .../CoreTest/SolutionTests/SolutionTests.cs | 2 +- .../WorkspaceTests/GeneralWorkspaceTests.cs | 2 +- .../MSBuildTest/MSBuildWorkspaceTests.cs | 2 +- .../Remote/Core/SolutionAssetProvider.cs | 2 +- .../Host/RemoteWorkspace.SolutionCreator.cs | 8 ++++---- .../Formatting/CSharpFormattingOptions2.cs | 2 +- .../Core/Formatting/FormattingOptions2.cs | 2 +- .../Rules/Operations/FormattingOperations.cs | 2 +- .../AbstractDocumentationCommentService.cs | 2 +- .../Compiler/Core/Utilities/BKTree.cs | 2 +- .../ContextQuery/SyntaxTreeExtensions.vb | 2 +- .../Extensions/ParameterSyntaxExtensions.vb | 2 +- .../VisualBasicCodeGenerationServiceFactory.vb | 4 ++-- .../Extensions/SemanticModelExtensions.vb | 2 +- .../VisualBasicOptionsSerializationService.vb | 2 +- ...isualBasicSimplificationService.Expander.vb | 2 +- .../OrganizeImports/OrganizeImportsTests.vb | 4 ++-- .../VisualBasicExtensionsTests.vb | 4 ++-- 766 files changed, 1354 insertions(+), 1321 deletions(-) diff --git a/src/Analyzers/CSharp/Analyzers/MatchFolderAndNamespace/CSharpMatchFolderAndNamespaceDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/MatchFolderAndNamespace/CSharpMatchFolderAndNamespaceDiagnosticAnalyzer.cs index 2edb67c303210..a04f3b2dd3674 100644 --- a/src/Analyzers/CSharp/Analyzers/MatchFolderAndNamespace/CSharpMatchFolderAndNamespaceDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/MatchFolderAndNamespace/CSharpMatchFolderAndNamespaceDiagnosticAnalyzer.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.CodeAnalysis.Analyzers.MatchFolderAndNamespace; -using Microsoft.CodeAnalysis.CSharp.LanguageServices; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.Analyzers.MatchFolderAndNamespace; using Microsoft.CodeAnalysis.LanguageServices; +using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.LanguageServices; namespace Microsoft.CodeAnalysis.CSharp.Analyzers.MatchFolderAndNamespace { diff --git a/src/Analyzers/CSharp/Analyzers/UseExpressionBody/Helpers/UseExpressionBodyHelper.cs b/src/Analyzers/CSharp/Analyzers/UseExpressionBody/Helpers/UseExpressionBodyHelper.cs index 1ba7b5a8731b7..9326e2018065b 100644 --- a/src/Analyzers/CSharp/Analyzers/UseExpressionBody/Helpers/UseExpressionBodyHelper.cs +++ b/src/Analyzers/CSharp/Analyzers/UseExpressionBody/Helpers/UseExpressionBodyHelper.cs @@ -6,8 +6,8 @@ using System.Collections.Immutable; using Microsoft.CodeAnalysis.CodeStyle; -using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Options; +using Microsoft.CodeAnalysis.CSharp.Syntax; #if CODE_STYLE using OptionSet = Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions; diff --git a/src/Analyzers/CSharp/Analyzers/UsePatternCombinators/CSharpUsePatternCombinatorsAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UsePatternCombinators/CSharpUsePatternCombinatorsAnalyzer.cs index e487a7ef13230..d809df97b04b0 100644 --- a/src/Analyzers/CSharp/Analyzers/UsePatternCombinators/CSharpUsePatternCombinatorsAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UsePatternCombinators/CSharpUsePatternCombinatorsAnalyzer.cs @@ -8,8 +8,8 @@ namespace Microsoft.CodeAnalysis.CSharp.UsePatternCombinators { - using static AnalyzedPattern; using static BinaryOperatorKind; + using static AnalyzedPattern; internal static class CSharpUsePatternCombinatorsAnalyzer { diff --git a/src/Analyzers/CSharp/CodeFixes/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionCodeFixProvider.Rewriter.cs b/src/Analyzers/CSharp/CodeFixes/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionCodeFixProvider.Rewriter.cs index e953af7cd1059..d66e35ee7b572 100644 --- a/src/Analyzers/CSharp/CodeFixes/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionCodeFixProvider.Rewriter.cs +++ b/src/Analyzers/CSharp/CodeFixes/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionCodeFixProvider.Rewriter.cs @@ -9,8 +9,8 @@ using System.Linq; using Microsoft.CodeAnalysis.CSharp.Extensions; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Formatting; using Microsoft.CodeAnalysis.Shared.Extensions; +using Microsoft.CodeAnalysis.Formatting; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.ConvertSwitchStatementToExpression diff --git a/src/Analyzers/CSharp/CodeFixes/RemoveUnusedMembers/CSharpRemoveUnusedMembersCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/RemoveUnusedMembers/CSharpRemoveUnusedMembersCodeFixProvider.cs index d3fa5f916b28f..29b238265c1d1 100644 --- a/src/Analyzers/CSharp/CodeFixes/RemoveUnusedMembers/CSharpRemoveUnusedMembersCodeFixProvider.cs +++ b/src/Analyzers/CSharp/CodeFixes/RemoveUnusedMembers/CSharpRemoveUnusedMembersCodeFixProvider.cs @@ -4,13 +4,13 @@ #nullable disable -using System; using System.Collections.Generic; using System.Composition; +using Microsoft.CodeAnalysis.RemoveUnusedMembers; using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.CSharp.Syntax; +using System; using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.CodeAnalysis.RemoveUnusedMembers; namespace Microsoft.CodeAnalysis.CSharp.RemoveUnusedMembers { diff --git a/src/Analyzers/Core/CodeFixes/OrderModifiers/AbstractOrderModifiersCodeFixProvider.cs b/src/Analyzers/Core/CodeFixes/OrderModifiers/AbstractOrderModifiersCodeFixProvider.cs index 304f2a9c69aac..7b9f504f9b19d 100644 --- a/src/Analyzers/Core/CodeFixes/OrderModifiers/AbstractOrderModifiersCodeFixProvider.cs +++ b/src/Analyzers/Core/CodeFixes/OrderModifiers/AbstractOrderModifiersCodeFixProvider.cs @@ -10,12 +10,12 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CodeActions; -using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.CodeStyle; +using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Editing; -using Microsoft.CodeAnalysis.LanguageServices; using Microsoft.CodeAnalysis.Options; +using Microsoft.CodeAnalysis.LanguageServices; using Microsoft.CodeAnalysis.Shared.Extensions; using Roslyn.Utilities; diff --git a/src/Analyzers/Core/CodeFixes/UseConditionalExpression/ForAssignment/AbstractUseConditionalExpressionForAssignmentCodeFixProvider.cs b/src/Analyzers/Core/CodeFixes/UseConditionalExpression/ForAssignment/AbstractUseConditionalExpressionForAssignmentCodeFixProvider.cs index 737c60c1c7320..3d75945a9b589 100644 --- a/src/Analyzers/Core/CodeFixes/UseConditionalExpression/ForAssignment/AbstractUseConditionalExpressionForAssignmentCodeFixProvider.cs +++ b/src/Analyzers/Core/CodeFixes/UseConditionalExpression/ForAssignment/AbstractUseConditionalExpressionForAssignmentCodeFixProvider.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Immutable; -using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -16,8 +15,9 @@ using Microsoft.CodeAnalysis.Operations; using Microsoft.CodeAnalysis.Shared.Extensions; using Roslyn.Utilities; -using static Microsoft.CodeAnalysis.UseConditionalExpression.UseConditionalExpressionCodeFixHelpers; using static Microsoft.CodeAnalysis.UseConditionalExpression.UseConditionalExpressionHelpers; +using static Microsoft.CodeAnalysis.UseConditionalExpression.UseConditionalExpressionCodeFixHelpers; +using System.Diagnostics.CodeAnalysis; namespace Microsoft.CodeAnalysis.UseConditionalExpression { diff --git a/src/Analyzers/VisualBasic/Analyzers/AddAccessibilityModifiers/VisualBasicAddAccessibilityModifiersDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/AddAccessibilityModifiers/VisualBasicAddAccessibilityModifiersDiagnosticAnalyzer.vb index fb0ae4bd688f6..16bad2c13f1e7 100644 --- a/src/Analyzers/VisualBasic/Analyzers/AddAccessibilityModifiers/VisualBasicAddAccessibilityModifiersDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/AddAccessibilityModifiers/VisualBasicAddAccessibilityModifiersDiagnosticAnalyzer.vb @@ -6,8 +6,8 @@ Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis.AddAccessibilityModifiers Imports Microsoft.CodeAnalysis.CodeStyle Imports Microsoft.CodeAnalysis.Diagnostics -Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices Namespace Microsoft.CodeAnalysis.VisualBasic.AddAccessibilityModifiers diff --git a/src/Analyzers/VisualBasic/Analyzers/PopulateSwitch/VisualBasicPopulateSwitchStatementDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/PopulateSwitch/VisualBasicPopulateSwitchStatementDiagnosticAnalyzer.vb index 11cab8682813c..2db185505f2f2 100644 --- a/src/Analyzers/VisualBasic/Analyzers/PopulateSwitch/VisualBasicPopulateSwitchStatementDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/PopulateSwitch/VisualBasicPopulateSwitchStatementDiagnosticAnalyzer.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.PopulateSwitch -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.PopulateSwitch diff --git a/src/Analyzers/VisualBasic/Analyzers/RemoveUnnecessaryParentheses/VisualBasicRemoveUnnecessaryParenthesesDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/RemoveUnnecessaryParentheses/VisualBasicRemoveUnnecessaryParenthesesDiagnosticAnalyzer.vb index d576e8b64032d..3798b6c2baf0f 100644 --- a/src/Analyzers/VisualBasic/Analyzers/RemoveUnnecessaryParentheses/VisualBasicRemoveUnnecessaryParenthesesDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/RemoveUnnecessaryParentheses/VisualBasicRemoveUnnecessaryParenthesesDiagnosticAnalyzer.vb @@ -2,14 +2,14 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Threading Imports Microsoft.CodeAnalysis.Diagnostics -Imports Microsoft.CodeAnalysis.LanguageServices -Imports Microsoft.CodeAnalysis.Precedence -Imports Microsoft.CodeAnalysis.RemoveUnnecessaryParentheses -Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices Imports Microsoft.CodeAnalysis.VisualBasic.Precedence +Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.RemoveUnnecessaryParentheses +Imports Microsoft.CodeAnalysis.Precedence +Imports Microsoft.CodeAnalysis.LanguageServices +Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.RemoveUnnecessaryParentheses diff --git a/src/Analyzers/VisualBasic/Analyzers/SimplifyBooleanExpression/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/SimplifyBooleanExpression/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb index 3a5ebd4b07c1c..c2805bef4e2c9 100644 --- a/src/Analyzers/VisualBasic/Analyzers/SimplifyBooleanExpression/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/SimplifyBooleanExpression/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb @@ -3,12 +3,12 @@ ' See the LICENSE file in the project root for more information. Imports System.Threading +Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.LanguageServices Imports Microsoft.CodeAnalysis.Operations Imports Microsoft.CodeAnalysis.SimplifyBooleanExpression -Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.SimplifyBooleanExpression diff --git a/src/Analyzers/VisualBasic/Analyzers/UseCompoundAssignment/VisualBasicUseCompoundAssignmentDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/UseCompoundAssignment/VisualBasicUseCompoundAssignmentDiagnosticAnalyzer.vb index d3caafc0e37ab..a68290c891b11 100644 --- a/src/Analyzers/VisualBasic/Analyzers/UseCompoundAssignment/VisualBasicUseCompoundAssignmentDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/UseCompoundAssignment/VisualBasicUseCompoundAssignmentDiagnosticAnalyzer.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.UseCompoundAssignment Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.UseCompoundAssignment diff --git a/src/Analyzers/VisualBasic/Tests/QualifyMemberAccess/QualifyMemberAccessTests.vb b/src/Analyzers/VisualBasic/Tests/QualifyMemberAccess/QualifyMemberAccessTests.vb index c0525eecddc50..c7221094921ed 100644 --- a/src/Analyzers/VisualBasic/Tests/QualifyMemberAccess/QualifyMemberAccessTests.vb +++ b/src/Analyzers/VisualBasic/Tests/QualifyMemberAccess/QualifyMemberAccessTests.vb @@ -5,8 +5,8 @@ Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.CodeStyle Imports Microsoft.CodeAnalysis.Diagnostics -Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics Imports Microsoft.CodeAnalysis.Options +Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics Imports Microsoft.CodeAnalysis.VisualBasic.QualifyMemberAccess Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.QualifyMemberAccess diff --git a/src/Analyzers/VisualBasic/Tests/UseIsNullCheck/UseIsNullCheckForReferenceEqualsTests.vb b/src/Analyzers/VisualBasic/Tests/UseIsNullCheck/UseIsNullCheckForReferenceEqualsTests.vb index 803a93c157964..50e67bb0389ba 100644 --- a/src/Analyzers/VisualBasic/Tests/UseIsNullCheck/UseIsNullCheckForReferenceEqualsTests.vb +++ b/src/Analyzers/VisualBasic/Tests/UseIsNullCheck/UseIsNullCheckForReferenceEqualsTests.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports Microsoft.CodeAnalysis.CodeFixes +Imports Microsoft.CodeAnalysis.VisualBasic.UseIsNullCheck Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics -Imports Microsoft.CodeAnalysis.VisualBasic.UseIsNullCheck Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.UseIsNullCheck Partial Public Class UseIsNullCheckForReferenceEqualsTests diff --git a/src/CodeStyle/Core/Analyzers/Formatting/FormatterHelper.cs b/src/CodeStyle/Core/Analyzers/Formatting/FormatterHelper.cs index 6f0f205c273cc..070b4d752f0e1 100644 --- a/src/CodeStyle/Core/Analyzers/Formatting/FormatterHelper.cs +++ b/src/CodeStyle/Core/Analyzers/Formatting/FormatterHelper.cs @@ -11,8 +11,8 @@ using Microsoft.CodeAnalysis.Formatting.Rules; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -using static Microsoft.CodeAnalysis.Formatting.FormattingExtensions; using OptionSet = Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions; +using static Microsoft.CodeAnalysis.Formatting.FormattingExtensions; namespace Microsoft.CodeAnalysis.Formatting { diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_Deconstruct.cs b/src/Compilers/CSharp/Portable/Binder/Binder_Deconstruct.cs index 301e6489472a9..5b22258f07e77 100644 --- a/src/Compilers/CSharp/Portable/Binder/Binder_Deconstruct.cs +++ b/src/Compilers/CSharp/Portable/Binder/Binder_Deconstruct.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; using System.Collections.Immutable; +using System.Collections.Generic; using System.Diagnostics; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs b/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs index 8d1bc11fef360..46158af25f769 100644 --- a/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs +++ b/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs @@ -4,6 +4,11 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Collections.Immutable; @@ -11,11 +16,6 @@ using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis.Text; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_Flags.cs b/src/Compilers/CSharp/Portable/Binder/Binder_Flags.cs index 3f7974ebebc21..7374ede9d1163 100644 --- a/src/Compilers/CSharp/Portable/Binder/Binder_Flags.cs +++ b/src/Compilers/CSharp/Portable/Binder/Binder_Flags.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_QueryErrors.cs b/src/Compilers/CSharp/Portable/Binder/Binder_QueryErrors.cs index 4d34f57311ece..9c61b375c3c41 100644 --- a/src/Compilers/CSharp/Portable/Binder/Binder_QueryErrors.cs +++ b/src/Compilers/CSharp/Portable/Binder/Binder_QueryErrors.cs @@ -4,13 +4,13 @@ #nullable disable -using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Roslyn.Utilities; +using System; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_XmlNameAttribute.cs b/src/Compilers/CSharp/Portable/Binder/Binder_XmlNameAttribute.cs index d1d06af7ac787..572ef7e0b3cb6 100644 --- a/src/Compilers/CSharp/Portable/Binder/Binder_XmlNameAttribute.cs +++ b/src/Compilers/CSharp/Portable/Binder/Binder_XmlNameAttribute.cs @@ -4,12 +4,12 @@ #nullable disable -using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/ExecutableCodeBinder.cs b/src/Compilers/CSharp/Portable/Binder/ExecutableCodeBinder.cs index 32948bfb3fca5..6c2d6f6e694ce 100644 --- a/src/Compilers/CSharp/Portable/Binder/ExecutableCodeBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/ExecutableCodeBinder.cs @@ -4,14 +4,14 @@ #nullable disable -using System; -using System.Collections.Immutable; -using System.Diagnostics; -using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +using System; +using System.Collections.Immutable; +using System.Diagnostics; +using System.Threading; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/ExpressionListVariableBinder.cs b/src/Compilers/CSharp/Portable/Binder/ExpressionListVariableBinder.cs index 54a0ae16700c0..600a75a445d68 100644 --- a/src/Compilers/CSharp/Portable/Binder/ExpressionListVariableBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/ExpressionListVariableBinder.cs @@ -4,12 +4,12 @@ #nullable disable -using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +using System.Diagnostics; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/ExpressionVariableBinder.cs b/src/Compilers/CSharp/Portable/Binder/ExpressionVariableBinder.cs index 62bba9f598d41..4f16133aa41b9 100644 --- a/src/Compilers/CSharp/Portable/Binder/ExpressionVariableBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/ExpressionVariableBinder.cs @@ -5,12 +5,12 @@ #nullable disable using System; -using System.Collections.Generic; using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/ExpressionVariableFinder.cs b/src/Compilers/CSharp/Portable/Binder/ExpressionVariableFinder.cs index d103b312e2c29..1e1f691e5c28c 100644 --- a/src/Compilers/CSharp/Portable/Binder/ExpressionVariableFinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/ExpressionVariableFinder.cs @@ -5,13 +5,13 @@ #nullable disable using System; -using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +using System.Collections.Generic; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/ForLoopBinder.cs b/src/Compilers/CSharp/Portable/Binder/ForLoopBinder.cs index e131527da9173..ee8d0623bf843 100644 --- a/src/Compilers/CSharp/Portable/Binder/ForLoopBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/ForLoopBinder.cs @@ -5,12 +5,12 @@ #nullable disable using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/LocalBinderFactory.cs b/src/Compilers/CSharp/Portable/Binder/LocalBinderFactory.cs index 4c5d3825d07d2..d2a83280e672e 100644 --- a/src/Compilers/CSharp/Portable/Binder/LocalBinderFactory.cs +++ b/src/Compilers/CSharp/Portable/Binder/LocalBinderFactory.cs @@ -4,13 +4,13 @@ #nullable disable -using System; -using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +using System; +using System.Collections.Immutable; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/LockBinder.cs b/src/Compilers/CSharp/Portable/Binder/LockBinder.cs index 095aba5c38699..e6ea4a54f0588 100644 --- a/src/Compilers/CSharp/Portable/Binder/LockBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/LockBinder.cs @@ -6,9 +6,9 @@ using System; using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; +using System.Diagnostics; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Portable/Binder/MethodArgumentInfo.cs b/src/Compilers/CSharp/Portable/Binder/MethodArgumentInfo.cs index b8a2f76c02e53..5e742d84d72a7 100644 --- a/src/Compilers/CSharp/Portable/Binder/MethodArgumentInfo.cs +++ b/src/Compilers/CSharp/Portable/Binder/MethodArgumentInfo.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/CSharp/Portable/Binder/ScriptLocalScopeBinder.cs b/src/Compilers/CSharp/Portable/Binder/ScriptLocalScopeBinder.cs index f08aa0353bec9..e701dfdf57871 100644 --- a/src/Compilers/CSharp/Portable/Binder/ScriptLocalScopeBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/ScriptLocalScopeBinder.cs @@ -4,10 +4,10 @@ #nullable disable -using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; +using System.Collections.Immutable; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/Conversion.cs b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/Conversion.cs index a1d1b31a9efab..afcffedc0426b 100644 --- a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/Conversion.cs +++ b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/Conversion.cs @@ -2,14 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.Operations; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; +using System.Diagnostics.CodeAnalysis; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/TypeConversions.cs b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/TypeConversions.cs index 2b32e8ee2a628..c3906596164d8 100644 --- a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/TypeConversions.cs +++ b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/TypeConversions.cs @@ -4,11 +4,11 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Diagnostics; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedConversions.cs b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedConversions.cs index ba7fbeb00830c..6c28f576c6119 100644 --- a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedConversions.cs +++ b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedConversions.cs @@ -4,12 +4,12 @@ #nullable disable -using System.Collections.Generic; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedExplicitConversions.cs b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedExplicitConversions.cs index 052ded07bac6f..63aa33c7cd866 100644 --- a/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedExplicitConversions.cs +++ b/src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedExplicitConversions.cs @@ -4,7 +4,6 @@ #nullable disable -using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; @@ -12,6 +11,7 @@ using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/SimpleLocalScopeBinder.cs b/src/Compilers/CSharp/Portable/Binder/SimpleLocalScopeBinder.cs index fafdd056a56cc..d7263e00a8711 100644 --- a/src/Compilers/CSharp/Portable/Binder/SimpleLocalScopeBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/SimpleLocalScopeBinder.cs @@ -4,10 +4,10 @@ #nullable disable -using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; +using System.Collections.Immutable; +using System.Diagnostics; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Portable/Binder/TypeofBinder.cs b/src/Compilers/CSharp/Portable/Binder/TypeofBinder.cs index 5ef09515c307c..63e2016442af9 100644 --- a/src/Compilers/CSharp/Portable/Binder/TypeofBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/TypeofBinder.cs @@ -5,9 +5,9 @@ #nullable disable using System.Collections.Generic; +using Microsoft.CodeAnalysis.CSharp.Syntax; using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Binder/WhileBinder.cs b/src/Compilers/CSharp/Portable/Binder/WhileBinder.cs index 7d74c60ebaf6e..d3b86d32cab06 100644 --- a/src/Compilers/CSharp/Portable/Binder/WhileBinder.cs +++ b/src/Compilers/CSharp/Portable/Binder/WhileBinder.cs @@ -4,13 +4,13 @@ #nullable disable -using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Diagnostics; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/BoundTree/BoundDiscardExpression.cs b/src/Compilers/CSharp/Portable/BoundTree/BoundDiscardExpression.cs index 62643b81d47f3..10fd67b7c23ef 100644 --- a/src/Compilers/CSharp/Portable/BoundTree/BoundDiscardExpression.cs +++ b/src/Compilers/CSharp/Portable/BoundTree/BoundDiscardExpression.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/BoundTree/BoundExpression.cs b/src/Compilers/CSharp/Portable/BoundTree/BoundExpression.cs index e6b04409f1afd..fe75b32d33391 100644 --- a/src/Compilers/CSharp/Portable/BoundTree/BoundExpression.cs +++ b/src/Compilers/CSharp/Portable/BoundTree/BoundExpression.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; +using System; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/BoundTree/BoundTreeRewriter.cs b/src/Compilers/CSharp/Portable/BoundTree/BoundTreeRewriter.cs index 5c86eea778a79..402eb6e7d8336 100644 --- a/src/Compilers/CSharp/Portable/BoundTree/BoundTreeRewriter.cs +++ b/src/Compilers/CSharp/Portable/BoundTree/BoundTreeRewriter.cs @@ -3,10 +3,10 @@ // See the LICENSE file in the project root for more information. using System.Collections.Immutable; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/BoundTree/BoundTreeVisitors.cs b/src/Compilers/CSharp/Portable/BoundTree/BoundTreeVisitors.cs index 764e7bd72aaed..13778e535a28c 100644 --- a/src/Compilers/CSharp/Portable/BoundTree/BoundTreeVisitors.cs +++ b/src/Compilers/CSharp/Portable/BoundTree/BoundTreeVisitors.cs @@ -4,13 +4,13 @@ #nullable disable -using System; using System.Diagnostics; -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; +using System; using Roslyn.Utilities; +using System.Linq; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/BoundTree/Formatting.cs b/src/Compilers/CSharp/Portable/BoundTree/Formatting.cs index 8fcb7d49daab6..b323c0ebe9479 100644 --- a/src/Compilers/CSharp/Portable/BoundTree/Formatting.cs +++ b/src/Compilers/CSharp/Portable/BoundTree/Formatting.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Diagnostics; -using System.Runtime.CompilerServices; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +using System.Diagnostics; +using System.Runtime.CompilerServices; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/BoundTree/OutDeconstructVarPendingInference.cs b/src/Compilers/CSharp/Portable/BoundTree/OutDeconstructVarPendingInference.cs index 4fda893b1b390..4a63ad058ea2e 100644 --- a/src/Compilers/CSharp/Portable/BoundTree/OutDeconstructVarPendingInference.cs +++ b/src/Compilers/CSharp/Portable/BoundTree/OutDeconstructVarPendingInference.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/BoundTree/VariablePendingInference.cs b/src/Compilers/CSharp/Portable/BoundTree/VariablePendingInference.cs index 4d8adcbf6bfa6..4bd6f77e53aaf 100644 --- a/src/Compilers/CSharp/Portable/BoundTree/VariablePendingInference.cs +++ b/src/Compilers/CSharp/Portable/BoundTree/VariablePendingInference.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.Collections.Generic; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +using System.Diagnostics; +using System; +using Microsoft.CodeAnalysis.PooledObjects; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Compilation/LexicalOrderSymbolComparer.cs b/src/Compilers/CSharp/Portable/Compilation/LexicalOrderSymbolComparer.cs index 0c6f8b61b1935..1173bf27a1725 100644 --- a/src/Compilers/CSharp/Portable/Compilation/LexicalOrderSymbolComparer.cs +++ b/src/Compilers/CSharp/Portable/Compilation/LexicalOrderSymbolComparer.cs @@ -4,9 +4,9 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols; using System.Collections.Generic; using System.Diagnostics; -using Microsoft.CodeAnalysis.CSharp.Symbols; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.NodeMapBuilder.cs b/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.NodeMapBuilder.cs index 5c664aec869e9..fe0f0f661c74a 100644 --- a/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.NodeMapBuilder.cs +++ b/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.NodeMapBuilder.cs @@ -6,13 +6,13 @@ using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; -using System.Linq; using Microsoft.CodeAnalysis.Collections; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +using System.Diagnostics; +using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Symbols; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Compilation/QueryClauseInfo.cs b/src/Compilers/CSharp/Portable/Compilation/QueryClauseInfo.cs index 2677188c9f611..cb270f7bcff19 100644 --- a/src/Compilers/CSharp/Portable/Compilation/QueryClauseInfo.cs +++ b/src/Compilers/CSharp/Portable/Compilation/QueryClauseInfo.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using Roslyn.Utilities; +using System; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Compilation/SyntaxAndDeclarationManager.cs b/src/Compilers/CSharp/Portable/Compilation/SyntaxAndDeclarationManager.cs index 5ffeb4d90fbd9..a3a5bbf632981 100644 --- a/src/Compilers/CSharp/Portable/Compilation/SyntaxAndDeclarationManager.cs +++ b/src/Compilers/CSharp/Portable/Compilation/SyntaxAndDeclarationManager.cs @@ -5,9 +5,9 @@ #nullable disable using System; +using System.Diagnostics; using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; using System.Linq; using System.Threading; using Microsoft.CodeAnalysis.Collections; diff --git a/src/Compilers/CSharp/Portable/Compilation/TypeInfo.cs b/src/Compilers/CSharp/Portable/Compilation/TypeInfo.cs index ef88eecc890f4..68de547a3edb6 100644 --- a/src/Compilers/CSharp/Portable/Compilation/TypeInfo.cs +++ b/src/Compilers/CSharp/Portable/Compilation/TypeInfo.cs @@ -4,8 +4,8 @@ #nullable disable -using System; using Microsoft.CodeAnalysis.CSharp.Symbols; +using System; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Portable/DocumentationComments/DocumentationCommentIDVisitor.PartVisitor.cs b/src/Compilers/CSharp/Portable/DocumentationComments/DocumentationCommentIDVisitor.PartVisitor.cs index da1311a99ab47..499395bb38b02 100644 --- a/src/Compilers/CSharp/Portable/DocumentationComments/DocumentationCommentIDVisitor.PartVisitor.cs +++ b/src/Compilers/CSharp/Portable/DocumentationComments/DocumentationCommentIDVisitor.PartVisitor.cs @@ -4,7 +4,6 @@ #nullable disable -using System; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; @@ -15,6 +14,7 @@ using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/DocumentationComments/PEDocumentationCommentUtils.cs b/src/Compilers/CSharp/Portable/DocumentationComments/PEDocumentationCommentUtils.cs index dfc0a748b1cdd..df8a724455125 100644 --- a/src/Compilers/CSharp/Portable/DocumentationComments/PEDocumentationCommentUtils.cs +++ b/src/Compilers/CSharp/Portable/DocumentationComments/PEDocumentationCommentUtils.cs @@ -7,8 +7,8 @@ using System; using System.Globalization; using System.Threading; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; diff --git a/src/Compilers/CSharp/Portable/Emitter/EditAndContinue/CSharpSymbolMatcher.cs b/src/Compilers/CSharp/Portable/Emitter/EditAndContinue/CSharpSymbolMatcher.cs index e8e6e3930c55b..2bbe3b0900c3c 100644 --- a/src/Compilers/CSharp/Portable/Emitter/EditAndContinue/CSharpSymbolMatcher.cs +++ b/src/Compilers/CSharp/Portable/Emitter/EditAndContinue/CSharpSymbolMatcher.cs @@ -2,20 +2,20 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.Emit; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Threading; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; -using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Symbols; -using Roslyn.Utilities; +using System.Diagnostics.CodeAnalysis; namespace Microsoft.CodeAnalysis.CSharp.Emit { diff --git a/src/Compilers/CSharp/Portable/Emitter/Model/AssemblyReference.cs b/src/Compilers/CSharp/Portable/Emitter/Model/AssemblyReference.cs index 6955b1839b67d..4c682100fcd89 100644 --- a/src/Compilers/CSharp/Portable/Emitter/Model/AssemblyReference.cs +++ b/src/Compilers/CSharp/Portable/Emitter/Model/AssemblyReference.cs @@ -6,11 +6,11 @@ using System; using System.Collections.Generic; -using System.Collections.Immutable; -using System.Diagnostics; using System.Reflection; using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; +using System.Diagnostics; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp.Emit { diff --git a/src/Compilers/CSharp/Portable/Emitter/Model/CustomModifierAdapter.cs b/src/Compilers/CSharp/Portable/Emitter/Model/CustomModifierAdapter.cs index 581a2623d16ec..59381c0bd7fc5 100644 --- a/src/Compilers/CSharp/Portable/Emitter/Model/CustomModifierAdapter.cs +++ b/src/Compilers/CSharp/Portable/Emitter/Model/CustomModifierAdapter.cs @@ -4,8 +4,8 @@ #nullable disable -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Emit; +using System.Diagnostics; using Microsoft.CodeAnalysis.Emit; namespace Microsoft.CodeAnalysis.CSharp.Symbols diff --git a/src/Compilers/CSharp/Portable/Emitter/Model/GenericTypeInstanceReference.cs b/src/Compilers/CSharp/Portable/Emitter/Model/GenericTypeInstanceReference.cs index 0ebf40c89afef..6637d7d228b2b 100644 --- a/src/Compilers/CSharp/Portable/Emitter/Model/GenericTypeInstanceReference.cs +++ b/src/Compilers/CSharp/Portable/Emitter/Model/GenericTypeInstanceReference.cs @@ -5,14 +5,14 @@ #nullable disable using System.Collections.Generic; -using System.Collections.Immutable; -using System.Diagnostics; -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; +using System.Collections.Immutable; +using Microsoft.CodeAnalysis.Emit; +using System.Diagnostics; +using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.Emit { diff --git a/src/Compilers/CSharp/Portable/Emitter/Model/SourceAssemblySymbolAdapter.cs b/src/Compilers/CSharp/Portable/Emitter/Model/SourceAssemblySymbolAdapter.cs index 62c11df46ebbb..66d7ad7888bef 100644 --- a/src/Compilers/CSharp/Portable/Emitter/Model/SourceAssemblySymbolAdapter.cs +++ b/src/Compilers/CSharp/Portable/Emitter/Model/SourceAssemblySymbolAdapter.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Collections.Immutable; -using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.CSharp.Emit; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedGenericNestedTypeInstanceReference.cs b/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedGenericNestedTypeInstanceReference.cs index 7a4c733b34b2f..9ce90478d3aa4 100644 --- a/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedGenericNestedTypeInstanceReference.cs +++ b/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedGenericNestedTypeInstanceReference.cs @@ -5,11 +5,11 @@ #nullable disable using System.Collections.Immutable; -using System.Diagnostics; -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.PooledObjects; +using System.Diagnostics; +using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.Emit { diff --git a/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedNestedTypeReference.cs b/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedNestedTypeReference.cs index 570a1c9c77bf7..a8cb25ab27b8d 100644 --- a/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedNestedTypeReference.cs +++ b/src/Compilers/CSharp/Portable/Emitter/Model/SpecializedNestedTypeReference.cs @@ -4,9 +4,9 @@ #nullable disable -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.Emit; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.Emit { diff --git a/src/Compilers/CSharp/Portable/Emitter/Model/TypeParameterSymbolAdapter.cs b/src/Compilers/CSharp/Portable/Emitter/Model/TypeParameterSymbolAdapter.cs index 404fec990fcf3..1cd67e481413d 100644 --- a/src/Compilers/CSharp/Portable/Emitter/Model/TypeParameterSymbolAdapter.cs +++ b/src/Compilers/CSharp/Portable/Emitter/Model/TypeParameterSymbolAdapter.cs @@ -6,12 +6,12 @@ using System; using System.Collections.Generic; -using System.Collections.Immutable; -using System.Diagnostics; using System.Reflection.Metadata; using Microsoft.CodeAnalysis.CSharp.Emit; -using Microsoft.CodeAnalysis.Emit; using Roslyn.Utilities; +using System.Diagnostics; +using Microsoft.CodeAnalysis.Emit; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedEvent.cs b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedEvent.cs index d10909e6a9a0f..828c0c84916a1 100644 --- a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedEvent.cs +++ b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedEvent.cs @@ -4,8 +4,8 @@ #nullable disable -using System.Collections.Generic; using Microsoft.CodeAnalysis.CSharp.Symbols; +using System.Collections.Generic; #if !DEBUG using EventSymbolAdapter = Microsoft.CodeAnalysis.CSharp.Symbols.EventSymbol; diff --git a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedField.cs b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedField.cs index a0a2fa8ec350b..38cb8ab9625ba 100644 --- a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedField.cs +++ b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedField.cs @@ -4,11 +4,11 @@ #nullable disable -using System.Collections.Generic; using System.Collections.Immutable; -using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.Emit; +using System.Collections.Generic; +using Microsoft.CodeAnalysis.CodeGen; #if !DEBUG using FieldSymbolAdapter = Microsoft.CodeAnalysis.CSharp.Symbols.FieldSymbol; diff --git a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedParameter.cs b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedParameter.cs index c313a49e55dcc..9f02eefefc5df 100644 --- a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedParameter.cs +++ b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedParameter.cs @@ -4,14 +4,14 @@ #nullable disable -using System; -using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; -using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.Emit; +using System; +using System.Collections.Generic; +using System.Diagnostics; using Cci = Microsoft.Cci; +using Microsoft.CodeAnalysis.CodeGen; #if !DEBUG using ParameterSymbolAdapter = Microsoft.CodeAnalysis.CSharp.Symbols.ParameterSymbol; diff --git a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypeParameter.cs b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypeParameter.cs index 869cc2bd4108a..819b0c2e43f9b 100644 --- a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypeParameter.cs +++ b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypeParameter.cs @@ -4,10 +4,10 @@ #nullable disable -using System.Collections.Generic; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.Emit; +using System.Collections.Generic; +using System.Diagnostics; using Cci = Microsoft.Cci; #if !DEBUG diff --git a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypesManager.cs b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypesManager.cs index 2759e7900f1d9..2362945a2ba54 100644 --- a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypesManager.cs +++ b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypesManager.cs @@ -12,8 +12,8 @@ using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.Emit.NoPia; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.Emit.NoPia; #if !DEBUG using SymbolAdapter = Microsoft.CodeAnalysis.CSharp.Symbol; diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/DataFlowsOutWalker.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/DataFlowsOutWalker.cs index e2ad3e9bb3b15..ebc7f7d75e889 100644 --- a/src/Compilers/CSharp/Portable/FlowAnalysis/DataFlowsOutWalker.cs +++ b/src/Compilers/CSharp/Portable/FlowAnalysis/DataFlowsOutWalker.cs @@ -4,12 +4,12 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Syntax; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/DefiniteAssignment.LocalFunctions.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/DefiniteAssignment.LocalFunctions.cs index 3b17d550bb092..cd41d4faed57a 100644 --- a/src/Compilers/CSharp/Portable/FlowAnalysis/DefiniteAssignment.LocalFunctions.cs +++ b/src/Compilers/CSharp/Portable/FlowAnalysis/DefiniteAssignment.LocalFunctions.cs @@ -4,8 +4,8 @@ #nullable disable -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/EmptyStructTypeCache.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/EmptyStructTypeCache.cs index 54aae98004cd2..de42811ccdb6d 100644 --- a/src/Compilers/CSharp/Portable/FlowAnalysis/EmptyStructTypeCache.cs +++ b/src/Compilers/CSharp/Portable/FlowAnalysis/EmptyStructTypeCache.cs @@ -9,11 +9,11 @@ using System.Collections.Generic; using System.Diagnostics; using System.Text; -using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Threading; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/FlowAnalysisPass.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/FlowAnalysisPass.cs index a012c967af516..a138883fe13ba 100644 --- a/src/Compilers/CSharp/Portable/FlowAnalysis/FlowAnalysisPass.cs +++ b/src/Compilers/CSharp/Portable/FlowAnalysis/FlowAnalysisPass.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; using System.Linq; +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/ReadWriteWalker.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/ReadWriteWalker.cs index 13c466b88d263..a9b90b624d5a9 100644 --- a/src/Compilers/CSharp/Portable/FlowAnalysis/ReadWriteWalker.cs +++ b/src/Compilers/CSharp/Portable/FlowAnalysis/ReadWriteWalker.cs @@ -4,11 +4,11 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Syntax; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/VariablesDeclaredWalker.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/VariablesDeclaredWalker.cs index 4be833638eb8a..1964a19ff2aa8 100644 --- a/src/Compilers/CSharp/Portable/FlowAnalysis/VariablesDeclaredWalker.cs +++ b/src/Compilers/CSharp/Portable/FlowAnalysis/VariablesDeclaredWalker.cs @@ -5,12 +5,12 @@ #nullable disable using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/LambdaCapturedVariable.cs b/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/LambdaCapturedVariable.cs index ddd0303ffad3c..9cf23ae249234 100644 --- a/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/LambdaCapturedVariable.cs +++ b/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/LambdaCapturedVariable.cs @@ -5,10 +5,10 @@ #nullable disable using System; -using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/SynthesizedClosureMethod.cs b/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/SynthesizedClosureMethod.cs index 129a3a088539c..b3dd71d8252e4 100644 --- a/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/SynthesizedClosureMethod.cs +++ b/src/Compilers/CSharp/Portable/Lowering/ClosureConversion/SynthesizedClosureMethod.cs @@ -3,12 +3,12 @@ // See the LICENSE file in the project root for more information. using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis.Symbols; +using System.Diagnostics; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.Symbols; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/Instrumentation/DebugInfoInjector.cs b/src/Compilers/CSharp/Portable/Lowering/Instrumentation/DebugInfoInjector.cs index f4e319dbdee21..0a2a4c930ab8b 100644 --- a/src/Compilers/CSharp/Portable/Lowering/Instrumentation/DebugInfoInjector.cs +++ b/src/Compilers/CSharp/Portable/Lowering/Instrumentation/DebugInfoInjector.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Collections.Immutable; -using System.Diagnostics; -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Collections.Immutable; +using System.Diagnostics; +using System.Linq; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.IteratorFinallyFrame.cs b/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.IteratorFinallyFrame.cs index e500d00651514..d1acb500db5af 100644 --- a/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.IteratorFinallyFrame.cs +++ b/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.IteratorFinallyFrame.cs @@ -4,9 +4,9 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols; using System.Collections.Generic; using System.Diagnostics; -using Microsoft.CodeAnalysis.CSharp.Symbols; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.YieldsInTryAnalysis.cs b/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.YieldsInTryAnalysis.cs index c75fd9a4aedd1..4663c0c7e298b 100644 --- a/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.YieldsInTryAnalysis.cs +++ b/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.YieldsInTryAnalysis.cs @@ -4,9 +4,9 @@ #nullable disable -using System.Collections.Generic; using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.cs b/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.cs index deb1abccb2eff..e77349419b340 100644 --- a/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.cs +++ b/src/Compilers/CSharp/Portable/Lowering/IteratorRewriter/IteratorMethodToStateMachineRewriter.cs @@ -4,16 +4,16 @@ #nullable disable +using System.Collections.Immutable; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.PooledObjects; using System; using System.Collections.Generic; -using System.Collections.Immutable; using System.Diagnostics; using System.Linq; +using Roslyn.Utilities; using Microsoft.CodeAnalysis.CodeGen; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Symbols; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/DynamicSiteContainer.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/DynamicSiteContainer.cs index 6b0d45701d67a..982c07056192a 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/DynamicSiteContainer.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/DynamicSiteContainer.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; +using System.Diagnostics; using Microsoft.CodeAnalysis.Symbols; using Roslyn.Utilities; diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Call.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Call.cs index d2467c7d6cba9..f3e0e9c240aba 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Call.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Call.cs @@ -9,8 +9,8 @@ using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Operations; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.Operations; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_DoStatement.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_DoStatement.cs index 448db16b3ef2a..85dc338a8a45c 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_DoStatement.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_DoStatement.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Event.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Event.cs index 50127272f6394..a7a0ece2c831c 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Event.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Event.cs @@ -5,8 +5,8 @@ using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.RuntimeMembers; diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_IfStatement.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_IfStatement.cs index 3978bbbb8b30c..41828efc10d5b 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_IfStatement.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_IfStatement.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_ObjectOrCollectionInitializerExpression.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_ObjectOrCollectionInitializerExpression.cs index b169a518f495c..74b03b933a3e9 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_ObjectOrCollectionInitializerExpression.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_ObjectOrCollectionInitializerExpression.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Range.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Range.cs index e5159d83d4d15..c7e1b1e8b8aab 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Range.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Range.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Collections.Immutable; using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; -using System.Linq; +using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; +using System.Linq; using Roslyn.Utilities; +using System.Diagnostics.CodeAnalysis; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StackAlloc.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StackAlloc.cs index 9cea9d617c977..88a1002fcb43d 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StackAlloc.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StackAlloc.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Collections.Immutable; using System.Diagnostics; +using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StringInterpolation.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StringInterpolation.cs index 3171d865d1584..78836a245dbfc 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StringInterpolation.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_StringInterpolation.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_TupleCreationExpression.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_TupleCreationExpression.cs index f804904a77104..203e7c2301751 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_TupleCreationExpression.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_TupleCreationExpression.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +using System.Collections.Immutable; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_WhileStatement.cs b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_WhileStatement.cs index 5734c7323ff93..a72b989910167 100644 --- a/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_WhileStatement.cs +++ b/src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_WhileStatement.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; +using System.Collections.Immutable; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Portable/Lowering/SynthesizedSubmissionFields.cs b/src/Compilers/CSharp/Portable/Lowering/SynthesizedSubmissionFields.cs index 6c3365b7ddc2d..7728fe4384949 100644 --- a/src/Compilers/CSharp/Portable/Lowering/SynthesizedSubmissionFields.cs +++ b/src/Compilers/CSharp/Portable/Lowering/SynthesizedSubmissionFields.cs @@ -4,12 +4,12 @@ #nullable disable -using System; using System.Collections.Generic; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; +using System; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Parser/Blender.Cursor.cs b/src/Compilers/CSharp/Portable/Parser/Blender.Cursor.cs index bf5fb4d04b1be..b408bce8a7a6b 100644 --- a/src/Compilers/CSharp/Portable/Parser/Blender.Cursor.cs +++ b/src/Compilers/CSharp/Portable/Parser/Blender.Cursor.cs @@ -4,12 +4,12 @@ #nullable disable -using System; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System; namespace Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax { diff --git a/src/Compilers/CSharp/Portable/Parser/LexerCache.cs b/src/Compilers/CSharp/Portable/Parser/LexerCache.cs index 6e07289cf855b..da0ca610787c7 100644 --- a/src/Compilers/CSharp/Portable/Parser/LexerCache.cs +++ b/src/Compilers/CSharp/Portable/Parser/LexerCache.cs @@ -7,12 +7,12 @@ // #define COLLECT_STATS using System; -using System.Text; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Text; namespace Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax { diff --git a/src/Compilers/CSharp/Portable/Parser/Lexer_StringLiteral.cs b/src/Compilers/CSharp/Portable/Parser/Lexer_StringLiteral.cs index 5e1956c8105b6..da04733e21f80 100644 --- a/src/Compilers/CSharp/Portable/Parser/Lexer_StringLiteral.cs +++ b/src/Compilers/CSharp/Portable/Parser/Lexer_StringLiteral.cs @@ -4,14 +4,14 @@ #nullable disable +using Microsoft.CodeAnalysis.Collections; +using Microsoft.CodeAnalysis.PooledObjects; using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Collections; -using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax { diff --git a/src/Compilers/CSharp/Portable/SourceGeneration/CSharpGeneratorDriver.cs b/src/Compilers/CSharp/Portable/SourceGeneration/CSharpGeneratorDriver.cs index 9b980dca5dab0..5ddbb2bd85b3a 100644 --- a/src/Compilers/CSharp/Portable/SourceGeneration/CSharpGeneratorDriver.cs +++ b/src/Compilers/CSharp/Portable/SourceGeneration/CSharpGeneratorDriver.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Collections.Immutable; -using System.Linq; using System.Threading; using Microsoft.CodeAnalysis.Diagnostics; +using System.Linq; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Symbols/AnonymousTypes/SynthesizedSymbols/AnonymousType.SynthesizedMethodBase.cs b/src/Compilers/CSharp/Portable/Symbols/AnonymousTypes/SynthesizedSymbols/AnonymousType.SynthesizedMethodBase.cs index 6eef0ab1b9c1c..6a19be4e5f635 100644 --- a/src/Compilers/CSharp/Portable/Symbols/AnonymousTypes/SynthesizedSymbols/AnonymousType.SynthesizedMethodBase.cs +++ b/src/Compilers/CSharp/Portable/Symbols/AnonymousTypes/SynthesizedSymbols/AnonymousType.SynthesizedMethodBase.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Collections.Immutable; -using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.CSharp.Emit; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols diff --git a/src/Compilers/CSharp/Portable/Symbols/Attributes/AttributeData.cs b/src/Compilers/CSharp/Portable/Symbols/Attributes/AttributeData.cs index 16251c0e265ee..30e083b20619c 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Attributes/AttributeData.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Attributes/AttributeData.cs @@ -6,16 +6,16 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; using System.Linq; -using System.Reflection; using System.Runtime.InteropServices; using System.Text; -using Microsoft.CodeAnalysis; +using System.Reflection; using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +using Microsoft.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Attributes/SourceAttributeData.cs b/src/Compilers/CSharp/Portable/Symbols/Attributes/SourceAttributeData.cs index fc9f046d7e228..dda01b8945108 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Attributes/SourceAttributeData.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Attributes/SourceAttributeData.cs @@ -5,10 +5,10 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; using System.Linq; -using System.Reflection.Metadata; using Microsoft.CodeAnalysis.CSharp.Syntax; +using System.Reflection.Metadata; +using System.Diagnostics.CodeAnalysis; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/ConstantValueUtils.cs b/src/Compilers/CSharp/Portable/Symbols/ConstantValueUtils.cs index 4d309c64d0f6e..9e5a0b229be8e 100644 --- a/src/Compilers/CSharp/Portable/Symbols/ConstantValueUtils.cs +++ b/src/Compilers/CSharp/Portable/Symbols/ConstantValueUtils.cs @@ -4,8 +4,8 @@ #nullable disable -using System.Collections.Generic; using System.Collections.Immutable; +using System.Collections.Generic; using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; diff --git a/src/Compilers/CSharp/Portable/Symbols/ConstraintsHelper.cs b/src/Compilers/CSharp/Portable/Symbols/ConstraintsHelper.cs index 5ad2237fddb9f..037055b74e898 100644 --- a/src/Compilers/CSharp/Portable/Symbols/ConstraintsHelper.cs +++ b/src/Compilers/CSharp/Portable/Symbols/ConstraintsHelper.cs @@ -9,10 +9,10 @@ using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using System.Runtime.CompilerServices; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +using System.Runtime.CompilerServices; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/ErrorTypeSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/ErrorTypeSymbol.cs index 565cd4d9e3837..004f5ce10266d 100644 --- a/src/Compilers/CSharp/Portable/Symbols/ErrorTypeSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/ErrorTypeSymbol.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Roslyn.Utilities; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Runtime.InteropServices; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEEventSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEEventSymbol.cs index 874d8f1e75d69..802b89f730d4f 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEEventSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEEventSymbol.cs @@ -2,6 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.CSharp.DocumentationComments; +using Microsoft.CodeAnalysis.CSharp.Emit; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Collections.Immutable; @@ -10,10 +14,6 @@ using System.Reflection; using System.Reflection.Metadata; using System.Threading; -using Microsoft.CodeAnalysis.CSharp.DocumentationComments; -using Microsoft.CodeAnalysis.CSharp.Emit; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE { diff --git a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.cs index ca89d1865f8c4..427d4fb261044 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.cs @@ -4,15 +4,15 @@ #nullable disable -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Reflection.Metadata; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Reflection.Metadata; +using System; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE { diff --git a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.cs index 554c5cfcd8413..94efbb4550f53 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.cs @@ -10,9 +10,9 @@ using System.Diagnostics; using System.Globalization; using System.Linq; +using System.Runtime.InteropServices; using System.Reflection; using System.Reflection.Metadata; -using System.Runtime.InteropServices; using System.Threading; using Microsoft.CodeAnalysis.CSharp.DocumentationComments; using Microsoft.CodeAnalysis.CSharp.Emit; diff --git a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamespaceSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamespaceSymbol.cs index dcb62a5d18739..f65dd9c4436b3 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamespaceSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENamespaceSymbol.cs @@ -4,6 +4,8 @@ #nullable disable +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Collections.Immutable; @@ -11,8 +13,6 @@ using System.Linq; using System.Reflection.Metadata; using System.Threading; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE { diff --git a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.cs index a9aa1827f1b8a..797c31a8e713f 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.cs @@ -5,11 +5,11 @@ #nullable disable using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Reflection.Metadata; using System.Threading; using Roslyn.Utilities; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE { diff --git a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/TupleTypeDecoder.cs b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/TupleTypeDecoder.cs index 781c84fd29811..af0a16d9d0805 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/TupleTypeDecoder.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Metadata/PE/TupleTypeDecoder.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.Diagnostics; using System.Reflection.Metadata; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE { diff --git a/src/Compilers/CSharp/Portable/Symbols/MethodSymbolExtensions.cs b/src/Compilers/CSharp/Portable/Symbols/MethodSymbolExtensions.cs index 3e63d745b40e0..6ff5ef7702a84 100644 --- a/src/Compilers/CSharp/Portable/Symbols/MethodSymbolExtensions.cs +++ b/src/Compilers/CSharp/Portable/Symbols/MethodSymbolExtensions.cs @@ -4,14 +4,14 @@ #nullable disable +using Microsoft.CodeAnalysis.Collections; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Linq; -using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; +using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/MissingModuleSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/MissingModuleSymbol.cs index 1d33e7416806f..2bd3c1a5adb95 100644 --- a/src/Compilers/CSharp/Portable/Symbols/MissingModuleSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/MissingModuleSymbol.cs @@ -7,13 +7,13 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; -using System.Reflection.PortableExecutable; using System.Runtime.InteropServices; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Diagnostics; +using System.Reflection.PortableExecutable; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/MissingNamespaceSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/MissingNamespaceSymbol.cs index 55e93b06fd8ea..1fba2e3465546 100644 --- a/src/Compilers/CSharp/Portable/Symbols/MissingNamespaceSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/MissingNamespaceSymbol.cs @@ -6,11 +6,11 @@ using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/NonMissingAssemblySymbol.cs b/src/Compilers/CSharp/Portable/Symbols/NonMissingAssemblySymbol.cs index 8f9e8df846c87..ed8be8a7bfaea 100644 --- a/src/Compilers/CSharp/Portable/Symbols/NonMissingAssemblySymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/NonMissingAssemblySymbol.cs @@ -6,13 +6,13 @@ using System.Collections.Concurrent; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/OverriddenOrHiddenMembersResult.cs b/src/Compilers/CSharp/Portable/Symbols/OverriddenOrHiddenMembersResult.cs index b0fd8f7f4a810..bb9ed641b2cd0 100644 --- a/src/Compilers/CSharp/Portable/Symbols/OverriddenOrHiddenMembersResult.cs +++ b/src/Compilers/CSharp/Portable/Symbols/OverriddenOrHiddenMembersResult.cs @@ -5,10 +5,10 @@ #nullable disable using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; +using System.Diagnostics; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols diff --git a/src/Compilers/CSharp/Portable/Symbols/PointerTypeSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/PointerTypeSymbol.cs index 9e3502ebfa8f3..b667cb0b3bbf6 100644 --- a/src/Compilers/CSharp/Portable/Symbols/PointerTypeSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/PointerTypeSymbol.cs @@ -7,9 +7,9 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using Roslyn.Utilities; using System.Diagnostics; using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/ReferenceManager.cs b/src/Compilers/CSharp/Portable/Symbols/ReferenceManager.cs index c5b5eeeff2ac7..c74183f52f5f6 100644 --- a/src/Compilers/CSharp/Portable/Symbols/ReferenceManager.cs +++ b/src/Compilers/CSharp/Portable/Symbols/ReferenceManager.cs @@ -6,14 +6,15 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using Microsoft.CodeAnalysis.Collections; + using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; +using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis.Symbols; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.Symbols; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.cs index 4c57df2395fc4..da4dc6aaf714d 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.cs @@ -9,14 +9,14 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Collections.ObjectModel; -using System.Diagnostics; -using System.Globalization; -using System.Threading; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Diagnostics; +using System.Globalization; +using System.Threading; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting { diff --git a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingEventSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingEventSymbol.cs index 63647d270ce22..e8fd32a56eff5 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingEventSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingEventSymbol.cs @@ -5,15 +5,15 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; -using System.Globalization; -using System.Threading; -using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Diagnostics; +using System.Globalization; +using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Emit; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting { diff --git a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingFieldSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingFieldSymbol.cs index 187528900b853..a087f842c7370 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingFieldSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingFieldSymbol.cs @@ -8,8 +8,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using Microsoft.CodeAnalysis.CSharp.Emit; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.CSharp.Emit; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting { diff --git a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingNamespaceSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingNamespaceSymbol.cs index 0a6b263a154ff..9954e16c1f4f8 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingNamespaceSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingNamespaceSymbol.cs @@ -7,14 +7,14 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; -using System.Globalization; -using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Diagnostics; +using System.Globalization; +using System.Threading; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting { diff --git a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.cs b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.cs index 0503566765b9c..be8ece2a7ba76 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.cs @@ -10,8 +10,8 @@ using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; diff --git a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingTypeParameterSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingTypeParameterSymbol.cs index c209c66bcd967..2ff127565b8d0 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingTypeParameterSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Retargeting/RetargetingTypeParameterSymbol.cs @@ -7,13 +7,13 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; -using System.Globalization; using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Diagnostics; +using System.Globalization; namespace Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting { diff --git a/src/Compilers/CSharp/Portable/Symbols/SignatureOnlyMethodSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/SignatureOnlyMethodSymbol.cs index 76d1579fd7547..59a09861eb1cf 100644 --- a/src/Compilers/CSharp/Portable/Symbols/SignatureOnlyMethodSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/SignatureOnlyMethodSymbol.cs @@ -6,9 +6,9 @@ using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; -using System.Reflection.Metadata; using Roslyn.Utilities; +using System.Reflection.Metadata; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/CustomModifierUtils.cs b/src/Compilers/CSharp/Portable/Symbols/Source/CustomModifierUtils.cs index 33b44573e0af7..c22d081db63ad 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Source/CustomModifierUtils.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Source/CustomModifierUtils.cs @@ -4,11 +4,11 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.PooledObjects; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; -using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourceEventSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourceEventSymbol.cs index af87e312a56ab..87b77df7f5c2c 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Source/SourceEventSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Source/SourceEventSymbol.cs @@ -2,19 +2,19 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Globalization; -using System.Linq; using System.Threading; -using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Collections.Generic; +using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.CSharp.Emit; +using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberFieldSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberFieldSymbol.cs index 5c861766ee56e..238f0f2512e57 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberFieldSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberFieldSymbol.cs @@ -4,16 +4,16 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Emit; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Threading; -using Microsoft.CodeAnalysis.CSharp.Emit; -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamedTypeSymbol_Bases.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamedTypeSymbol_Bases.cs index 0969f400f1c3e..e52b2615acfcc 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamedTypeSymbol_Bases.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamedTypeSymbol_Bases.cs @@ -5,17 +5,17 @@ #nullable disable using System; -using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; using System.Threading; -using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Collections.Generic; +using Microsoft.CodeAnalysis.Collections; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/SubstitutedFieldSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/SubstitutedFieldSymbol.cs index 812ef064406a0..d957d20bfbe9c 100644 --- a/src/Compilers/CSharp/Portable/Symbols/SubstitutedFieldSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/SubstitutedFieldSymbol.cs @@ -7,8 +7,8 @@ using System; using System.Collections.Immutable; using System.Threading; -using Microsoft.CodeAnalysis.CSharp.Emit; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.CSharp.Emit; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/SymbolCompletionState.cs b/src/Compilers/CSharp/Portable/Symbols/SymbolCompletionState.cs index 5b5479ca3f278..6bfd061ef6933 100644 --- a/src/Compilers/CSharp/Portable/Symbols/SymbolCompletionState.cs +++ b/src/Compilers/CSharp/Portable/Symbols/SymbolCompletionState.cs @@ -5,13 +5,13 @@ #nullable disable using System.Diagnostics; -using System.Text; using System.Threading; -using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Text; +using Microsoft.CodeAnalysis.Collections; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/SymbolDistinguisher.cs b/src/Compilers/CSharp/Portable/Symbols/SymbolDistinguisher.cs index ec4d16a3f6bbb..3d86b3527dfae 100644 --- a/src/Compilers/CSharp/Portable/Symbols/SymbolDistinguisher.cs +++ b/src/Compilers/CSharp/Portable/Symbols/SymbolDistinguisher.cs @@ -4,11 +4,11 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.Diagnostics; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedContainer.cs b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedContainer.cs index 138b24313e81b..7d424e0ca1f77 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedContainer.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedContainer.cs @@ -9,8 +9,8 @@ using System.Collections.Immutable; using System.Diagnostics; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.CSharp.Emit; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols diff --git a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEmbeddedAttributeSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEmbeddedAttributeSymbol.cs index fc98a6999a3b7..c206668864d31 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEmbeddedAttributeSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEmbeddedAttributeSymbol.cs @@ -4,16 +4,16 @@ #nullable disable +using Microsoft.Cci; +using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Linq; using System.Runtime.InteropServices; -using Microsoft.Cci; +using System.Linq; using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEnumValueFieldSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEnumValueFieldSymbol.cs index b83c855112c47..0a6e4a5ca5950 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEnumValueFieldSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEnumValueFieldSymbol.cs @@ -4,8 +4,8 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.CSharp.Emit; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols diff --git a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedFieldSymbolBase.cs b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedFieldSymbolBase.cs index 7c5244a655b09..8e60bf2848e13 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedFieldSymbolBase.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedFieldSymbolBase.cs @@ -6,8 +6,8 @@ using System.Collections.Immutable; using System.Diagnostics; -using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.CSharp.Emit; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols diff --git a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedInteractiveInitializerMethod.cs b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedInteractiveInitializerMethod.cs index 2321dd4fd8bad..c6f7bc3fbe8dc 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedInteractiveInitializerMethod.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedInteractiveInitializerMethod.cs @@ -4,13 +4,13 @@ #nullable disable +using Roslyn.Utilities; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Linq; using System.Reflection; +using System.Linq; using Microsoft.CodeAnalysis.Text; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedIntrinsicOperatorSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedIntrinsicOperatorSymbol.cs index c8c9c9ed74f27..e97ac78ab7771 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedIntrinsicOperatorSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedIntrinsicOperatorSymbol.cs @@ -4,11 +4,11 @@ #nullable disable -using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using Roslyn.Utilities; +using System; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/SynthesizedNamespaceSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/SynthesizedNamespaceSymbol.cs index cd5f7eec36f68..67f5a5d21a364 100644 --- a/src/Compilers/CSharp/Portable/Symbols/SynthesizedNamespaceSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/SynthesizedNamespaceSymbol.cs @@ -4,11 +4,11 @@ #nullable disable -using System; using System.Collections.Immutable; +using Roslyn.Utilities; using System.Diagnostics; +using System; using Microsoft.CodeAnalysis.Emit; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Symbols/Tuples/TupleFieldSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Tuples/TupleFieldSymbol.cs index 0a3309ffbe87a..44a1763685642 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Tuples/TupleFieldSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Tuples/TupleFieldSymbol.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Roslyn.Utilities; using System.Collections.Immutable; using System.Diagnostics; using System.Threading; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Symbols { /// diff --git a/src/Compilers/CSharp/Portable/Symbols/Wrapped/WrappedParameterSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Wrapped/WrappedParameterSymbol.cs index 696ed2a2403d3..d72ddee82e48d 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Wrapped/WrappedParameterSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Wrapped/WrappedParameterSymbol.cs @@ -9,8 +9,8 @@ using System.Globalization; using System.Runtime.InteropServices; using System.Threading; -using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.CSharp.Emit; namespace Microsoft.CodeAnalysis.CSharp.Symbols { diff --git a/src/Compilers/CSharp/Portable/Syntax/EventDeclarationSyntax.cs b/src/Compilers/CSharp/Portable/Syntax/EventDeclarationSyntax.cs index daaac1d4c207b..3525feb6ac5d5 100644 --- a/src/Compilers/CSharp/Portable/Syntax/EventDeclarationSyntax.cs +++ b/src/Compilers/CSharp/Portable/Syntax/EventDeclarationSyntax.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.CSharp.Syntax; using System; using System.ComponentModel; -using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp.Syntax { diff --git a/src/Compilers/CSharp/Portable/Syntax/IndexerDeclarationSyntax.cs b/src/Compilers/CSharp/Portable/Syntax/IndexerDeclarationSyntax.cs index 18570e031863d..c87269a9fe8bc 100644 --- a/src/Compilers/CSharp/Portable/Syntax/IndexerDeclarationSyntax.cs +++ b/src/Compilers/CSharp/Portable/Syntax/IndexerDeclarationSyntax.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.CSharp.Syntax; using System; using System.ComponentModel; -using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp.Syntax { diff --git a/src/Compilers/CSharp/Portable/Syntax/InternalSyntax/SyntaxToken.SyntaxLiteral.cs b/src/Compilers/CSharp/Portable/Syntax/InternalSyntax/SyntaxToken.SyntaxLiteral.cs index 1313991bfaefc..0493e1929af71 100644 --- a/src/Compilers/CSharp/Portable/Syntax/InternalSyntax/SyntaxToken.SyntaxLiteral.cs +++ b/src/Compilers/CSharp/Portable/Syntax/InternalSyntax/SyntaxToken.SyntaxLiteral.cs @@ -5,8 +5,8 @@ #nullable disable using System; -using System.Globalization; using Roslyn.Utilities; +using System.Globalization; namespace Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax { diff --git a/src/Compilers/CSharp/Portable/Syntax/PropertyDeclarationSyntax.cs b/src/Compilers/CSharp/Portable/Syntax/PropertyDeclarationSyntax.cs index 69f707f0d0681..aff5609cb9091 100644 --- a/src/Compilers/CSharp/Portable/Syntax/PropertyDeclarationSyntax.cs +++ b/src/Compilers/CSharp/Portable/Syntax/PropertyDeclarationSyntax.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.CSharp.Syntax; using System; using System.ComponentModel; -using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp.Syntax { diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Embedded.cs b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Embedded.cs index 15096365946e9..46140ddffb010 100644 --- a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Embedded.cs +++ b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Embedded.cs @@ -4,10 +4,10 @@ #nullable disable -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; +using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_IsUnmanaged.cs b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_IsUnmanaged.cs index b6ff93bc41ed8..7030e4225e882 100644 --- a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_IsUnmanaged.cs +++ b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_IsUnmanaged.cs @@ -4,9 +4,6 @@ #nullable disable -using System; -using System.Collections.Immutable; -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Syntax; @@ -15,6 +12,9 @@ using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Roslyn.Utilities; +using System; +using System.Collections.Immutable; +using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_ReadOnlyStruct.cs b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_ReadOnlyStruct.cs index 845b55490bcbb..159326acfd8e6 100644 --- a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_ReadOnlyStruct.cs +++ b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_ReadOnlyStruct.cs @@ -4,8 +4,6 @@ #nullable disable -using System.Collections.Immutable; -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Syntax; @@ -13,6 +11,8 @@ using Microsoft.CodeAnalysis.CSharp.UnitTests; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System.Collections.Immutable; +using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/EmitTestStrongNameProvider.cs b/src/Compilers/CSharp/Test/Emit/Attributes/EmitTestStrongNameProvider.cs index b2ce8ef31f404..b782b74d7fdb6 100644 --- a/src/Compilers/CSharp/Test/Emit/Attributes/EmitTestStrongNameProvider.cs +++ b/src/Compilers/CSharp/Test/Emit/Attributes/EmitTestStrongNameProvider.cs @@ -7,8 +7,8 @@ using System; using System.Collections.Immutable; using System.IO; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; using static Roslyn.Test.Utilities.SigningTestHelpers; diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/WellKnownAttributesTestBase.cs b/src/Compilers/CSharp/Test/Emit/Attributes/WellKnownAttributesTestBase.cs index cd1bece715397..ce04f6bc96c1b 100644 --- a/src/Compilers/CSharp/Test/Emit/Attributes/WellKnownAttributesTestBase.cs +++ b/src/Compilers/CSharp/Test/Emit/Attributes/WellKnownAttributesTestBase.cs @@ -11,16 +11,16 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Text; -using Microsoft.CodeAnalysis.CSharp.Emit; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; +using Microsoft.CodeAnalysis.CSharp.Emit; +using Microsoft.CodeAnalysis.Emit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenCapturing.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenCapturing.cs index f0094bebf978a..d74d9d4e7b2d2 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenCapturing.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenCapturing.cs @@ -4,17 +4,17 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Roslyn.Test.Utilities; using System; -using System.Collections; -using System.Collections.Concurrent; using System.Collections.Generic; -using System.Collections.Immutable; using System.Linq; using System.Text; -using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Roslyn.Test.Utilities; using Xunit; +using System.Collections; +using System.Collections.Immutable; +using System.Threading.Tasks; +using System.Collections.Concurrent; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen { diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenIterators.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenIterators.cs index 339905212e604..5b00142ccda9c 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenIterators.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenIterators.cs @@ -4,10 +4,10 @@ #nullable disable -using System; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenOperators.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenOperators.cs index 8b979fdba4a8d..a44a2e1b40a7f 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenOperators.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenOperators.cs @@ -4,14 +4,14 @@ #nullable disable -using System.Collections.Immutable; -using System.Text; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.CSharp.UnitTests.Emit; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System.Collections.Immutable; +using System.Text; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs index 1b18026cd622a..ba34dbeb843e1 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs @@ -21,8 +21,8 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using static Roslyn.Test.Utilities.TestMetadata; using static TestResources.NetFX.ValueTuple; +using static Roslyn.Test.Utilities.TestMetadata; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen { diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/EventTests.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/EventTests.cs index 2da7e739245d6..6039a5b140eec 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/EventTests.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/EventTests.cs @@ -9,10 +9,10 @@ using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.CSharp.UnitTests.Emit; -using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; -using Roslyn.Test.Utilities; using Xunit; +using Microsoft.CodeAnalysis.Test.Utilities; +using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen { diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/FixedSizeBufferTests.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/FixedSizeBufferTests.cs index 4ca148a5ce26f..97e453e6292f8 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/FixedSizeBufferTests.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/FixedSizeBufferTests.cs @@ -4,8 +4,6 @@ #nullable disable -using System.Linq; -using System.Runtime.InteropServices; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; using Microsoft.CodeAnalysis.CSharp.Syntax; @@ -13,6 +11,8 @@ using Microsoft.CodeAnalysis.CSharp.UnitTests.Emit; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System.Linq; +using System.Runtime.InteropServices; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/WinMdDelegateTests.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/WinMdDelegateTests.cs index 7b1a1a4a43a1f..91944f42f246e 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/WinMdDelegateTests.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/WinMdDelegateTests.cs @@ -4,15 +4,15 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.Test.Utilities; +using Roslyn.Test.Utilities; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Test.Utilities; -using Roslyn.Test.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen diff --git a/src/Compilers/CSharp/Test/Emit/Emit/DeterministicTests.cs b/src/Compilers/CSharp/Test/Emit/Emit/DeterministicTests.cs index f4e7f270db03f..777f086f5e01a 100644 --- a/src/Compilers/CSharp/Test/Emit/Emit/DeterministicTests.cs +++ b/src/Compilers/CSharp/Test/Emit/Emit/DeterministicTests.cs @@ -9,15 +9,15 @@ using System.Collections.Immutable; using System.IO; using System.Linq; -using System.Reflection.PortableExecutable; using System.Threading; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Test.Utilities; +using System.Reflection.PortableExecutable; using Roslyn.Test.Utilities; using Xunit; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Emit { diff --git a/src/Compilers/CSharp/Test/Emit/Emit/DynamicAnalysis/DynamicInstrumentationTests.cs b/src/Compilers/CSharp/Test/Emit/Emit/DynamicAnalysis/DynamicInstrumentationTests.cs index 3672986518128..805e7440a5a59 100644 --- a/src/Compilers/CSharp/Test/Emit/Emit/DynamicAnalysis/DynamicInstrumentationTests.cs +++ b/src/Compilers/CSharp/Test/Emit/Emit/DynamicAnalysis/DynamicInstrumentationTests.cs @@ -10,8 +10,8 @@ using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Test.Utilities; -using Roslyn.Test.Utilities; using Xunit; +using Roslyn.Test.Utilities; using static Microsoft.CodeAnalysis.Test.Utilities.CSharpInstrumentationChecker; namespace Microsoft.CodeAnalysis.CSharp.DynamicAnalysis.UnitTests diff --git a/src/Compilers/CSharp/Test/Emit/Emit/EmitCustomModifiers.cs b/src/Compilers/CSharp/Test/Emit/Emit/EmitCustomModifiers.cs index 2b2dd37b943fa..57b74980239f0 100644 --- a/src/Compilers/CSharp/Test/Emit/Emit/EmitCustomModifiers.cs +++ b/src/Compilers/CSharp/Test/Emit/Emit/EmitCustomModifiers.cs @@ -4,7 +4,6 @@ #nullable disable -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; @@ -12,6 +11,7 @@ using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Xunit; +using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Emit { diff --git a/src/Compilers/CSharp/Test/Emit/Emit/EmitErrorTests.cs b/src/Compilers/CSharp/Test/Emit/Emit/EmitErrorTests.cs index 7480727fa0bb1..3a559fcdc2531 100644 --- a/src/Compilers/CSharp/Test/Emit/Emit/EmitErrorTests.cs +++ b/src/Compilers/CSharp/Test/Emit/Emit/EmitErrorTests.cs @@ -8,13 +8,13 @@ using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.CSharp.UnitTests.Emit; -using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Xunit; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.Emit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Emit/Emit/EndToEndTests.cs b/src/Compilers/CSharp/Test/Emit/Emit/EndToEndTests.cs index 52f03b0dc8423..6ba84970145bc 100644 --- a/src/Compilers/CSharp/Test/Emit/Emit/EndToEndTests.cs +++ b/src/Compilers/CSharp/Test/Emit/Emit/EndToEndTests.cs @@ -4,14 +4,14 @@ #nullable disable +using Roslyn.Test.Utilities; using System; using System.Text; -using Microsoft.CodeAnalysis.CSharp.Symbols; +using Xunit; +using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis.Test.Utilities; -using Roslyn.Test.Utilities; -using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Emit { diff --git a/src/Compilers/CSharp/Test/Emit/Emit/ResourceTests.cs b/src/Compilers/CSharp/Test/Emit/Emit/ResourceTests.cs index 002a297f21135..148d8e54805be 100644 --- a/src/Compilers/CSharp/Test/Emit/Emit/ResourceTests.cs +++ b/src/Compilers/CSharp/Test/Emit/Emit/ResourceTests.cs @@ -7,7 +7,6 @@ using System; using System.ComponentModel; using System.Diagnostics; -using System.Globalization; using System.IO; using System.Linq; using System.Reflection; @@ -18,6 +17,7 @@ using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using System.Globalization; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Emit { diff --git a/src/Compilers/CSharp/Test/Emit/PrivateProtected.cs b/src/Compilers/CSharp/Test/Emit/PrivateProtected.cs index 9dde54b58840d..059a107ff10ba 100644 --- a/src/Compilers/CSharp/Test/Emit/PrivateProtected.cs +++ b/src/Compilers/CSharp/Test/Emit/PrivateProtected.cs @@ -5,12 +5,12 @@ #nullable disable using System.Collections.Immutable; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using Xunit; using static Roslyn.Test.Utilities.SigningTestHelpers; +using Xunit; +using Microsoft.CodeAnalysis.CSharp.Symbols; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_ISymbolInitializer.cs b/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_ISymbolInitializer.cs index 57a316bff5c0b..152a0fde829df 100644 --- a/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_ISymbolInitializer.cs +++ b/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_ISymbolInitializer.cs @@ -4,11 +4,11 @@ #nullable disable -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidExpression.cs b/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidExpression.cs index 4b74c29f6559f..f305a8ac4c238 100644 --- a/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidExpression.cs +++ b/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidExpression.cs @@ -4,11 +4,11 @@ #nullable disable -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidStatement.cs b/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidStatement.cs index 8ae2a7da92177..4c7dc839b84bc 100644 --- a/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidStatement.cs +++ b/src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests_InvalidStatement.cs @@ -4,11 +4,11 @@ #nullable disable -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Semantic/Diagnostics/OperationAnalyzerTests.cs b/src/Compilers/CSharp/Test/Semantic/Diagnostics/OperationAnalyzerTests.cs index 277255018b29f..a9bc194f86d55 100644 --- a/src/Compilers/CSharp/Test/Semantic/Diagnostics/OperationAnalyzerTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Diagnostics/OperationAnalyzerTests.cs @@ -9,9 +9,9 @@ using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Test.Utilities; -using Microsoft.CodeAnalysis.UnitTests.Diagnostics; using Roslyn.Test.Utilities; using Xunit; +using Microsoft.CodeAnalysis.UnitTests.Diagnostics; using static Microsoft.CodeAnalysis.CommonDiagnosticAnalyzers; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Semantic/FlowAnalysis/StructTests.cs b/src/Compilers/CSharp/Test/Semantic/FlowAnalysis/StructTests.cs index 820b34dc468fd..fd01c43e7352f 100644 --- a/src/Compilers/CSharp/Test/Semantic/FlowAnalysis/StructTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/FlowAnalysis/StructTests.cs @@ -6,10 +6,10 @@ using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/AwaitExpressionTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/AwaitExpressionTests.cs index fe5e2825286f5..ff547024e3d84 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/AwaitExpressionTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/AwaitExpressionTests.cs @@ -4,7 +4,6 @@ #nullable disable -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; @@ -12,6 +11,7 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; +using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/BetterCandidates.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/BetterCandidates.cs index 551ad4a8973d4..32280b50301e3 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/BetterCandidates.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/BetterCandidates.cs @@ -4,16 +4,16 @@ #nullable disable -using System.Collections; using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using System.Linq; +using System.Diagnostics; +using System.Collections; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/BindingTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/BindingTests.cs index 52fa733e979a7..8249170b71bb9 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/BindingTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/BindingTests.cs @@ -7,11 +7,11 @@ using System.Collections.Generic; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/DynamicTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/DynamicTests.cs index c1d31f7ee972d..d415815594392 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/DynamicTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/DynamicTests.cs @@ -5,14 +5,14 @@ #nullable disable using System; -using System.Collections.Generic; -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using System.Collections.Generic; +using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/ExpressionBodiedMemberTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/ExpressionBodiedMemberTests.cs index 277c95d65174f..9c6a695db5e08 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/ExpressionBodiedMemberTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/ExpressionBodiedMemberTests.cs @@ -7,11 +7,11 @@ using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.CSharp.UnitTests; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/FuzzTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/FuzzTests.cs index 94a2cd3bb6587..8578baf232325 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/FuzzTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/FuzzTests.cs @@ -4,10 +4,10 @@ #nullable disable -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/ImportsTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/ImportsTests.cs index fdbf532ca8bb0..f437cd21dff54 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/ImportsTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/ImportsTests.cs @@ -5,7 +5,6 @@ #nullable disable using System.Collections.Generic; -using System.Collections.Immutable; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; @@ -13,6 +12,7 @@ using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/InteractiveUsingTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/InteractiveUsingTests.cs index 7d7030cb5c786..a475e3a18146f 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/InteractiveUsingTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/InteractiveUsingTests.cs @@ -9,9 +9,9 @@ using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using Microsoft.CodeAnalysis.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/InterpolationTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/InterpolationTests.cs index ebd4dc113af5f..62cc043b27220 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/InterpolationTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/InterpolationTests.cs @@ -4,10 +4,10 @@ #nullable disable -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/IteratorTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/IteratorTests.cs index da76c2242edd1..97944cb79b263 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/IteratorTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/IteratorTests.cs @@ -5,14 +5,14 @@ #nullable disable using System.IO; -using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.Test.Utilities; +using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/LocalFunctionTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/LocalFunctionTests.cs index ab5c72d182466..9daf64427a68e 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/LocalFunctionTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/LocalFunctionTests.cs @@ -4,15 +4,15 @@ #nullable disable -using System; -using System.Collections.Immutable; -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Roslyn.Utilities; +using System; +using System.Collections.Immutable; +using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/MemberResolutionResultTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/MemberResolutionResultTests.cs index c33793350f039..d4ffaa5b3ccfa 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/MemberResolutionResultTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/MemberResolutionResultTests.cs @@ -4,12 +4,12 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.Semantics diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/NameLengthTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/NameLengthTests.cs index 9c6f4a3bd8de1..f6892c39b5001 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/NameLengthTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/NameLengthTests.cs @@ -4,13 +4,13 @@ #nullable disable -using System; using System.IO; -using Microsoft.Cci; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using Microsoft.Cci; +using System; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/NameOfTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/NameOfTests.cs index 4c6c3bf5f4ec8..0a0dc8c945aac 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/NameOfTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/NameOfTests.cs @@ -5,14 +5,14 @@ #nullable disable using System; -using System.Linq; -using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using System.Threading; +using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/OperatorTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/OperatorTests.cs index 8a208dcd25d5b..44d5fc2dd4851 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/OperatorTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/OperatorTests.cs @@ -11,9 +11,9 @@ using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Test.Utilities; -using Roslyn.Test.Utilities; using Xunit; +using Roslyn.Test.Utilities; +using Microsoft.CodeAnalysis.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/OutVarTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/OutVarTests.cs index 55a8f6b91bed7..99740a7cd5898 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/OutVarTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/OutVarTests.cs @@ -11,11 +11,11 @@ using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Test.Utilities; +using Xunit; using Roslyn.Test.Utilities; using Roslyn.Utilities; -using Xunit; +using Microsoft.CodeAnalysis.Diagnostics; using static Roslyn.Test.Utilities.TestMetadata; using ReferenceEqualityComparer = Roslyn.Utilities.ReferenceEqualityComparer; diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionPerfTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionPerfTests.cs index 069e335a97079..6566129e0fbb1 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionPerfTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionPerfTests.cs @@ -4,10 +4,10 @@ #nullable disable -using System.Linq; -using System.Text; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Roslyn.Test.Utilities; +using System.Linq; +using System.Text; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionTestBase.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionTestBase.cs index 217ea164c2a8d..1e10ff7a1c44f 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionTestBase.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionTestBase.cs @@ -4,17 +4,17 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.CSharp.UnitTests; +using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.CSharp.UnitTests; -using Roslyn.Test.Utilities; -using Roslyn.Utilities; using Xunit; +using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTestBase.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTestBase.cs index 0a1acdc0277c7..3b592a4aab8f7 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTestBase.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTestBase.cs @@ -12,8 +12,8 @@ using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using Roslyn.Utilities; using Xunit; +using Roslyn.Utilities; using ReferenceEqualityComparer = Roslyn.Utilities.ReferenceEqualityComparer; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTests_Global.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTests_Global.cs index 7653b63ee75b2..1ea2d6a668273 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTests_Global.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTests_Global.cs @@ -12,8 +12,8 @@ using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using Roslyn.Utilities; using Xunit; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/PropertyAccessTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/PropertyAccessTests.cs index ba54d2743ed80..bf0fc81bae2d4 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/PropertyAccessTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/PropertyAccessTests.cs @@ -4,14 +4,14 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.UnitTests; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CSharp.UnitTests; -using Roslyn.Test.Utilities; using Xunit; +using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/ReadOnlyStructsTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/ReadOnlyStructsTests.cs index 735118312449d..3f03276b84575 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/ReadOnlyStructsTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/ReadOnlyStructsTests.cs @@ -5,8 +5,8 @@ #nullable disable using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/RefExtensionMethodsTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/RefExtensionMethodsTests.cs index fcc20148e20ac..97ded5084ff70 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/RefExtensionMethodsTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/RefExtensionMethodsTests.cs @@ -7,11 +7,11 @@ using System.Collections.Generic; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/RefLocalsAndReturnsTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/RefLocalsAndReturnsTests.cs index 62cbf64ff98f2..3883f09aeb305 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/RefLocalsAndReturnsTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/RefLocalsAndReturnsTests.cs @@ -5,13 +5,13 @@ #nullable disable using System.Collections.Generic; -using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; +using Xunit; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using Xunit; +using System.Linq; +using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.CSharp.Symbols; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/StructsTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/StructsTests.cs index 714082c2cfd8f..083a1c1bf07aa 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/StructsTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/StructsTests.cs @@ -5,8 +5,8 @@ #nullable disable using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/SwitchTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/SwitchTests.cs index 764e0cbe50dd1..6578ef1ef3bf0 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/SwitchTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/SwitchTests.cs @@ -4,11 +4,11 @@ #nullable disable -using System.Collections.Generic; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/SyntaxTreeRootTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/SyntaxTreeRootTests.cs index 29b31dc9201d3..a5bdfcbdb0f5a 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/SyntaxTreeRootTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/SyntaxTreeRootTests.cs @@ -4,17 +4,17 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Text; using System; using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; +using Xunit; using Microsoft.CodeAnalysis.CSharp.Symbols; -using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Text; -using Xunit; namespace Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/TargetTypedDefaultTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/TargetTypedDefaultTests.cs index 0cf060d4961e5..ebf0618a26854 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/TargetTypedDefaultTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/TargetTypedDefaultTests.cs @@ -4,12 +4,12 @@ #nullable disable -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; -using Roslyn.Test.Utilities; +using System.Linq; using Xunit; +using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/TypeOfTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/TypeOfTests.cs index 26429c2968029..fb6da4b4f8889 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/TypeOfTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/TypeOfTests.cs @@ -4,12 +4,12 @@ #nullable disable -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/WarningVersionTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/WarningVersionTests.cs index f810de72192f0..9a0a81a379c1b 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/WarningVersionTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/WarningVersionTests.cs @@ -4,8 +4,8 @@ #nullable disable -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Symbol/Compilation/CompilationAPITests.cs b/src/Compilers/CSharp/Test/Symbol/Compilation/CompilationAPITests.cs index 563876d4d33da..188a65c7fe99f 100644 --- a/src/Compilers/CSharp/Test/Symbol/Compilation/CompilationAPITests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Compilation/CompilationAPITests.cs @@ -12,7 +12,6 @@ using System.IO; using System.Linq; using System.Reflection.PortableExecutable; -using System.Security.Cryptography; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -26,10 +25,11 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; +using VB = Microsoft.CodeAnalysis.VisualBasic; +using KeyValuePairUtil = Roslyn.Utilities.KeyValuePairUtil; +using System.Security.Cryptography; using static Roslyn.Test.Utilities.TestHelpers; using static Roslyn.Test.Utilities.TestMetadata; -using KeyValuePairUtil = Roslyn.Utilities.KeyValuePairUtil; -using VB = Microsoft.CodeAnalysis.VisualBasic; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Symbol/Compilation/QueryClauseInfoTests.cs b/src/Compilers/CSharp/Test/Symbol/Compilation/QueryClauseInfoTests.cs index a871c72fbe263..b4ce0158e8f82 100644 --- a/src/Compilers/CSharp/Test/Symbol/Compilation/QueryClauseInfoTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Compilation/QueryClauseInfoTests.cs @@ -4,10 +4,10 @@ #nullable disable -using System; using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; +using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/AnonymousTypesSymbolTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/AnonymousTypesSymbolTests.cs index 2da7b08de5445..3f21385a75283 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/AnonymousTypesSymbolTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/AnonymousTypesSymbolTests.cs @@ -10,15 +10,15 @@ using System.IO; using System.Linq; using System.Reflection; -using System.Threading.Tasks; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using Roslyn.Utilities; using Xunit; +using System.Threading.Tasks; +using Microsoft.CodeAnalysis.Emit; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols { diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/ExtensionMethodTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/ExtensionMethodTests.cs index 19d6886ee5d46..d6377beb3b457 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/ExtensionMethodTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/ExtensionMethodTests.cs @@ -15,8 +15,8 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using static Roslyn.Test.Utilities.TestMetadata; using Utils = Microsoft.CodeAnalysis.CSharp.UnitTests.CompilationUtils; +using static Roslyn.Test.Utilities.TestMetadata; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols { diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/BaseTypeResolution.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/BaseTypeResolution.cs index ccae184393d63..f78cca40a4721 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/BaseTypeResolution.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/BaseTypeResolution.cs @@ -6,16 +6,16 @@ using System.Collections.Generic; using System.Linq; -using System.Reflection.Metadata; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using static Roslyn.Test.Utilities.TestMetadata; using CSReferenceManager = Microsoft.CodeAnalysis.CSharp.CSharpCompilation.ReferenceManager; +using System.Reflection.Metadata; +using static Roslyn.Test.Utilities.TestMetadata; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Metadata.PE { diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingEvents.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingEvents.cs index 8dd4851d5b179..61852eab05639 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingEvents.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingEvents.cs @@ -4,13 +4,13 @@ #nullable disable -using System; -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System; +using System.Linq; using Xunit; using static Roslyn.Test.Utilities.TestMetadata; diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingFields.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingFields.cs index 65a5bed45286e..1c0bc08a0f255 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingFields.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingFields.cs @@ -4,12 +4,12 @@ #nullable disable -using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Metadata.PE diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingIndexers.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingIndexers.cs index 6d50321fbb442..dcac054e6cdb5 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingIndexers.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingIndexers.cs @@ -5,8 +5,8 @@ #nullable disable using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingMethods.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingMethods.cs index bc2987f30eeae..c3b413062e0fc 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingMethods.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Metadata/PE/LoadingMethods.cs @@ -5,14 +5,14 @@ #nullable disable using System.Linq; -using System.Reflection; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using System.Reflection; using static Roslyn.Test.Utilities.TestMetadata; //test diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/NoPia.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/NoPia.cs index 10040d4c7cc09..532eea11e15a3 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/NoPia.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/NoPia.cs @@ -10,8 +10,8 @@ using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; -using Roslyn.Test.Utilities; using Xunit; +using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Retargeting { diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomAttributes.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomAttributes.cs index eabb9c0e366d5..8cc57e46a9b83 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomAttributes.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomAttributes.cs @@ -5,13 +5,13 @@ #nullable disable using System; -using System.Collections.Generic; using System.Linq; using System.Reflection.Metadata; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Roslyn.Test.Utilities; +using System.Collections.Generic; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Retargeting diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomModifiers.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomModifiers.cs index cd66ea697f1ca..0edd129c020d2 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomModifiers.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetCustomModifiers.cs @@ -5,15 +5,15 @@ #nullable disable using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; -using Roslyn.Test.Utilities; using Xunit; +using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Retargeting { diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetingTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetingTests.cs index 1b13524e0e91a..fad0938036e7c 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetingTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Retargeting/RetargetingTests.cs @@ -7,8 +7,8 @@ using System; using System.Collections.Immutable; using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Retargeting; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Test.Utilities; diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/BaseClassTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/BaseClassTests.cs index 6f4ef3280c515..e37e1eaad7c06 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/BaseClassTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/BaseClassTests.cs @@ -8,8 +8,8 @@ using System.Collections.Immutable; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Emit; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Emit; diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/EventTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/EventTests.cs index 351be904bff16..4c6b66371c085 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/EventTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/EventTests.cs @@ -4,14 +4,14 @@ #nullable disable -using System; -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System; +using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Source diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/ExpressionBodiedPropertyTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/ExpressionBodiedPropertyTests.cs index 8d3d3bf859fb4..ad857ae71ef04 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/ExpressionBodiedPropertyTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/ExpressionBodiedPropertyTests.cs @@ -4,12 +4,12 @@ #nullable disable -using System; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System; using Xunit; +using Microsoft.CodeAnalysis.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Source { diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/MethodTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/MethodTests.cs index 9405b61bcc557..056af7e3cf087 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/MethodTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/MethodTests.cs @@ -12,8 +12,8 @@ using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; +using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/PropertyTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/PropertyTests.cs index e115e9ab553b7..21a09ff22a202 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/PropertyTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/PropertyTests.cs @@ -7,14 +7,14 @@ using System; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Emit; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; +using Microsoft.CodeAnalysis.Emit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Source { diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/UsingAliasTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/UsingAliasTests.cs index cd35785d2e835..cdb2cfbd0aaeb 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/UsingAliasTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/UsingAliasTests.cs @@ -4,12 +4,12 @@ #nullable disable -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; +using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols.Source diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolExtensionTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolExtensionTests.cs index 50ff5e485493c..6c032e4930553 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolExtensionTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolExtensionTests.cs @@ -4,10 +4,10 @@ #nullable disable -using System; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Roslyn.Test.Utilities; +using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/TypedConstantTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/TypedConstantTests.cs index dace0526993f7..a045c2f5e5cd5 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/TypedConstantTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/TypedConstantTests.cs @@ -9,8 +9,8 @@ using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; +using Microsoft.CodeAnalysis.Test.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Symbols diff --git a/src/Compilers/CSharp/Test/Syntax/Diagnostics/DiagnosticTest.MockSyntaxTree.cs b/src/Compilers/CSharp/Test/Syntax/Diagnostics/DiagnosticTest.MockSyntaxTree.cs index 9a77b42d0a123..1a33cee8c15c6 100644 --- a/src/Compilers/CSharp/Test/Syntax/Diagnostics/DiagnosticTest.MockSyntaxTree.cs +++ b/src/Compilers/CSharp/Test/Syntax/Diagnostics/DiagnosticTest.MockSyntaxTree.cs @@ -5,12 +5,12 @@ #nullable disable using System; -using System.Collections.Immutable; -using System.Text; -using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; +using System.Threading; +using System.Text; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Syntax/LexicalAndXml/XmlDocCommentTests.cs b/src/Compilers/CSharp/Test/Syntax/LexicalAndXml/XmlDocCommentTests.cs index 50ae3df85edee..2479f4a321137 100644 --- a/src/Compilers/CSharp/Test/Syntax/LexicalAndXml/XmlDocCommentTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/LexicalAndXml/XmlDocCommentTests.cs @@ -4,17 +4,17 @@ #nullable disable -using System; using System.Collections.Generic; using System.Linq; using System.Text; -using System.Threading; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Xunit; +using System; +using System.Threading; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/AsyncParsingTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/AsyncParsingTests.cs index 3237701931a7a..78f0a99e054da 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/AsyncParsingTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/AsyncParsingTests.cs @@ -4,9 +4,9 @@ #nullable disable -using System; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Roslyn.Test.Utilities; +using System; using Xunit; using Xunit.Abstractions; diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/CrefParsingTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/CrefParsingTests.cs index 857299cb5a80a..7238a96dc69a8 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/CrefParsingTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/CrefParsingTests.cs @@ -4,10 +4,10 @@ #nullable disable -using System; -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Roslyn.Test.Utilities; +using System; +using System.Linq; using Xunit; using Xunit.Abstractions; diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/LocalFunctionParsingTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/LocalFunctionParsingTests.cs index 49a439458bb76..f0034659cc1c1 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/LocalFunctionParsingTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/LocalFunctionParsingTests.cs @@ -4,11 +4,11 @@ #nullable disable -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System.Linq; using Xunit; using Xunit.Abstractions; diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/ParserRegressionTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/ParserRegressionTests.cs index ab0132a81b74e..ce56ecd88690e 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/ParserRegressionTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/ParserRegressionTests.cs @@ -4,13 +4,13 @@ #nullable disable -using System.Collections.Generic; -using System.Linq; -using System.Text; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Roslyn.Test.Utilities.Syntax; +using System.Collections.Generic; +using System.Linq; +using System.Text; using Xunit; using Xunit.Abstractions; diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/ReadOnlyStructs.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/ReadOnlyStructs.cs index 6deb183df98b2..4f83645482f13 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/ReadOnlyStructs.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/ReadOnlyStructs.cs @@ -4,11 +4,11 @@ #nullable disable +using Xunit; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using Xunit; using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Parsing diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/RefReadonlyTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/RefReadonlyTests.cs index bcad9d472383a..f6a22989d091c 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/RefReadonlyTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/RefReadonlyTests.cs @@ -4,11 +4,11 @@ #nullable disable +using Xunit; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using Xunit; using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Parsing diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/RefStructs.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/RefStructs.cs index a0d94da957139..b8fffc5bdca7c 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/RefStructs.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/RefStructs.cs @@ -4,11 +4,11 @@ #nullable disable +using Xunit; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using Xunit; using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Parsing diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/StackAllocInitializerParsingTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/StackAllocInitializerParsingTests.cs index 2f1e33f2bbfca..8b3901f69bbf6 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/StackAllocInitializerParsingTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/StackAllocInitializerParsingTests.cs @@ -4,9 +4,9 @@ #nullable disable +using Xunit; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; -using Xunit; using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Parsing diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/ValueTupleTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/ValueTupleTests.cs index 04623ca4649a7..8ee753002d30d 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/ValueTupleTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/ValueTupleTests.cs @@ -4,11 +4,11 @@ #nullable disable +using Xunit; using System.Linq; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; -using Xunit; using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Parsing diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/ChildSyntaxListTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/ChildSyntaxListTests.cs index 2e3e791a4e5b7..e78a52ddb1afc 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/ChildSyntaxListTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/ChildSyntaxListTests.cs @@ -4,10 +4,10 @@ #nullable disable -using System; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; +using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxFactoryTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxFactoryTests.cs index f974ae530f74d..e2f6c14aea80a 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxFactoryTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxFactoryTests.cs @@ -9,11 +9,11 @@ using System.Linq; using System.Text; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Xunit; using InternalSyntax = Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxListTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxListTests.cs index 8bc38e834862d..be509ab5aa57c 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxListTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxListTests.cs @@ -4,14 +4,14 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Microsoft.CodeAnalysis.Test.Utilities; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeOrTokenListTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeOrTokenListTests.cs index efa2b506d8c06..6d3c6c6053186 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeOrTokenListTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeOrTokenListTests.cs @@ -4,11 +4,11 @@ #nullable disable -using System; using System.Collections.Generic; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; +using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeTests.cs index 72432349b1946..ffaca6b7089bb 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNodeTests.cs @@ -7,12 +7,12 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Xunit; using InternalSyntax = Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax; +using System.Text; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNormalizerTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNormalizerTests.cs index 02355c4900028..0e87076b9dafd 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNormalizerTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNormalizerTests.cs @@ -4,13 +4,13 @@ #nullable disable -using System; using System.Text; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Xunit; +using System; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTokenListTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTokenListTests.cs index 9552777a9dea8..604927769ceca 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTokenListTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTokenListTests.cs @@ -4,11 +4,11 @@ #nullable disable -using System; using System.Collections.Generic; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; +using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTriviaListTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTriviaListTests.cs index 47b290af32762..7b86b365596e6 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTriviaListTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTriviaListTests.cs @@ -4,11 +4,11 @@ #nullable disable -using System; using System.Collections.Generic; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; +using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/WinRT/CodeGen/WinRTCollectionTests.cs b/src/Compilers/CSharp/Test/WinRT/CodeGen/WinRTCollectionTests.cs index aafee2b066d48..f094328bc9e46 100644 --- a/src/Compilers/CSharp/Test/WinRT/CodeGen/WinRTCollectionTests.cs +++ b/src/Compilers/CSharp/Test/WinRT/CodeGen/WinRTCollectionTests.cs @@ -5,12 +5,12 @@ #nullable disable using System.Collections.Generic; -using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using System.Linq; +using Microsoft.CodeAnalysis.CSharp.Syntax; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen { diff --git a/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdEventTests.cs b/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdEventTests.cs index 75987d8c14723..44eb7a532aa3d 100644 --- a/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdEventTests.cs +++ b/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdEventTests.cs @@ -4,8 +4,6 @@ #nullable disable -using System; -using System.Linq; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; @@ -13,6 +11,8 @@ using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System; +using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdMetadataTests.cs b/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdMetadataTests.cs index b8f8bcf90fbe6..993d13b385885 100644 --- a/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdMetadataTests.cs +++ b/src/Compilers/CSharp/Test/WinRT/Metadata/WinMdMetadataTests.cs @@ -9,16 +9,20 @@ using System.IO; using System.Linq; using System.Text; + using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; +using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen; + using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; + + using Xunit; +using Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/CommonSyntaxTests.cs b/src/Compilers/Core/CodeAnalysisTest/CommonSyntaxTests.cs index b500b19cddc0d..f4af4e32d064e 100644 --- a/src/Compilers/Core/CodeAnalysisTest/CommonSyntaxTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/CommonSyntaxTests.cs @@ -9,8 +9,8 @@ using Microsoft.CodeAnalysis.Text; using Roslyn.Test.Utilities; using Xunit; -using CS = Microsoft.CodeAnalysis.CSharp; using VB = Microsoft.CodeAnalysis.VisualBasic; +using CS = Microsoft.CodeAnalysis.CSharp; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/CommonTypedConstantTests.cs b/src/Compilers/Core/CodeAnalysisTest/CommonTypedConstantTests.cs index d8de79779b8eb..e2b75c9f00106 100644 --- a/src/Compilers/Core/CodeAnalysisTest/CommonTypedConstantTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/CommonTypedConstantTests.cs @@ -4,14 +4,14 @@ #nullable disable +using Microsoft.CodeAnalysis.Symbols; +using Microsoft.CodeAnalysis.Test.Utilities; +using Roslyn.Test.Utilities; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Symbols; -using Microsoft.CodeAnalysis.Test.Utilities; -using Roslyn.Test.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.UnitTests diff --git a/src/Compilers/Core/CodeAnalysisTest/CryptoBlobParserTests.cs b/src/Compilers/Core/CodeAnalysisTest/CryptoBlobParserTests.cs index 5d7e545f0b7ab..c3ef283b036f0 100644 --- a/src/Compilers/Core/CodeAnalysisTest/CryptoBlobParserTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/CryptoBlobParserTests.cs @@ -4,13 +4,13 @@ #nullable disable +using Roslyn.Test.Utilities; using System; using System.Collections.Immutable; using System.Diagnostics; using System.Globalization; using System.Linq; using System.Security.Cryptography; -using Roslyn.Test.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.UnitTests diff --git a/src/Compilers/Core/CodeAnalysisTest/Diagnostics/SuppressMessageTargetSymbolResolverTests.cs b/src/Compilers/Core/CodeAnalysisTest/Diagnostics/SuppressMessageTargetSymbolResolverTests.cs index 62d76a77178be..d4a11c5acd9b7 100644 --- a/src/Compilers/Core/CodeAnalysisTest/Diagnostics/SuppressMessageTargetSymbolResolverTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/Diagnostics/SuppressMessageTargetSymbolResolverTests.cs @@ -4,8 +4,6 @@ #nullable disable -using System.Collections.Generic; -using System.Collections.Immutable; using System.Linq; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Diagnostics; @@ -13,6 +11,8 @@ using Microsoft.CodeAnalysis.VisualBasic; using Roslyn.Test.Utilities; using Xunit; +using System.Collections.Generic; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.UnitTests.Diagnostics { diff --git a/src/Compilers/Core/CodeAnalysisTest/EmbeddedTextTests.cs b/src/Compilers/Core/CodeAnalysisTest/EmbeddedTextTests.cs index db2ff1b4e63e5..a72360e7926dc 100644 --- a/src/Compilers/Core/CodeAnalysisTest/EmbeddedTextTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/EmbeddedTextTests.cs @@ -7,13 +7,13 @@ using System; using System.Collections.Generic; using System.IO; -using System.IO.Compression; -using System.Linq; -using System.Text; using Microsoft.CodeAnalysis.Text; -using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; +using System.Text; +using System.IO.Compression; +using Roslyn.Test.Utilities; +using System.Linq; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/SpecializedCollectionsTests.cs b/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/SpecializedCollectionsTests.cs index 3e1fc5d2f730a..74ac02e753b5b 100644 --- a/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/SpecializedCollectionsTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/SpecializedCollectionsTests.cs @@ -4,11 +4,11 @@ #nullable disable +using Roslyn.Utilities; using System; using System.Collections; using System.Collections.Generic; using System.Collections.Immutable; -using Roslyn.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.UnitTests.InternalUtilities diff --git a/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/StreamExtensionsTests.cs b/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/StreamExtensionsTests.cs index 6d9b2b6d39b81..f18b9ba6a9d6f 100644 --- a/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/StreamExtensionsTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/InternalUtilities/StreamExtensionsTests.cs @@ -4,10 +4,10 @@ #nullable disable -using System; -using System.IO; using Microsoft.CodeAnalysis; using Roslyn.Test.Utilities; +using System; +using System.IO; using Xunit; namespace Roslyn.Utilities.UnitTests.InternalUtilities diff --git a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/AssemblyMetadataTests.cs b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/AssemblyMetadataTests.cs index cb44bdaad0483..e85b4d95b6b56 100644 --- a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/AssemblyMetadataTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/AssemblyMetadataTests.cs @@ -5,10 +5,10 @@ #nullable disable using System; -using System.Collections.Generic; using System.Collections.Immutable; using Roslyn.Test.Utilities; using Xunit; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyIdentityTests.cs b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyIdentityTests.cs index c8cb0ffa77d74..d800e672d0a45 100644 --- a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyIdentityTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyIdentityTests.cs @@ -8,8 +8,8 @@ using System.Globalization; using System.IO; using System.Reflection; -using Roslyn.Test.Utilities; using Xunit; +using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.UnitTests.MetadataReferences { diff --git a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyPortabilityPolicy.cs b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyPortabilityPolicy.cs index 1b494f269e03e..6f0e711d3fc36 100644 --- a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyPortabilityPolicy.cs +++ b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/FusionAssemblyPortabilityPolicy.cs @@ -5,8 +5,6 @@ #nullable disable using System; -using System.Collections.Immutable; -using System.Diagnostics; using System.IO; using System.Linq; using System.Runtime.InteropServices; @@ -14,6 +12,8 @@ using System.Text; using System.Threading; using Roslyn.Utilities; +using System.Diagnostics; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataReferenceTests.cs b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataReferenceTests.cs index 37e8fbd2ad2ac..97ee1e1246445 100644 --- a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataReferenceTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/MetadataReferenceTests.cs @@ -18,8 +18,8 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using static Roslyn.Test.Utilities.TestMetadata; using CS = Microsoft.CodeAnalysis.CSharp; +using static Roslyn.Test.Utilities.TestMetadata; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/ModuleMetadataTests.cs b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/ModuleMetadataTests.cs index 9f846451fbf76..b0d29d7d6225d 100644 --- a/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/ModuleMetadataTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/MetadataReferences/ModuleMetadataTests.cs @@ -5,12 +5,12 @@ #nullable disable using System; -using System.Collections.Generic; using System.Collections.Immutable; using System.IO; -using System.Reflection.PortableExecutable; using Roslyn.Test.Utilities; using Xunit; +using System.Collections.Generic; +using System.Reflection.PortableExecutable; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/SourceFileResolverTest.cs b/src/Compilers/Core/CodeAnalysisTest/SourceFileResolverTest.cs index a4f7c715dd44f..326a13c5140dd 100644 --- a/src/Compilers/Core/CodeAnalysisTest/SourceFileResolverTest.cs +++ b/src/Compilers/Core/CodeAnalysisTest/SourceFileResolverTest.cs @@ -4,11 +4,11 @@ #nullable disable +using Roslyn.Test.Utilities; +using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.IO; -using Roslyn.Test.Utilities; -using Roslyn.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.UnitTests diff --git a/src/Compilers/Core/CodeAnalysisTest/Text/StringTextTest.cs b/src/Compilers/Core/CodeAnalysisTest/Text/StringTextTest.cs index a0cb3eb0f697c..2138c7162fb10 100644 --- a/src/Compilers/Core/CodeAnalysisTest/Text/StringTextTest.cs +++ b/src/Compilers/Core/CodeAnalysisTest/Text/StringTextTest.cs @@ -5,14 +5,14 @@ #nullable disable using System; -using System.Collections.Immutable; -using System.IO; -using System.Security.Cryptography; -using System.Text; using Microsoft.CodeAnalysis.Text; +using Xunit; +using System.Text; +using System.IO; using Roslyn.Test.Utilities; +using System.Security.Cryptography; +using System.Collections.Immutable; using Roslyn.Utilities; -using Xunit; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CodeAnalysisTest/VersionHelperTests.cs b/src/Compilers/Core/CodeAnalysisTest/VersionHelperTests.cs index 53e1dcdfe1525..12a2468a69eaa 100644 --- a/src/Compilers/Core/CodeAnalysisTest/VersionHelperTests.cs +++ b/src/Compilers/Core/CodeAnalysisTest/VersionHelperTests.cs @@ -8,8 +8,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; +using Microsoft.CodeAnalysis.Test.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.UnitTests diff --git a/src/Compilers/Core/CodeAnalysisTest/Win32Res.cs b/src/Compilers/Core/CodeAnalysisTest/Win32Res.cs index a5b25d6816ec4..b7e00741e113d 100644 --- a/src/Compilers/Core/CodeAnalysisTest/Win32Res.cs +++ b/src/Compilers/Core/CodeAnalysisTest/Win32Res.cs @@ -9,11 +9,11 @@ using System.Linq; using System.Runtime.InteropServices; using System.Xml; -using Microsoft.CodeAnalysis.CodeGen; -using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; -using Roslyn.Test.Utilities; using Xunit; +using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.CodeGen; +using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Compilers/Core/CommandLine/BuildProtocol.cs b/src/Compilers/Core/CommandLine/BuildProtocol.cs index bdaf85cab2df2..4ad65f3c4db6d 100644 --- a/src/Compilers/Core/CommandLine/BuildProtocol.cs +++ b/src/Compilers/Core/CommandLine/BuildProtocol.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -12,7 +13,6 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using Roslyn.Utilities; using static Microsoft.CodeAnalysis.CommandLine.BuildProtocolConstants; using static Microsoft.CodeAnalysis.CommandLine.CompilerServerLogger; diff --git a/src/Compilers/Core/CommandLine/CompilerServerLogger.cs b/src/Compilers/Core/CommandLine/CompilerServerLogger.cs index 99f7a1560a43b..d13c363c03446 100644 --- a/src/Compilers/Core/CommandLine/CompilerServerLogger.cs +++ b/src/Compilers/Core/CommandLine/CompilerServerLogger.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; using System.Text; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CommandLine { diff --git a/src/Compilers/Core/CommandLine/ConsoleUtil.cs b/src/Compilers/Core/CommandLine/ConsoleUtil.cs index aecd220ede2eb..2fb87faebe709 100644 --- a/src/Compilers/Core/CommandLine/ConsoleUtil.cs +++ b/src/Compilers/Core/CommandLine/ConsoleUtil.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis; using System; using System.IO; using System.Text; -using Microsoft.CodeAnalysis; namespace Microsoft.CodeAnalysis.CommandLine { diff --git a/src/Compilers/Core/MSBuildTask/Csc.cs b/src/Compilers/Core/MSBuildTask/Csc.cs index c43c80d7d840e..3dead94c8a72b 100644 --- a/src/Compilers/Core/MSBuildTask/Csc.cs +++ b/src/Compilers/Core/MSBuildTask/Csc.cs @@ -6,11 +6,11 @@ using System.Diagnostics; using System.Globalization; using System.Text; +using Roslyn.Utilities; using Microsoft.Build.Framework; using Microsoft.Build.Tasks.Hosting; using Microsoft.Build.Utilities; using Microsoft.CodeAnalysis.CommandLine; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.BuildTasks { diff --git a/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs b/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs index 98463e695c382..71017a0904bd2 100644 --- a/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs +++ b/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs @@ -12,10 +12,10 @@ using System.Text; using System.Threading; using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.CodeAnalysis.CommandLine; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.CommandLine; +using Microsoft.Build.Tasks; namespace Microsoft.CodeAnalysis.BuildTasks { diff --git a/src/Compilers/Core/MSBuildTask/RCWForCurrentContext.cs b/src/Compilers/Core/MSBuildTask/RCWForCurrentContext.cs index db30c4e3a4ee2..09300c5978caa 100644 --- a/src/Compilers/Core/MSBuildTask/RCWForCurrentContext.cs +++ b/src/Compilers/Core/MSBuildTask/RCWForCurrentContext.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System; -using System.Diagnostics; using System.Runtime.InteropServices; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.BuildTasks { diff --git a/src/Compilers/Core/MSBuildTask/Utilities.cs b/src/Compilers/Core/MSBuildTask/Utilities.cs index f44216493dc17..14c50fe1bb9b1 100644 --- a/src/Compilers/Core/MSBuildTask/Utilities.cs +++ b/src/Compilers/Core/MSBuildTask/Utilities.cs @@ -2,14 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; using System; using System.Diagnostics; using System.Globalization; using System.IO; using System.Reflection; using System.Security; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; namespace Microsoft.CodeAnalysis.BuildTasks { diff --git a/src/Compilers/Core/MSBuildTask/Vbc.cs b/src/Compilers/Core/MSBuildTask/Vbc.cs index 768bc65a8e611..f74e830993918 100644 --- a/src/Compilers/Core/MSBuildTask/Vbc.cs +++ b/src/Compilers/Core/MSBuildTask/Vbc.cs @@ -3,14 +3,14 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Globalization; using System.IO; using System.Text; +using System.Collections.Generic; +using System.Globalization; using Microsoft.Build.Framework; -using Microsoft.Build.Tasks.Hosting; using Microsoft.Build.Utilities; +using Microsoft.Build.Tasks.Hosting; using Microsoft.CodeAnalysis.CommandLine; using Roslyn.Utilities; diff --git a/src/Compilers/Core/MSBuildTaskTests/CscTests.cs b/src/Compilers/Core/MSBuildTaskTests/CscTests.cs index fafb1862cefe8..f3a6c128630c2 100644 --- a/src/Compilers/Core/MSBuildTaskTests/CscTests.cs +++ b/src/Compilers/Core/MSBuildTaskTests/CscTests.cs @@ -3,14 +3,14 @@ // See the LICENSE file in the project root for more information. using System; -using System.IO; using System.Linq; using Microsoft.Build.Framework; using Microsoft.CodeAnalysis.BuildTasks; -using Microsoft.CodeAnalysis.BuildTasks.UnitTests.TestUtilities; +using Xunit; using Moq; +using System.IO; using Roslyn.Test.Utilities; -using Xunit; +using Microsoft.CodeAnalysis.BuildTasks.UnitTests.TestUtilities; namespace Microsoft.CodeAnalysis.BuildTasks.UnitTests { diff --git a/src/Compilers/Core/MSBuildTaskTests/MiscTests.cs b/src/Compilers/Core/MSBuildTaskTests/MiscTests.cs index aad36bdf90d38..96034040c66f0 100644 --- a/src/Compilers/Core/MSBuildTaskTests/MiscTests.cs +++ b/src/Compilers/Core/MSBuildTaskTests/MiscTests.cs @@ -3,14 +3,14 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Immutable; using System.Linq; using Microsoft.Build.Framework; using Microsoft.CodeAnalysis.BuildTasks; -using Microsoft.CodeAnalysis.CSharp; +using Xunit; using Moq; using Roslyn.Test.Utilities; -using Xunit; +using Microsoft.CodeAnalysis.CSharp; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.BuildTasks.UnitTests { diff --git a/src/Compilers/Core/MSBuildTaskTests/TargetTests.cs b/src/Compilers/Core/MSBuildTaskTests/TargetTests.cs index 372cc28ba382b..469887809ffb9 100644 --- a/src/Compilers/Core/MSBuildTaskTests/TargetTests.cs +++ b/src/Compilers/Core/MSBuildTaskTests/TargetTests.cs @@ -12,10 +12,10 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Xml; +using Roslyn.Test.Utilities; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; -using Roslyn.Test.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.BuildTasks.UnitTests diff --git a/src/Compilers/Core/MSBuildTaskTests/TestUtilities/MSBuildUtil.cs b/src/Compilers/Core/MSBuildTaskTests/TestUtilities/MSBuildUtil.cs index 134ccc914dd2d..17518299a9114 100644 --- a/src/Compilers/Core/MSBuildTaskTests/TestUtilities/MSBuildUtil.cs +++ b/src/Compilers/Core/MSBuildTaskTests/TestUtilities/MSBuildUtil.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.Build.Framework; +using Moq; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.Build.Framework; -using Moq; namespace Microsoft.CodeAnalysis.BuildTasks.UnitTests { diff --git a/src/Compilers/Core/Portable/CodeGen/ArrayMembers.cs b/src/Compilers/Core/Portable/CodeGen/ArrayMembers.cs index ea090229d2e9e..ad334c416e8cb 100644 --- a/src/Compilers/Core/Portable/CodeGen/ArrayMembers.cs +++ b/src/Compilers/Core/Portable/CodeGen/ArrayMembers.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using EmitContext = Microsoft.CodeAnalysis.Emit.EmitContext; diff --git a/src/Compilers/Core/Portable/CodeGen/CompilationTestData.cs b/src/Compilers/Core/Portable/CodeGen/CompilationTestData.cs index 3e0377dafdd87..b0cb635e5360a 100644 --- a/src/Compilers/Core/Portable/CodeGen/CompilationTestData.cs +++ b/src/Compilers/Core/Portable/CodeGen/CompilationTestData.cs @@ -2,15 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.Emit; +using Microsoft.CodeAnalysis.Symbols; +using Microsoft.DiaSymReader; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; using System.Threading; -using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.Symbols; -using Microsoft.DiaSymReader; namespace Microsoft.CodeAnalysis.CodeGen { diff --git a/src/Compilers/Core/Portable/CodeGen/PermissionSetAttribute.cs b/src/Compilers/Core/Portable/CodeGen/PermissionSetAttribute.cs index 01cb690123d3d..3da6f84924a37 100644 --- a/src/Compilers/Core/Portable/CodeGen/PermissionSetAttribute.cs +++ b/src/Compilers/Core/Portable/CodeGen/PermissionSetAttribute.cs @@ -2,17 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.Collections; +using Microsoft.CodeAnalysis.Emit; +using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.Symbols; +using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.Diagnostics; using System.IO; using System.Linq; using System.Text; -using Microsoft.CodeAnalysis.Collections; -using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis.Symbols; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CodeGen { diff --git a/src/Compilers/Core/Portable/CodeGen/SwitchIntegralJumpTableEmitter.SwitchBucket.cs b/src/Compilers/Core/Portable/CodeGen/SwitchIntegralJumpTableEmitter.SwitchBucket.cs index 8a86a36f705b1..850efba26f5be 100644 --- a/src/Compilers/Core/Portable/CodeGen/SwitchIntegralJumpTableEmitter.SwitchBucket.cs +++ b/src/Compilers/Core/Portable/CodeGen/SwitchIntegralJumpTableEmitter.SwitchBucket.cs @@ -3,10 +3,10 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis.Text; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis.CodeGen { diff --git a/src/Compilers/Core/Portable/Collections/IdentifierCollection.cs b/src/Compilers/Core/Portable/Collections/IdentifierCollection.cs index a162f564683f2..3527034c90d18 100644 --- a/src/Compilers/Core/Portable/Collections/IdentifierCollection.cs +++ b/src/Compilers/Core/Portable/Collections/IdentifierCollection.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Diagnostics; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Collections/UnionCollection.cs b/src/Compilers/Core/Portable/Collections/UnionCollection.cs index 8c5ca1ab96c73..b903f907bf76a 100644 --- a/src/Compilers/Core/Portable/Collections/UnionCollection.cs +++ b/src/Compilers/Core/Portable/Collections/UnionCollection.cs @@ -4,11 +4,11 @@ using System; using System.Collections.Generic; -using System.Collections.Immutable; -using System.Diagnostics; using System.Linq; using Microsoft.CodeAnalysis.Text; +using System.Diagnostics; using Roslyn.Utilities; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/CommandLine/TouchedFileLogger.cs b/src/Compilers/Core/Portable/CommandLine/TouchedFileLogger.cs index 71bdbe20e6796..c398790b4d4f2 100644 --- a/src/Compilers/Core/Portable/CommandLine/TouchedFileLogger.cs +++ b/src/Compilers/Core/Portable/CommandLine/TouchedFileLogger.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Roslyn.Utilities; using System; using System.IO; using System.Threading; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Compilation/PreprocessingSymbolInfo.cs b/src/Compilers/Core/Portable/Compilation/PreprocessingSymbolInfo.cs index bd6202b38ff8d..f8d1a1b3f5140 100644 --- a/src/Compilers/Core/Portable/Compilation/PreprocessingSymbolInfo.cs +++ b/src/Compilers/Core/Portable/Compilation/PreprocessingSymbolInfo.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using Roslyn.Utilities; +using System; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Compilation/SymbolInfo.cs b/src/Compilers/Core/Portable/Compilation/SymbolInfo.cs index 990e8594116d0..9831ac33a7ba9 100644 --- a/src/Compilers/Core/Portable/Compilation/SymbolInfo.cs +++ b/src/Compilers/Core/Portable/Compilation/SymbolInfo.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Immutable; -using System.Diagnostics; using System.Linq; using Roslyn.Utilities; +using System.Diagnostics; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/CvtRes.cs b/src/Compilers/Core/Portable/CvtRes.cs index c2d72bc31a181..ccf71f106b2a6 100644 --- a/src/Compilers/Core/Portable/CvtRes.cs +++ b/src/Compilers/Core/Portable/CvtRes.cs @@ -4,17 +4,17 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Linq; -using System.Reflection.PortableExecutable; using System.Text; using Microsoft.CodeAnalysis.Text; -using Roslyn.Utilities; +using System.Diagnostics; using BYTE = System.Byte; using DWORD = System.UInt32; using WCHAR = System.Char; using WORD = System.UInt16; +using System.Reflection.PortableExecutable; +using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/DiaSymReader/Metadata/MetadataAdapterBase.cs b/src/Compilers/Core/Portable/DiaSymReader/Metadata/MetadataAdapterBase.cs index a7b205d4194f0..03eac10d05ba5 100644 --- a/src/Compilers/Core/Portable/DiaSymReader/Metadata/MetadataAdapterBase.cs +++ b/src/Compilers/Core/Portable/DiaSymReader/Metadata/MetadataAdapterBase.cs @@ -5,8 +5,8 @@ #nullable disable using System; -using System.Reflection; using System.Runtime.InteropServices; +using System.Reflection; namespace Microsoft.DiaSymReader { diff --git a/src/Compilers/Core/Portable/DiaSymReader/Metadata/SymWriterMetadataAdapter.cs b/src/Compilers/Core/Portable/DiaSymReader/Metadata/SymWriterMetadataAdapter.cs index d17d65b5d66bd..f261ad4f0cc71 100644 --- a/src/Compilers/Core/Portable/DiaSymReader/Metadata/SymWriterMetadataAdapter.cs +++ b/src/Compilers/Core/Portable/DiaSymReader/Metadata/SymWriterMetadataAdapter.cs @@ -5,9 +5,9 @@ #nullable disable using System; -using System.Diagnostics; -using System.Reflection; using System.Runtime.InteropServices; +using System.Reflection; +using System.Diagnostics; namespace Microsoft.DiaSymReader { diff --git a/src/Compilers/Core/Portable/DiaSymReader/Utilities/ComMemoryStream.cs b/src/Compilers/Core/Portable/DiaSymReader/Utilities/ComMemoryStream.cs index 1edef1a363d91..83cc385d34dbc 100644 --- a/src/Compilers/Core/Portable/DiaSymReader/Utilities/ComMemoryStream.cs +++ b/src/Compilers/Core/Portable/DiaSymReader/Utilities/ComMemoryStream.cs @@ -5,10 +5,10 @@ #nullable disable using System; -using System.Collections.Generic; using System.IO; -using System.Runtime.InteropServices; +using System.Collections.Generic; using System.Runtime.InteropServices.ComTypes; +using System.Runtime.InteropServices; using STATSTG = System.Runtime.InteropServices.ComTypes.STATSTG; namespace Microsoft.DiaSymReader diff --git a/src/Compilers/Core/Portable/Diagnostic/DiagnosticBag.cs b/src/Compilers/Core/Portable/Diagnostic/DiagnosticBag.cs index 5979af65f6e31..43af33b7d544e 100644 --- a/src/Compilers/Core/Portable/Diagnostic/DiagnosticBag.cs +++ b/src/Compilers/Core/Portable/Diagnostic/DiagnosticBag.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections; using System.Collections.Concurrent; using System.Collections.Generic; +using System.Collections; using System.Collections.Immutable; using System.Diagnostics; using System.Text; diff --git a/src/Compilers/Core/Portable/Diagnostic/DiagnosticInfo.cs b/src/Compilers/Core/Portable/Diagnostic/DiagnosticInfo.cs index be93acf4adc75..0f271f2372989 100644 --- a/src/Compilers/Core/Portable/Diagnostic/DiagnosticInfo.cs +++ b/src/Compilers/Core/Portable/Diagnostic/DiagnosticInfo.cs @@ -8,9 +8,9 @@ using System.Diagnostics; using System.Globalization; using System.Reflection; +using Roslyn.Utilities; using System.Threading; using Microsoft.CodeAnalysis.Symbols; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Diagnostic/XmlLocation.cs b/src/Compilers/Core/Portable/Diagnostic/XmlLocation.cs index dddb1f1663873..191404c239695 100644 --- a/src/Compilers/Core/Portable/Diagnostic/XmlLocation.cs +++ b/src/Compilers/Core/Portable/Diagnostic/XmlLocation.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.Text; using System; -using System.Diagnostics; -using System.Xml; using System.Xml.Linq; -using Microsoft.CodeAnalysis.Text; +using System.Xml; +using System.Diagnostics; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Emit/AnonymousTypeValue.cs b/src/Compilers/Core/Portable/Emit/AnonymousTypeValue.cs index 866754db707e0..1cc7db8d8b795 100644 --- a/src/Compilers/Core/Portable/Emit/AnonymousTypeValue.cs +++ b/src/Compilers/Core/Portable/Emit/AnonymousTypeValue.cs @@ -4,8 +4,8 @@ #nullable disable -using System.Diagnostics; using Microsoft.Cci; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.Emit { diff --git a/src/Compilers/Core/Portable/Emit/DebugDocumentsBuilder.cs b/src/Compilers/Core/Portable/Emit/DebugDocumentsBuilder.cs index 4d64aac303616..c57bd62d12305 100644 --- a/src/Compilers/Core/Portable/Emit/DebugDocumentsBuilder.cs +++ b/src/Compilers/Core/Portable/Emit/DebugDocumentsBuilder.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Roslyn.Utilities; using System; using System.Collections.Concurrent; using System.Collections.Generic; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Emit { diff --git a/src/Compilers/Core/Portable/Emit/EditAndContinue/DeltaMetadataWriter.cs b/src/Compilers/Core/Portable/Emit/EditAndContinue/DeltaMetadataWriter.cs index 4732213ab99ee..46b3955fa274d 100644 --- a/src/Compilers/Core/Portable/Emit/EditAndContinue/DeltaMetadataWriter.cs +++ b/src/Compilers/Core/Portable/Emit/EditAndContinue/DeltaMetadataWriter.cs @@ -11,10 +11,10 @@ using System.Reflection.Metadata.Ecma335; using System.Threading; using Microsoft.Cci; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis.Symbols; +using Microsoft.CodeAnalysis; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.Symbols; namespace Microsoft.CodeAnalysis.Emit { diff --git a/src/Compilers/Core/Portable/Emit/EditAndContinue/SymbolChanges.cs b/src/Compilers/Core/Portable/Emit/EditAndContinue/SymbolChanges.cs index 51dd60d9dd64a..9ae6b6b8fa97b 100644 --- a/src/Compilers/Core/Portable/Emit/EditAndContinue/SymbolChanges.cs +++ b/src/Compilers/Core/Portable/Emit/EditAndContinue/SymbolChanges.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; +using Microsoft.Cci; +using Roslyn.Utilities; using System.Collections.Generic; using System.Diagnostics; -using Microsoft.Cci; +using System; using Microsoft.CodeAnalysis.Symbols; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Emit { diff --git a/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedMethod.cs b/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedMethod.cs index ab5ca85b9319d..66692ffdf4ed3 100644 --- a/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedMethod.cs +++ b/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedMethod.cs @@ -6,10 +6,10 @@ using System.Collections.Generic; using System.Collections.Immutable; +using Roslyn.Utilities; using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.Debugging; using Microsoft.CodeAnalysis.Symbols; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Emit.NoPia { diff --git a/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedType.cs b/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedType.cs index a5d5b39dacfcf..c5bf550d98e2a 100644 --- a/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedType.cs +++ b/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedType.cs @@ -4,13 +4,13 @@ #nullable disable -using System.Collections.Generic; using System.Collections.Immutable; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; +using System.Collections.Generic; using System.Diagnostics; using System.Reflection.Metadata; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Symbols; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Emit.NoPia { diff --git a/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedTypeParameter.cs b/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedTypeParameter.cs index d2087b4d6e465..799005de1ab02 100644 --- a/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedTypeParameter.cs +++ b/src/Compilers/Core/Portable/Emit/NoPia/CommonEmbeddedTypeParameter.cs @@ -4,10 +4,10 @@ #nullable disable +using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Reflection.Metadata; -using Roslyn.Utilities; using Cci = Microsoft.Cci; namespace Microsoft.CodeAnalysis.Emit.NoPia diff --git a/src/Compilers/Core/Portable/Emit/NoPia/EmbeddedTypesManager.cs b/src/Compilers/Core/Portable/Emit/NoPia/EmbeddedTypesManager.cs index 8143bf016ed7a..4415cd0e09d4c 100644 --- a/src/Compilers/Core/Portable/Emit/NoPia/EmbeddedTypesManager.cs +++ b/src/Compilers/Core/Portable/Emit/NoPia/EmbeddedTypesManager.cs @@ -4,13 +4,13 @@ #nullable disable +using System.Collections.Immutable; +using Microsoft.CodeAnalysis.PooledObjects; +using Roslyn.Utilities; using System; using System.Collections.Concurrent; using System.Collections.Generic; -using System.Collections.Immutable; using System.Diagnostics; -using Microsoft.CodeAnalysis.PooledObjects; -using Roslyn.Utilities; using Cci = Microsoft.Cci; namespace Microsoft.CodeAnalysis.Emit.NoPia diff --git a/src/Compilers/Core/Portable/Emit/NoPia/VtblGap.cs b/src/Compilers/Core/Portable/Emit/NoPia/VtblGap.cs index a06551e83743d..87d5f20a81d57 100644 --- a/src/Compilers/Core/Portable/Emit/NoPia/VtblGap.cs +++ b/src/Compilers/Core/Portable/Emit/NoPia/VtblGap.cs @@ -4,9 +4,9 @@ #nullable disable -using System.Collections.Generic; using System.Collections.Immutable; using Roslyn.Utilities; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis.Emit.NoPia { diff --git a/src/Compilers/Core/Portable/Emit/SemanticEdit.cs b/src/Compilers/Core/Portable/Emit/SemanticEdit.cs index ea14bae801ce9..6e94ee5e55467 100644 --- a/src/Compilers/Core/Portable/Emit/SemanticEdit.cs +++ b/src/Compilers/Core/Portable/Emit/SemanticEdit.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using Microsoft.CodeAnalysis.Symbols; using Roslyn.Utilities; +using System; namespace Microsoft.CodeAnalysis.Emit { diff --git a/src/Compilers/Core/Portable/FileSystem/RelativePathResolver.cs b/src/Compilers/Core/Portable/FileSystem/RelativePathResolver.cs index fc4778c581c60..dc14f8a42b31a 100644 --- a/src/Compilers/Core/Portable/FileSystem/RelativePathResolver.cs +++ b/src/Compilers/Core/Portable/FileSystem/RelativePathResolver.cs @@ -9,9 +9,9 @@ using System; using System.Collections.Immutable; using System.Diagnostics; -using System.IO; using System.Linq; using Roslyn.Utilities; +using System.IO; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/InternalUtilities/AssemblyIdentityUtils.cs b/src/Compilers/Core/Portable/InternalUtilities/AssemblyIdentityUtils.cs index 747a83e6d6808..8afa27f0886df 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/AssemblyIdentityUtils.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/AssemblyIdentityUtils.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Immutable; -using System.IO; using System.Reflection; using System.Reflection.Metadata; using System.Reflection.PortableExecutable; +using System.IO; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/InternalUtilities/BlobBuildingStream.cs b/src/Compilers/Core/Portable/InternalUtilities/BlobBuildingStream.cs index 9437655b9be0d..c458e569706a5 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/BlobBuildingStream.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/BlobBuildingStream.cs @@ -7,8 +7,8 @@ using System.Diagnostics; using System.IO; using System.Reflection.Metadata; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/InternalUtilities/EncodingExtensions.cs b/src/Compilers/Core/Portable/InternalUtilities/EncodingExtensions.cs index ee22e433694a7..ed721c5816e1d 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/EncodingExtensions.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/EncodingExtensions.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis; using System; using System.Diagnostics; using System.IO; using System.Text; -using Microsoft.CodeAnalysis; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/InternalUtilities/EnumField.cs b/src/Compilers/Core/Portable/InternalUtilities/EnumField.cs index a472cbd62e5f1..0bbe8947f8e80 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/EnumField.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/EnumField.cs @@ -4,8 +4,8 @@ using System.Collections.Generic; using System.Diagnostics; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/InternalUtilities/IsExternalInit.cs b/src/Compilers/Core/Portable/InternalUtilities/IsExternalInit.cs index 7d1e003609644..19138060ce89d 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/IsExternalInit.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/IsExternalInit.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/Core/Portable/InternalUtilities/JsonWriter.cs b/src/Compilers/Core/Portable/InternalUtilities/JsonWriter.cs index 37a5e5dbcc3ea..d857dfaf9a0f9 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/JsonWriter.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/JsonWriter.cs @@ -7,8 +7,8 @@ using System.Globalization; using System.IO; using System.Text; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/InternalUtilities/OneOrMany.cs b/src/Compilers/Core/Portable/InternalUtilities/OneOrMany.cs index 91e7726c38646..bdf29b7f006e7 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/OneOrMany.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/OneOrMany.cs @@ -5,8 +5,8 @@ using System; using System.Collections.Immutable; using System.Diagnostics.CodeAnalysis; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/InternalUtilities/SpanUtilities.cs b/src/Compilers/Core/Portable/InternalUtilities/SpanUtilities.cs index 78b7a1d66c43d..98b512186e329 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/SpanUtilities.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/SpanUtilities.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/Core/Portable/InternalUtilities/TextKeyedCache.cs b/src/Compilers/Core/Portable/InternalUtilities/TextKeyedCache.cs index 2bec3cc65a9bc..9164416313002 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/TextKeyedCache.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/TextKeyedCache.cs @@ -8,11 +8,11 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Text; -using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Text; +using System.Threading; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/MemberDescriptor.cs b/src/Compilers/Core/Portable/MemberDescriptor.cs index 9cd2ea585c8cf..091cd2a0193d2 100644 --- a/src/Compilers/Core/Portable/MemberDescriptor.cs +++ b/src/Compilers/Core/Portable/MemberDescriptor.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.IO; using System.Reflection.Metadata; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.RuntimeMembers { diff --git a/src/Compilers/Core/Portable/MetadataReader/MetadataTypeCodeExtensions.cs b/src/Compilers/Core/Portable/MetadataReader/MetadataTypeCodeExtensions.cs index 82bb2aed7a379..53d367988058e 100644 --- a/src/Compilers/Core/Portable/MetadataReader/MetadataTypeCodeExtensions.cs +++ b/src/Compilers/Core/Portable/MetadataReader/MetadataTypeCodeExtensions.cs @@ -4,8 +4,8 @@ #nullable disable -using System.Reflection.Metadata; using Roslyn.Utilities; +using System.Reflection.Metadata; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/MetadataReader/PEAssembly.cs b/src/Compilers/Core/Portable/MetadataReader/PEAssembly.cs index 80af156f00c62..04af11a9dee76 100644 --- a/src/Compilers/Core/Portable/MetadataReader/PEAssembly.cs +++ b/src/Compilers/Core/Portable/MetadataReader/PEAssembly.cs @@ -7,12 +7,12 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; using System.Linq; using System.Reflection.Metadata; using System.Threading; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +using System.Diagnostics; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/MetadataReference/AssemblyMetadata.cs b/src/Compilers/Core/Portable/MetadataReference/AssemblyMetadata.cs index 592298034e5fa..d8ea338e14d25 100644 --- a/src/Compilers/Core/Portable/MetadataReference/AssemblyMetadata.cs +++ b/src/Compilers/Core/Portable/MetadataReference/AssemblyMetadata.cs @@ -5,13 +5,13 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; using System.IO; using System.Reflection.Metadata; using System.Reflection.PortableExecutable; using System.Threading; -using Microsoft.CodeAnalysis.Symbols; +using System.Diagnostics; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.Symbols; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/MetadataReference/MetadataReferenceProperties.cs b/src/Compilers/Core/Portable/MetadataReference/MetadataReferenceProperties.cs index 3b880aca65551..cb7dbfb37fd57 100644 --- a/src/Compilers/Core/Portable/MetadataReference/MetadataReferenceProperties.cs +++ b/src/Compilers/Core/Portable/MetadataReference/MetadataReferenceProperties.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using System; +using System.Linq; using System.Collections.Generic; using System.Collections.Immutable; -using System.Linq; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis diff --git a/src/Compilers/Core/Portable/MetadataReference/PortableExecutableReference.cs b/src/Compilers/Core/Portable/MetadataReference/PortableExecutableReference.cs index 5085af7e5a04f..cb07bf4e74010 100644 --- a/src/Compilers/Core/Portable/MetadataReference/PortableExecutableReference.cs +++ b/src/Compilers/Core/Portable/MetadataReference/PortableExecutableReference.cs @@ -3,10 +3,10 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; -using System.Collections.Immutable; using System.IO; using System.Threading; +using System.Collections.Immutable; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/MetadataReference/ReferenceDirective.cs b/src/Compilers/Core/Portable/MetadataReference/ReferenceDirective.cs index de9c4e03bc8fd..344263efbe03d 100644 --- a/src/Compilers/Core/Portable/MetadataReference/ReferenceDirective.cs +++ b/src/Compilers/Core/Portable/MetadataReference/ReferenceDirective.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Diagnostics; using Microsoft.CodeAnalysis.Text; +using System.Diagnostics; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Operations/ControlFlowGraphBuilder.ConditionalAccessOperationTracker.cs b/src/Compilers/Core/Portable/Operations/ControlFlowGraphBuilder.ConditionalAccessOperationTracker.cs index f3f77c8bfdb6c..d51ad4e5303cf 100644 --- a/src/Compilers/Core/Portable/Operations/ControlFlowGraphBuilder.ConditionalAccessOperationTracker.cs +++ b/src/Compilers/Core/Portable/Operations/ControlFlowGraphBuilder.ConditionalAccessOperationTracker.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/Core/Portable/Operations/Operation.Enumerable.cs b/src/Compilers/Core/Portable/Operations/Operation.Enumerable.cs index f89856b72a992..84e466976926e 100644 --- a/src/Compilers/Core/Portable/Operations/Operation.Enumerable.cs +++ b/src/Compilers/Core/Portable/Operations/Operation.Enumerable.cs @@ -1,12 +1,12 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.Collections; using System.Collections.Generic; -using System.Collections.Immutable; +using System.Collections; +using System; using System.Diagnostics; +using System.Collections.Immutable; using Microsoft.CodeAnalysis.Operations; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; diff --git a/src/Compilers/Core/Portable/Operations/Operation.cs b/src/Compilers/Core/Portable/Operations/Operation.cs index 64a38440133ba..495b39d3e256c 100644 --- a/src/Compilers/Core/Portable/Operations/Operation.cs +++ b/src/Compilers/Core/Portable/Operations/Operation.cs @@ -5,10 +5,10 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; using System.Threading; using Microsoft.CodeAnalysis.Operations; using Microsoft.CodeAnalysis.PooledObjects; +using System.Diagnostics.CodeAnalysis; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Operations/OperationMapBuilder.cs b/src/Compilers/Core/Portable/Operations/OperationMapBuilder.cs index 7a31dcb0fcc12..e3beda6e9cfb3 100644 --- a/src/Compilers/Core/Portable/Operations/OperationMapBuilder.cs +++ b/src/Compilers/Core/Portable/Operations/OperationMapBuilder.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/Core/Portable/OutputKind.cs b/src/Compilers/Core/Portable/OutputKind.cs index 5dbf63fc4a5af..09db23ac906cb 100644 --- a/src/Compilers/Core/Portable/OutputKind.cs +++ b/src/Compilers/Core/Portable/OutputKind.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using Microsoft.CodeAnalysis.Text; +using System; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis diff --git a/src/Compilers/Core/Portable/PEWriter/DebugSourceDocument.cs b/src/Compilers/Core/Portable/PEWriter/DebugSourceDocument.cs index 1a9ed7e93f6e3..a6080b64f4f25 100644 --- a/src/Compilers/Core/Portable/PEWriter/DebugSourceDocument.cs +++ b/src/Compilers/Core/Portable/PEWriter/DebugSourceDocument.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using System.Collections.Immutable; -using System.Diagnostics; +using System; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.Text; +using System.Diagnostics; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/DebugSourceInfo.cs b/src/Compilers/Core/Portable/PEWriter/DebugSourceInfo.cs index 5dbb73bd56a3e..b24dd2729de92 100644 --- a/src/Compilers/Core/Portable/PEWriter/DebugSourceInfo.cs +++ b/src/Compilers/Core/Portable/PEWriter/DebugSourceInfo.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.Collections.Immutable; using Microsoft.CodeAnalysis.Debugging; using Microsoft.CodeAnalysis.Text; +using System; +using System.Collections.Immutable; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/ExtendedPEBuilder.cs b/src/Compilers/Core/Portable/PEWriter/ExtendedPEBuilder.cs index 83b2c2649dd5f..f5f447c624ded 100755 --- a/src/Compilers/Core/Portable/PEWriter/ExtendedPEBuilder.cs +++ b/src/Compilers/Core/Portable/PEWriter/ExtendedPEBuilder.cs @@ -9,8 +9,8 @@ using System.Reflection.Metadata; using System.Reflection.Metadata.Ecma335; using System.Reflection.PortableExecutable; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/ITypeReferenceExtensions.cs b/src/Compilers/Core/Portable/PEWriter/ITypeReferenceExtensions.cs index e823ce34cfce5..df6206ca62158 100644 --- a/src/Compilers/Core/Portable/PEWriter/ITypeReferenceExtensions.cs +++ b/src/Compilers/Core/Portable/PEWriter/ITypeReferenceExtensions.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Text; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.PooledObjects; +using System.Text; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/MetadataVisitor.cs b/src/Compilers/Core/Portable/PEWriter/MetadataVisitor.cs index d734aee619c0d..94638937fae6b 100644 --- a/src/Compilers/Core/Portable/PEWriter/MetadataVisitor.cs +++ b/src/Compilers/Core/Portable/PEWriter/MetadataVisitor.cs @@ -3,11 +3,11 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; -using System.Collections.Immutable; using System.Diagnostics; -using Microsoft.CodeAnalysis.CodeGen; -using Microsoft.CodeAnalysis.Emit; using Roslyn.Utilities; +using System.Collections.Immutable; +using Microsoft.CodeAnalysis.Emit; +using Microsoft.CodeAnalysis.CodeGen; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/PooledBlobBuilder.cs b/src/Compilers/Core/Portable/PEWriter/PooledBlobBuilder.cs index e0c7f2204928a..d8aab2ccdf1ca 100644 --- a/src/Compilers/Core/Portable/PEWriter/PooledBlobBuilder.cs +++ b/src/Compilers/Core/Portable/PEWriter/PooledBlobBuilder.cs @@ -4,8 +4,8 @@ using System; using System.Reflection.Metadata; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/ReferenceIndexer.cs b/src/Compilers/Core/Portable/PEWriter/ReferenceIndexer.cs index 0ac52917e46ed..e0764b747d7ec 100644 --- a/src/Compilers/Core/Portable/PEWriter/ReferenceIndexer.cs +++ b/src/Compilers/Core/Portable/PEWriter/ReferenceIndexer.cs @@ -7,8 +7,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using Microsoft.CodeAnalysis.Emit; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.Emit; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/ReferenceIndexerBase.cs b/src/Compilers/Core/Portable/PEWriter/ReferenceIndexerBase.cs index 9d8a182431b48..e0f5e82919cc9 100644 --- a/src/Compilers/Core/Portable/PEWriter/ReferenceIndexerBase.cs +++ b/src/Compilers/Core/Portable/PEWriter/ReferenceIndexerBase.cs @@ -7,9 +7,9 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using EmitContext = Microsoft.CodeAnalysis.Emit.EmitContext; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Emit; -using EmitContext = Microsoft.CodeAnalysis.Emit.EmitContext; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/PEWriter/TypeNameSerializer.cs b/src/Compilers/Core/Portable/PEWriter/TypeNameSerializer.cs index 25bb43369a78a..29115ffdff6a5 100644 --- a/src/Compilers/Core/Portable/PEWriter/TypeNameSerializer.cs +++ b/src/Compilers/Core/Portable/PEWriter/TypeNameSerializer.cs @@ -4,12 +4,12 @@ #nullable disable -using System.Diagnostics; -using System.Text; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.PooledObjects; +using System.Text; +using System.Diagnostics; namespace Microsoft.Cci { diff --git a/src/Compilers/Core/Portable/ResourceDescription.cs b/src/Compilers/Core/Portable/ResourceDescription.cs index 3f9f109174b56..1563e3ee96088 100644 --- a/src/Compilers/Core/Portable/ResourceDescription.cs +++ b/src/Compilers/Core/Portable/ResourceDescription.cs @@ -3,13 +3,13 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Immutable; -using System.Diagnostics; using System.IO; +using Roslyn.Utilities; +using Microsoft.CodeAnalysis.Emit; using System.Reflection; +using System.Collections.Immutable; +using System.Diagnostics; using System.Security.Cryptography; -using Microsoft.CodeAnalysis.Emit; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/RuleSet/RuleSetProcessor.cs b/src/Compilers/Core/Portable/RuleSet/RuleSetProcessor.cs index 79a0a42da04dd..ac6e03a4dbd3f 100644 --- a/src/Compilers/Core/Portable/RuleSet/RuleSetProcessor.cs +++ b/src/Compilers/Core/Portable/RuleSet/RuleSetProcessor.cs @@ -8,8 +8,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.IO; using System.Linq; +using System.IO; using System.Xml; using System.Xml.Linq; using Roslyn.Utilities; diff --git a/src/Compilers/Core/Portable/Serialization/ObjectReader.cs b/src/Compilers/Core/Portable/Serialization/ObjectReader.cs index b2ac0d4651d4f..7ad967e5f8b24 100644 --- a/src/Compilers/Core/Portable/Serialization/ObjectReader.cs +++ b/src/Compilers/Core/Portable/Serialization/ObjectReader.cs @@ -11,9 +11,9 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/Serialization/ObjectWriter.cs b/src/Compilers/Core/Portable/Serialization/ObjectWriter.cs index a8a3d0d64f64a..d09fdba9cfc3e 100644 --- a/src/Compilers/Core/Portable/Serialization/ObjectWriter.cs +++ b/src/Compilers/Core/Portable/Serialization/ObjectWriter.cs @@ -10,9 +10,9 @@ using System.Runtime.InteropServices; using System.Text; using System.Threading; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; namespace Roslyn.Utilities { diff --git a/src/Compilers/Core/Portable/StrongName/CryptoBlobParser.cs b/src/Compilers/Core/Portable/StrongName/CryptoBlobParser.cs index b1d6c6a8f897b..47a4d5ad6a07e 100644 --- a/src/Compilers/Core/Portable/StrongName/CryptoBlobParser.cs +++ b/src/Compilers/Core/Portable/StrongName/CryptoBlobParser.cs @@ -4,14 +4,14 @@ #nullable disable +using Microsoft.CodeAnalysis.Collections; +using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.IO; using System.Linq; using System.Reflection.Metadata; using System.Security.Cryptography; -using Microsoft.CodeAnalysis.Collections; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/SymbolDisplay/FormattedSymbol.cs b/src/Compilers/Core/Portable/SymbolDisplay/FormattedSymbol.cs index 9a88f6137f684..535ed7dc3d490 100644 --- a/src/Compilers/Core/Portable/SymbolDisplay/FormattedSymbol.cs +++ b/src/Compilers/Core/Portable/SymbolDisplay/FormattedSymbol.cs @@ -4,10 +4,10 @@ #nullable disable -using System; -using System.Diagnostics; using Microsoft.CodeAnalysis.Symbols; using Roslyn.Utilities; +using System; +using System.Diagnostics; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Symbols/Attributes/AttributeDescription.cs b/src/Compilers/Core/Portable/Symbols/Attributes/AttributeDescription.cs index d403d02b80770..a6d8f011f4849 100644 --- a/src/Compilers/Core/Portable/Symbols/Attributes/AttributeDescription.cs +++ b/src/Compilers/Core/Portable/Symbols/Attributes/AttributeDescription.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Collections.Immutable; using System.Diagnostics; using System.Reflection.Metadata; +using System.Collections.Immutable; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis diff --git a/src/Compilers/Core/Portable/Symbols/Attributes/CommonAssemblyWellKnownAttributeData.cs b/src/Compilers/Core/Portable/Symbols/Attributes/CommonAssemblyWellKnownAttributeData.cs index 07802e01aae41..166e8a073382a 100644 --- a/src/Compilers/Core/Portable/Symbols/Attributes/CommonAssemblyWellKnownAttributeData.cs +++ b/src/Compilers/Core/Portable/Symbols/Attributes/CommonAssemblyWellKnownAttributeData.cs @@ -5,9 +5,9 @@ #nullable disable using System; -using System.Collections.Generic; using System.Reflection; using Microsoft.CodeAnalysis.Text; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Symbols/Attributes/CustomAttributesBag.cs b/src/Compilers/Core/Portable/Symbols/Attributes/CustomAttributesBag.cs index ffe7dde958fd0..92ecc52d79fa0 100644 --- a/src/Compilers/Core/Portable/Symbols/Attributes/CustomAttributesBag.cs +++ b/src/Compilers/Core/Portable/Symbols/Attributes/CustomAttributesBag.cs @@ -4,12 +4,12 @@ #nullable disable -using System; using System.Collections.Immutable; using System.Diagnostics; using System.Threading; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Symbols/Attributes/MarshalPseudoCustomAttributeData.cs b/src/Compilers/Core/Portable/Symbols/Attributes/MarshalPseudoCustomAttributeData.cs index c107131ceec60..8165381312ce2 100644 --- a/src/Compilers/Core/Portable/Symbols/Attributes/MarshalPseudoCustomAttributeData.cs +++ b/src/Compilers/Core/Portable/Symbols/Attributes/MarshalPseudoCustomAttributeData.cs @@ -4,11 +4,11 @@ #nullable disable +using Microsoft.CodeAnalysis.Emit; +using Microsoft.CodeAnalysis.Symbols; using System; using System.Diagnostics; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.Symbols; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Symbols/IModuleSymbol.cs b/src/Compilers/Core/Portable/Symbols/IModuleSymbol.cs index bcc5712708c01..d6318be7b7b9c 100644 --- a/src/Compilers/Core/Portable/Symbols/IModuleSymbol.cs +++ b/src/Compilers/Core/Portable/Symbols/IModuleSymbol.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Collections.Immutable; using Microsoft.CodeAnalysis.Text; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxList.WithLotsOfChildren.cs b/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxList.WithLotsOfChildren.cs index 919abdcb2a695..cef920cc76170 100644 --- a/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxList.WithLotsOfChildren.cs +++ b/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxList.WithLotsOfChildren.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System; -using System.Diagnostics; using Roslyn.Utilities; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.Syntax.InternalSyntax { diff --git a/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxNodeCache.cs b/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxNodeCache.cs index 0629eb4ebea4c..a35bf1cb5a0bc 100644 --- a/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxNodeCache.cs +++ b/src/Compilers/Core/Portable/Syntax/InternalSyntax/SyntaxNodeCache.cs @@ -2,9 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.Syntax.InternalSyntax; + using System; using System.Diagnostics; -using Microsoft.CodeAnalysis.Syntax.InternalSyntax; using Roslyn.Utilities; #if STATS diff --git a/src/Compilers/Core/Portable/Syntax/LineDirectiveMap.cs b/src/Compilers/Core/Portable/Syntax/LineDirectiveMap.cs index 0f948393b47ab..3ad2f7bdbc6cc 100644 --- a/src/Compilers/Core/Portable/Syntax/LineDirectiveMap.cs +++ b/src/Compilers/Core/Portable/Syntax/LineDirectiveMap.cs @@ -7,8 +7,8 @@ using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; +using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Core/Portable/Text/LargeText.cs b/src/Compilers/Core/Portable/Text/LargeText.cs index e30ec3dc3e3c9..a03e52ff89b94 100644 --- a/src/Compilers/Core/Portable/Text/LargeText.cs +++ b/src/Compilers/Core/Portable/Text/LargeText.cs @@ -4,12 +4,12 @@ using System; using System.Collections.Immutable; -using System.Diagnostics; using System.IO; using System.Text; using System.Threading; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.Text { diff --git a/src/Compilers/Core/Portable/TreeDumper.cs b/src/Compilers/Core/Portable/TreeDumper.cs index 822012f4c84eb..6eec8da558f03 100644 --- a/src/Compilers/Core/Portable/TreeDumper.cs +++ b/src/Compilers/Core/Portable/TreeDumper.cs @@ -7,8 +7,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Linq; using System.Reflection; +using System.Linq; using System.Text; using Roslyn.Utilities; diff --git a/src/Compilers/Core/Rebuild/MetadataCompilationOptions.cs b/src/Compilers/Core/Rebuild/MetadataCompilationOptions.cs index 0fd2b8848ecd7..b73ec8ca8753c 100644 --- a/src/Compilers/Core/Rebuild/MetadataCompilationOptions.cs +++ b/src/Compilers/Core/Rebuild/MetadataCompilationOptions.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using System.Collections.Immutable; -using System.Diagnostics.CodeAnalysis; using System.Linq; +using System.Diagnostics.CodeAnalysis; +using System; using Microsoft.Extensions.Logging; namespace Microsoft.CodeAnalysis.Rebuild diff --git a/src/Compilers/Core/RebuildTest/CompilationOptionsReaderTests.cs b/src/Compilers/Core/RebuildTest/CompilationOptionsReaderTests.cs index 84139919c0819..535eaf346c599 100644 --- a/src/Compilers/Core/RebuildTest/CompilationOptionsReaderTests.cs +++ b/src/Compilers/Core/RebuildTest/CompilationOptionsReaderTests.cs @@ -10,17 +10,17 @@ using System.Reflection.PortableExecutable; using System.Text; using System.Threading; -using Microsoft.Cci; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.Rebuild; using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.Rebuild; using Microsoft.CodeAnalysis.VisualBasic; using Microsoft.Extensions.Logging; -using Roslyn.Test.Utilities; using Xunit; +using Microsoft.Cci; +using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.Rebuild.UnitTests { diff --git a/src/Compilers/Core/RebuildTest/RoundTripUtil.cs b/src/Compilers/Core/RebuildTest/RoundTripUtil.cs index eb427b6a4712f..e2cef09b916f2 100644 --- a/src/Compilers/Core/RebuildTest/RoundTripUtil.cs +++ b/src/Compilers/Core/RebuildTest/RoundTripUtil.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; using System.Collections.Immutable; using System.IO; using System.Linq; @@ -20,9 +19,10 @@ using Microsoft.CodeAnalysis.VisualBasic; using Microsoft.Extensions.Logging; using Microsoft.Metadata.Tools; -using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; +using Roslyn.Test.Utilities; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis.Rebuild.UnitTests { diff --git a/src/Compilers/Server/VBCSCompiler/AnalyzerConsistencyChecker.cs b/src/Compilers/Server/VBCSCompiler/AnalyzerConsistencyChecker.cs index 3a0b0c25b4f0c..ba0b1f6507569 100644 --- a/src/Compilers/Server/VBCSCompiler/AnalyzerConsistencyChecker.cs +++ b/src/Compilers/Server/VBCSCompiler/AnalyzerConsistencyChecker.cs @@ -5,13 +5,13 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics.CodeAnalysis; using System.IO; using System.Linq; using System.Reflection; +using Roslyn.Utilities; using Microsoft.CodeAnalysis.CommandLine; +using System.Diagnostics.CodeAnalysis; using Microsoft.CodeAnalysis.VisualBasic; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CompilerServer { diff --git a/src/Compilers/Server/VBCSCompiler/BuildServerController.cs b/src/Compilers/Server/VBCSCompiler/BuildServerController.cs index c0fc9e6b8ae73..9a5de7aa0a2ad 100644 --- a/src/Compilers/Server/VBCSCompiler/BuildServerController.cs +++ b/src/Compilers/Server/VBCSCompiler/BuildServerController.cs @@ -4,15 +4,15 @@ using System; using System.Collections.Generic; -using System.Collections.Specialized; using System.Diagnostics; -using System.Globalization; using System.IO; using System.Linq; -using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; +using System.Globalization; using Microsoft.CodeAnalysis.CommandLine; +using System.Runtime.InteropServices; +using System.Collections.Specialized; namespace Microsoft.CodeAnalysis.CompilerServer { diff --git a/src/Compilers/Server/VBCSCompiler/CompletionData.cs b/src/Compilers/Server/VBCSCompiler/CompletionData.cs index 53486df5a8e2c..8e725cb8b76f2 100644 --- a/src/Compilers/Server/VBCSCompiler/CompletionData.cs +++ b/src/Compilers/Server/VBCSCompiler/CompletionData.cs @@ -2,15 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Roslyn.Utilities; using System; using System.Diagnostics; using System.Globalization; using System.IO; -using System.IO.Pipes; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CommandLine; -using Roslyn.Utilities; +using System.IO.Pipes; namespace Microsoft.CodeAnalysis.CompilerServer { internal enum CompletionReason diff --git a/src/Compilers/Server/VBCSCompiler/NamedPipeClientConnection.cs b/src/Compilers/Server/VBCSCompiler/NamedPipeClientConnection.cs index c9d06fba252fd..5df1c170ab14c 100644 --- a/src/Compilers/Server/VBCSCompiler/NamedPipeClientConnection.cs +++ b/src/Compilers/Server/VBCSCompiler/NamedPipeClientConnection.cs @@ -2,17 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Roslyn.Utilities; using System; using System.Diagnostics; using System.IO; using System.IO.Pipes; using System.Runtime.CompilerServices; -using System.Security.AccessControl; using System.Security.Principal; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CommandLine; -using Roslyn.Utilities; +using System.Security.AccessControl; namespace Microsoft.CodeAnalysis.CompilerServer { internal sealed class NamedPipeClientConnection : IClientConnection diff --git a/src/Compilers/Server/VBCSCompiler/ServerDispatcher.cs b/src/Compilers/Server/VBCSCompiler/ServerDispatcher.cs index 4438b4ab61e70..7f379c1da9035 100644 --- a/src/Compilers/Server/VBCSCompiler/ServerDispatcher.cs +++ b/src/Compilers/Server/VBCSCompiler/ServerDispatcher.cs @@ -5,16 +5,16 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using System.Globalization; using System.IO; using System.IO.Pipes; using System.Linq; using System.Runtime; using System.Threading; using System.Threading.Tasks; +using System.Globalization; using Microsoft.CodeAnalysis.CommandLine; -using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Symbols; +using Microsoft.CodeAnalysis.CSharp; namespace Microsoft.CodeAnalysis.CompilerServer { /// diff --git a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.cs b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.cs index afb3e40175f6d..a67d4e8d767eb 100644 --- a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.cs +++ b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.CommandLine; using System; using System.Collections.Specialized; using System.IO; -using Microsoft.CodeAnalysis.CommandLine; namespace Microsoft.CodeAnalysis.CompilerServer { diff --git a/src/Compilers/Server/VBCSCompilerTests/BuildClientTests.cs b/src/Compilers/Server/VBCSCompilerTests/BuildClientTests.cs index 79df022c73862..79ac0ec19c981 100644 --- a/src/Compilers/Server/VBCSCompilerTests/BuildClientTests.cs +++ b/src/Compilers/Server/VBCSCompilerTests/BuildClientTests.cs @@ -6,20 +6,21 @@ extern alias csc; extern alias vbc; + using System; -using System.Collections.Generic; using System.IO; -using System.IO.Pipes; +using Microsoft.CodeAnalysis.CommandLine; using System.Runtime.InteropServices; -using System.Security.AccessControl; -using System.Security.Principal; -using System.Threading; +using Moq; +using Xunit; +using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CommandLine; using Microsoft.CodeAnalysis.Test.Utilities; -using Moq; using Roslyn.Test.Utilities; -using Xunit; +using System.Threading; +using System.IO.Pipes; +using System.Security.AccessControl; +using System.Security.Principal; using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests diff --git a/src/Compilers/Server/VBCSCompilerTests/ClientConnectionHandlerTests.cs b/src/Compilers/Server/VBCSCompilerTests/ClientConnectionHandlerTests.cs index 2e6e56bbc841a..984055a767c85 100644 --- a/src/Compilers/Server/VBCSCompilerTests/ClientConnectionHandlerTests.cs +++ b/src/Compilers/Server/VBCSCompilerTests/ClientConnectionHandlerTests.cs @@ -5,17 +5,17 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; -using System.IO; using System.IO.Pipes; -using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CommandLine; -using Microsoft.CodeAnalysis.Test.Utilities; using Moq; using Roslyn.Test.Utilities; using Xunit; +using System.Runtime.InteropServices; +using System.Diagnostics; +using System.IO; +using Microsoft.CodeAnalysis.Test.Utilities; using static Microsoft.CodeAnalysis.CommandLine.BuildResponse; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests { diff --git a/src/Compilers/Server/VBCSCompilerTests/CompilerServerApiTest.cs b/src/Compilers/Server/VBCSCompilerTests/CompilerServerApiTest.cs index 243f069ba7892..0dbd1b2e14379 100644 --- a/src/Compilers/Server/VBCSCompilerTests/CompilerServerApiTest.cs +++ b/src/Compilers/Server/VBCSCompilerTests/CompilerServerApiTest.cs @@ -7,19 +7,19 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; -using System.IO; using System.IO.Pipes; -using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CommandLine; -using Microsoft.CodeAnalysis.Test.Utilities; using Moq; using Roslyn.Test.Utilities; using Xunit; -using Xunit.Abstractions; +using System.Runtime.InteropServices; +using System.Diagnostics; +using System.IO; +using Microsoft.CodeAnalysis.Test.Utilities; using static Microsoft.CodeAnalysis.CommandLine.BuildResponse; +using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests { diff --git a/src/Compilers/Server/VBCSCompilerTests/NamedPipeTestUtil.cs b/src/Compilers/Server/VBCSCompilerTests/NamedPipeTestUtil.cs index 51a407ac1dca3..183f9401d7d6c 100644 --- a/src/Compilers/Server/VBCSCompilerTests/NamedPipeTestUtil.cs +++ b/src/Compilers/Server/VBCSCompilerTests/NamedPipeTestUtil.cs @@ -7,8 +7,8 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO.Pipes; -using System.Net.Sockets; using System.Reflection; +using System.Net.Sockets; using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests { diff --git a/src/Compilers/Server/VBCSCompilerTests/ServerUtil.cs b/src/Compilers/Server/VBCSCompilerTests/ServerUtil.cs index fe6770cdf465d..3969e10dec9ff 100644 --- a/src/Compilers/Server/VBCSCompilerTests/ServerUtil.cs +++ b/src/Compilers/Server/VBCSCompilerTests/ServerUtil.cs @@ -6,17 +6,18 @@ extern alias csc; extern alias vbc; + +using Microsoft.CodeAnalysis.CommandLine; using System; -using System.Collections.Concurrent; -using System.Collections.Immutable; using System.IO; using System.IO.Pipes; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CommandLine; using Moq; using Xunit; +using System.Collections.Concurrent; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests { diff --git a/src/Compilers/Server/VBCSCompilerTests/TestableClientConnectionHost.cs b/src/Compilers/Server/VBCSCompilerTests/TestableClientConnectionHost.cs index ad457fbaccf22..52deeb88fb41a 100644 --- a/src/Compilers/Server/VBCSCompilerTests/TestableClientConnectionHost.cs +++ b/src/Compilers/Server/VBCSCompilerTests/TestableClientConnectionHost.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.CommandLine; using System; using System.Collections.Generic; using System.IO.Pipes; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CommandLine; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests { diff --git a/src/Compilers/Server/VBCSCompilerTests/TestableCompilerServerHost.cs b/src/Compilers/Server/VBCSCompilerTests/TestableCompilerServerHost.cs index 2951a560efea7..c8297f1cbf0c4 100644 --- a/src/Compilers/Server/VBCSCompilerTests/TestableCompilerServerHost.cs +++ b/src/Compilers/Server/VBCSCompilerTests/TestableCompilerServerHost.cs @@ -4,9 +4,9 @@ #nullable disable +using Microsoft.CodeAnalysis.CommandLine; using System; using System.Threading; -using Microsoft.CodeAnalysis.CommandLine; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests { diff --git a/src/Compilers/Server/VBCSCompilerTests/TouchedFileLoggingTests.cs b/src/Compilers/Server/VBCSCompilerTests/TouchedFileLoggingTests.cs index cc91baf1e09fb..abafacdbcfbaf 100644 --- a/src/Compilers/Server/VBCSCompilerTests/TouchedFileLoggingTests.cs +++ b/src/Compilers/Server/VBCSCompilerTests/TouchedFileLoggingTests.cs @@ -9,15 +9,15 @@ using System.Globalization; using System.IO; using System.Linq; -using System.Reflection; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis.CompilerServer; -using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Test.Utilities; -using Microsoft.CodeAnalysis.VisualBasic; using Roslyn.Test.Utilities; using Xunit; using static Roslyn.Test.Utilities.SharedResourceHelpers; +using System.Reflection; +using Microsoft.CodeAnalysis.CompilerServer; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.VisualBasic; namespace Microsoft.CodeAnalysis.CompilerServer.UnitTests { diff --git a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerServerTests.cs b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerServerTests.cs index 4627645b89b88..0e04447726c20 100644 --- a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerServerTests.cs +++ b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerServerTests.cs @@ -4,6 +4,9 @@ #nullable disable +using Microsoft.CodeAnalysis.CommandLine; +using Microsoft.CodeAnalysis.Test.Utilities; +using Roslyn.Test.Utilities; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -14,9 +17,6 @@ using System.Security.Cryptography; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CommandLine; -using Microsoft.CodeAnalysis.Test.Utilities; -using Roslyn.Test.Utilities; using Xunit; using Xunit.Abstractions; diff --git a/src/Compilers/Shared/CoreClrShim.cs b/src/Compilers/Shared/CoreClrShim.cs index e64235789e694..308307a3bdd89 100644 --- a/src/Compilers/Shared/CoreClrShim.cs +++ b/src/Compilers/Shared/CoreClrShim.cs @@ -4,9 +4,9 @@ #nullable disable +using Roslyn.Utilities; using System; using System.Reflection; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis { diff --git a/src/Compilers/Test/Core/Diagnostics/DiagnosticDescription.cs b/src/Compilers/Test/Core/Diagnostics/DiagnosticDescription.cs index 088590450a7ac..61aa60dcb0238 100644 --- a/src/Compilers/Test/Core/Diagnostics/DiagnosticDescription.cs +++ b/src/Compilers/Test/Core/Diagnostics/DiagnosticDescription.cs @@ -10,12 +10,12 @@ using System.Text; using System.Text.RegularExpressions; using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Text; -using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; +using Roslyn.Test.Utilities; +using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.CSharp; namespace Microsoft.CodeAnalysis.Test.Utilities { diff --git a/src/Compilers/Test/Core/Diagnostics/TrackingDiagnosticAnalyzer.cs b/src/Compilers/Test/Core/Diagnostics/TrackingDiagnosticAnalyzer.cs index 78b668853d5b4..aa53734438baf 100644 --- a/src/Compilers/Test/Core/Diagnostics/TrackingDiagnosticAnalyzer.cs +++ b/src/Compilers/Test/Core/Diagnostics/TrackingDiagnosticAnalyzer.cs @@ -11,8 +11,8 @@ using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; -using System.Text.RegularExpressions; using System.Threading; +using System.Text.RegularExpressions; using Microsoft.CodeAnalysis.Diagnostics; using Xunit; diff --git a/src/Compilers/Test/Core/MarkedSource/MarkupTestFile.cs b/src/Compilers/Test/Core/MarkedSource/MarkupTestFile.cs index eae7f9407e2bd..fc8d1a7233a6d 100644 --- a/src/Compilers/Test/Core/MarkedSource/MarkupTestFile.cs +++ b/src/Compilers/Test/Core/MarkedSource/MarkupTestFile.cs @@ -10,8 +10,8 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; diff --git a/src/Compilers/Test/Core/Metadata/ILBuilderVisualizer.cs b/src/Compilers/Test/Core/Metadata/ILBuilderVisualizer.cs index 61782ebb019e8..5d9c6b5c4dbcd 100644 --- a/src/Compilers/Test/Core/Metadata/ILBuilderVisualizer.cs +++ b/src/Compilers/Test/Core/Metadata/ILBuilderVisualizer.cs @@ -7,17 +7,17 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; using System.Reflection.Emit; using System.Reflection.Metadata; using System.Text; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CodeGen; -using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis.Symbols; using Microsoft.Metadata.Tools; using Roslyn.Utilities; using Cci = Microsoft.Cci; +using Microsoft.CodeAnalysis.Symbols; +using System.Diagnostics; namespace Roslyn.Test.Utilities { diff --git a/src/Compilers/Test/Core/Mocks/MoqExtensions.cs b/src/Compilers/Test/Core/Mocks/MoqExtensions.cs index cbb9a632642da..d7ea43a518a44 100644 --- a/src/Compilers/Test/Core/Mocks/MoqExtensions.cs +++ b/src/Compilers/Test/Core/Mocks/MoqExtensions.cs @@ -4,8 +4,8 @@ #nullable disable -using System.Linq; using Moq; +using System.Linq; namespace Roslyn.Test.Utilities { diff --git a/src/Compilers/Test/Core/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs b/src/Compilers/Test/Core/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs index 064bb5c6a84ce..f8935f6337a90 100644 --- a/src/Compilers/Test/Core/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs +++ b/src/Compilers/Test/Core/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs @@ -6,9 +6,9 @@ #if NETCOREAPP using System; +using System.Linq; using System.Collections.Generic; using System.Collections.Immutable; -using System.Linq; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.Emit; diff --git a/src/Compilers/Test/Core/Syntax/SourceUtilities.cs b/src/Compilers/Test/Core/Syntax/SourceUtilities.cs index 2ac95ef937af8..9e6be06ed50ba 100644 --- a/src/Compilers/Test/Core/Syntax/SourceUtilities.cs +++ b/src/Compilers/Test/Core/Syntax/SourceUtilities.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.Text; using System; using System.Collections.Generic; using System.Text; -using Microsoft.CodeAnalysis.Text; namespace Roslyn.Test.Utilities.Syntax { diff --git a/src/Compilers/Test/Core/TargetFrameworkUtil.cs b/src/Compilers/Test/Core/TargetFrameworkUtil.cs index c3d63c3d206ab..900d4149e9e33 100644 --- a/src/Compilers/Test/Core/TargetFrameworkUtil.cs +++ b/src/Compilers/Test/Core/TargetFrameworkUtil.cs @@ -9,8 +9,8 @@ using System.Collections.Immutable; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Test.Utilities; -using static Roslyn.Test.Utilities.TestMetadata; using static TestReferences; +using static Roslyn.Test.Utilities.TestMetadata; namespace Roslyn.Test.Utilities { diff --git a/src/Compilers/Test/Core/TempFiles/DisposableFile.cs b/src/Compilers/Test/Core/TempFiles/DisposableFile.cs index 9c3781e26d9c2..327f8abd3efe4 100644 --- a/src/Compilers/Test/Core/TempFiles/DisposableFile.cs +++ b/src/Compilers/Test/Core/TempFiles/DisposableFile.cs @@ -7,8 +7,8 @@ using System; using System.IO; using System.Runtime.InteropServices; -using Microsoft.Win32.SafeHandles; using Roslyn.Utilities; +using Microsoft.Win32.SafeHandles; namespace Microsoft.CodeAnalysis.Test.Utilities { diff --git a/src/Compilers/Test/Core/TempFiles/TempFile.cs b/src/Compilers/Test/Core/TempFiles/TempFile.cs index ac5d121c3df26..ac1c6bd109e37 100644 --- a/src/Compilers/Test/Core/TempFiles/TempFile.cs +++ b/src/Compilers/Test/Core/TempFiles/TempFile.cs @@ -6,13 +6,13 @@ using System; using System.Collections.Immutable; -using System.Diagnostics; using System.IO; -using System.Text; -using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Text; +using System.Text; +using System.Diagnostics; using Roslyn.Utilities; +using System.Threading.Tasks; namespace Microsoft.CodeAnalysis.Test.Utilities { diff --git a/src/Compilers/Test/Core/TestBase.cs b/src/Compilers/Test/Core/TestBase.cs index ca60dfec3cd72..6e8d93fe5a931 100644 --- a/src/Compilers/Test/Core/TestBase.cs +++ b/src/Compilers/Test/Core/TestBase.cs @@ -12,12 +12,12 @@ using System.Xml.Linq; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.Test.Resources.Proprietary; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.VisualBasic; -using static Roslyn.Test.Utilities.TestMetadata; using static TestReferences.NetFx; +using static Roslyn.Test.Utilities.TestMetadata; +using Microsoft.CodeAnalysis.Test.Resources.Proprietary; namespace Roslyn.Test.Utilities { diff --git a/src/Compilers/Test/Core/Traits/CompilerTraitDiscoverer.cs b/src/Compilers/Test/Core/Traits/CompilerTraitDiscoverer.cs index 79c4e82f2d602..3a30a2b623c88 100644 --- a/src/Compilers/Test/Core/Traits/CompilerTraitDiscoverer.cs +++ b/src/Compilers/Test/Core/Traits/CompilerTraitDiscoverer.cs @@ -4,10 +4,10 @@ #nullable disable +using Roslyn.Utilities; using System; using System.Collections.Generic; using System.Linq; -using Roslyn.Utilities; using Xunit; using Xunit.Abstractions; using Xunit.Sdk; diff --git a/src/Compilers/Test/Core/Win32Res.cs b/src/Compilers/Test/Core/Win32Res.cs index 6af13d7da4ce1..6e040f93aac89 100644 --- a/src/Compilers/Test/Core/Win32Res.cs +++ b/src/Compilers/Test/Core/Win32Res.cs @@ -5,12 +5,12 @@ #nullable disable using System; -using System.Collections.Generic; using System.ComponentModel; -using System.IO; using System.Runtime.InteropServices; using System.Text; using System.Xml; +using System.IO; +using System.Collections.Generic; using System.Xml.Linq; namespace Microsoft.CodeAnalysis.Test.Utilities diff --git a/src/Compilers/Test/Utilities/CSharp/BasicCompilationUtils.cs b/src/Compilers/Test/Utilities/CSharp/BasicCompilationUtils.cs index 8e8db1242db52..469a80f4ea595 100644 --- a/src/Compilers/Test/Utilities/CSharp/BasicCompilationUtils.cs +++ b/src/Compilers/Test/Utilities/CSharp/BasicCompilationUtils.cs @@ -6,9 +6,9 @@ using System; using System.Collections.Generic; -using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.VisualBasic; using Roslyn.Test.Utilities; +using Microsoft.CodeAnalysis.Test.Utilities; using static Microsoft.CodeAnalysis.CodeGen.CompilationTestData; namespace Microsoft.CodeAnalysis.CSharp.UnitTests diff --git a/src/Compilers/Test/Utilities/CSharp/CompilationTestUtils.cs b/src/Compilers/Test/Utilities/CSharp/CompilationTestUtils.cs index 195a6e7002638..34015be8ac8e5 100644 --- a/src/Compilers/Test/Utilities/CSharp/CompilationTestUtils.cs +++ b/src/Compilers/Test/Utilities/CSharp/CompilationTestUtils.cs @@ -4,23 +4,23 @@ #nullable disable -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Diagnostics; -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.Operations; using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.Operations; using Microsoft.CodeAnalysis.Text; +using Microsoft.CodeAnalysis.Emit; +using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Roslyn.Utilities; +using System; +using System.Collections.Generic; +using System.Collections.Immutable; +using System.Linq; using Xunit; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.UnitTests { diff --git a/src/Compilers/Test/Utilities/CSharp/TestOptions.cs b/src/Compilers/Test/Utilities/CSharp/TestOptions.cs index 4de45dddb00a9..e5bba5b842d74 100644 --- a/src/Compilers/Test/Utilities/CSharp/TestOptions.cs +++ b/src/Compilers/Test/Utilities/CSharp/TestOptions.cs @@ -8,8 +8,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; -using Microsoft.CodeAnalysis.Emit; using Roslyn.Test.Utilities; +using Microsoft.CodeAnalysis.Emit; namespace Microsoft.CodeAnalysis.CSharp.Test.Utilities { diff --git a/src/Compilers/Test/Utilities/VisualBasic/ParserTestUtilities.vb b/src/Compilers/Test/Utilities/VisualBasic/ParserTestUtilities.vb index 7db440c139802..822a2315edbda 100644 --- a/src/Compilers/Test/Utilities/VisualBasic/ParserTestUtilities.vb +++ b/src/Compilers/Test/Utilities/VisualBasic/ParserTestUtilities.vb @@ -2,19 +2,19 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Collections.Immutable Imports System.Globalization Imports System.Runtime.CompilerServices Imports System.Text Imports System.Threading Imports System.Xml.Linq -Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.SyntaxFacts Imports Roslyn.Test.Utilities Imports Xunit +Imports Microsoft.CodeAnalysis.Collections +Imports System.Collections.Immutable Friend Module ParserTestUtilities Friend ReadOnly Property PooledStringBuilderPool As ObjectPool(Of PooledStringBuilder) = PooledStringBuilder.CreatePool(64) diff --git a/src/Compilers/Test/Utilities/VisualBasic/VBParser.vb b/src/Compilers/Test/Utilities/VisualBasic/VBParser.vb index 931d5ad493185..18039220d0bf5 100644 --- a/src/Compilers/Test/Utilities/VisualBasic/VBParser.vb +++ b/src/Compilers/Test/Utilities/VisualBasic/VBParser.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Reflection Imports System.Text +Imports System.Reflection Imports Microsoft.CodeAnalysis.Test.Utilities Public Class VBParser diff --git a/src/Compilers/VisualBasic/Portable/Analysis/FlowAnalysis/AbstractFlowPass.vb b/src/Compilers/VisualBasic/Portable/Analysis/FlowAnalysis/AbstractFlowPass.vb index 18b2129eec566..4094116194cf7 100644 --- a/src/Compilers/VisualBasic/Portable/Analysis/FlowAnalysis/AbstractFlowPass.vb +++ b/src/Compilers/VisualBasic/Portable/Analysis/FlowAnalysis/AbstractFlowPass.vb @@ -7,13 +7,13 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Diagnostics Imports System.Linq -Imports System.Runtime.InteropServices Imports System.Text Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Utilities +Imports System.Runtime.InteropServices ' NOTE: VB does not support constant expressions in flow analysis during command-line compilation, but supports them when ' analysis is being called via public API. This distinction is governed by 'suppressConstantExpressions' flag diff --git a/src/Compilers/VisualBasic/Portable/Analysis/IteratorAndAsyncAnalysis/IteratorAndAsyncCaptureWalker.vb b/src/Compilers/VisualBasic/Portable/Analysis/IteratorAndAsyncAnalysis/IteratorAndAsyncCaptureWalker.vb index 81b7cc77a65f8..e588fbe69dff1 100644 --- a/src/Compilers/VisualBasic/Portable/Analysis/IteratorAndAsyncAnalysis/IteratorAndAsyncCaptureWalker.vb +++ b/src/Compilers/VisualBasic/Portable/Analysis/IteratorAndAsyncAnalysis/IteratorAndAsyncCaptureWalker.vb @@ -4,8 +4,8 @@ Imports System.Collections.Generic Imports System.Runtime.InteropServices -Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports TypeKind = Microsoft.CodeAnalysis.TypeKind diff --git a/src/Compilers/VisualBasic/Portable/Binding/Binder_DocumentationComments.vb b/src/Compilers/VisualBasic/Portable/Binding/Binder_DocumentationComments.vb index 38160018c001d..bfd4a1345acbe 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/Binder_DocumentationComments.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/Binder_DocumentationComments.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic Partial Friend Class Binder diff --git a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentBinder.vb b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentBinder.vb index fc65ce0dee142..174dc17ec3d69 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentBinder.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentBinder.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder.vb b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder.vb index 8b3da05be3ec1..1a110259d0acd 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder.vb @@ -3,12 +3,12 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports System.Runtime.InteropServices -Imports System.Threading Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Runtime.InteropServices +Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_Compat.vb b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_Compat.vb index d94143d1ee4bf..f64ca3011cadf 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_Compat.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_Compat.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_TypeParameters.vb b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_TypeParameters.vb index 7b20d464483af..fb3a70acf2bdd 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_TypeParameters.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentCrefBinder_TypeParameters.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentParamBinder.vb b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentParamBinder.vb index a0c4f3194713e..6a4845858b553 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentParamBinder.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentParamBinder.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamBinder.vb b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamBinder.vb index 89f869b3a40a6..01c10dfcc45ed 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamBinder.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamBinder.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamRefBinder.vb b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamRefBinder.vb index 9692e82300f0b..c51ddd1b9b5a1 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamRefBinder.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/DocumentationCommentTypeParamRefBinder.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Binding/MemberSemanticModel.vb b/src/Compilers/VisualBasic/Portable/Binding/MemberSemanticModel.vb index 9a45282949b21..3e9cbd0723840 100644 --- a/src/Compilers/VisualBasic/Portable/Binding/MemberSemanticModel.vb +++ b/src/Compilers/VisualBasic/Portable/Binding/MemberSemanticModel.vb @@ -6,8 +6,8 @@ Imports System.Collections.Immutable Imports System.Runtime.InteropServices Imports System.Threading Imports Microsoft.CodeAnalysis.Collections -Imports Microsoft.CodeAnalysis.Operations Imports Microsoft.CodeAnalysis.PooledObjects +Imports Microsoft.CodeAnalysis.Operations Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/BoundTree/BoundLateInvocation.vb b/src/Compilers/VisualBasic/Portable/BoundTree/BoundLateInvocation.vb index d6509ead28909..f6607d714e2e4 100644 --- a/src/Compilers/VisualBasic/Portable/BoundTree/BoundLateInvocation.vb +++ b/src/Compilers/VisualBasic/Portable/BoundTree/BoundLateInvocation.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Diagnostics Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Diagnostics Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/BoundTree/BoundMethodGroup.vb b/src/Compilers/VisualBasic/Portable/BoundTree/BoundMethodGroup.vb index 7947a4e39031d..8fbc6bd6f5089 100644 --- a/src/Compilers/VisualBasic/Portable/BoundTree/BoundMethodGroup.vb +++ b/src/Compilers/VisualBasic/Portable/BoundTree/BoundMethodGroup.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports System.Runtime.InteropServices -Imports System.Threading Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Runtime.InteropServices +Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/BoundTree/Statement.vb b/src/Compilers/VisualBasic/Portable/BoundTree/Statement.vb index 27d631f1a54b2..82615531632c6 100644 --- a/src/Compilers/VisualBasic/Portable/BoundTree/Statement.vb +++ b/src/Compilers/VisualBasic/Portable/BoundTree/Statement.vb @@ -3,8 +3,8 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports Microsoft.CodeAnalysis.Operations Imports Microsoft.CodeAnalysis.PooledObjects +Imports Microsoft.CodeAnalysis.Operations Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocWriter.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocWriter.vb index 111c455203e83..00d64fac3b51a 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocWriter.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocWriter.vb @@ -6,8 +6,8 @@ Imports System Imports System.Collections.Generic Imports System.Diagnostics Imports System.IO -Imports System.Runtime.InteropServices Imports System.Text +Imports System.Runtime.InteropServices Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Event.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Event.vb index 0e3759983f981..1c2a3ff807cf2 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Event.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Event.vb @@ -8,8 +8,8 @@ Imports System.Collections.Immutable Imports System.Diagnostics Imports System.Globalization Imports System.IO -Imports System.Runtime.InteropServices Imports System.Text +Imports System.Runtime.InteropServices Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Field.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Field.vb index 066173c92c98d..6183083248cc5 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Field.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Field.vb @@ -7,8 +7,8 @@ Imports System.Collections.Generic Imports System.Diagnostics Imports System.Globalization Imports System.IO -Imports System.Runtime.InteropServices Imports System.Text +Imports System.Runtime.InteropServices Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Includes.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Includes.vb index bc6acecba917f..70b2dc1ceab2d 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Includes.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Includes.vb @@ -11,10 +11,10 @@ Imports System.Xml Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects -Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Text Namespace Microsoft.CodeAnalysis.VisualBasic Partial Public Class VisualBasicCompilation diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Method.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Method.vb index 52e419e89f264..8af6f3790d70e 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Method.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Method.vb @@ -7,8 +7,8 @@ Imports System.Collections.Generic Imports System.Diagnostics Imports System.Globalization Imports System.IO -Imports System.Runtime.InteropServices Imports System.Text +Imports System.Runtime.InteropServices Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.NamedType.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.NamedType.vb index 9edf3546ea637..73276dae567a8 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.NamedType.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.NamedType.vb @@ -7,8 +7,8 @@ Imports System.Collections.Generic Imports System.Diagnostics Imports System.Globalization Imports System.IO -Imports System.Runtime.InteropServices Imports System.Text +Imports System.Runtime.InteropServices Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Namespace.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Namespace.vb index e57ba9a693b4b..566f05f9cf7df 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Namespace.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Namespace.vb @@ -7,8 +7,8 @@ Imports System.Collections.Generic Imports System.Diagnostics Imports System.Globalization Imports System.IO -Imports System.Runtime.InteropServices Imports System.Text +Imports System.Runtime.InteropServices Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Property.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Property.vb index 03a28dd6f2ea6..c324c94b4a8be 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Property.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.Property.vb @@ -7,8 +7,8 @@ Imports System.Collections.Generic Imports System.Diagnostics Imports System.Globalization Imports System.IO -Imports System.Runtime.InteropServices Imports System.Text +Imports System.Runtime.InteropServices Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.vb index ceb6a6efb576d..64afcf834b6ae 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentCompiler.vb @@ -6,11 +6,11 @@ Imports System.Globalization Imports System.IO Imports System.Text Imports System.Threading -Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects -Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports System.Xml.Linq +Imports Microsoft.CodeAnalysis.Text Namespace Microsoft.CodeAnalysis.VisualBasic Partial Public Class VisualBasicCompilation diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentWalker.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentWalker.vb index 687ee43e0f698..2eb54a56ac68b 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentWalker.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/DocumentationCommentWalker.vb @@ -7,8 +7,8 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Diagnostics Imports System.IO -Imports System.Runtime.InteropServices Imports System.Text +Imports System.Runtime.InteropServices Imports System.Threading Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/UnprocessedDocumentationCommentFinder.vb b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/UnprocessedDocumentationCommentFinder.vb index 4710119d1ab41..1700ef1f15e3d 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/UnprocessedDocumentationCommentFinder.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/DocumentationComments/UnprocessedDocumentationCommentFinder.vb @@ -6,11 +6,11 @@ Imports System Imports System.Collections.Generic Imports System.Diagnostics Imports System.IO -Imports System.Runtime.InteropServices Imports System.Text +Imports System.Runtime.InteropServices Imports System.Threading -Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Text Namespace Microsoft.CodeAnalysis.VisualBasic Partial Public Class VisualBasicCompilation diff --git a/src/Compilers/VisualBasic/Portable/Compilation/NamespaceScopeBuilder.vb b/src/Compilers/VisualBasic/Portable/Compilation/NamespaceScopeBuilder.vb index cddc436ce637f..4b02a23fa6407 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/NamespaceScopeBuilder.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/NamespaceScopeBuilder.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.Emit Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Compilation/SemanticModel.vb b/src/Compilers/VisualBasic/Portable/Compilation/SemanticModel.vb index 74790b85e5b18..04993b31fb4b9 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/SemanticModel.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/SemanticModel.vb @@ -5,8 +5,8 @@ Imports System.Collections.Immutable Imports System.Runtime.InteropServices Imports System.Threading -Imports Microsoft.CodeAnalysis.Operations Imports Microsoft.CodeAnalysis.PooledObjects +Imports Microsoft.CodeAnalysis.Operations Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Compilation/SyntaxTreeSemanticModel.vb b/src/Compilers/VisualBasic/Portable/Compilation/SyntaxTreeSemanticModel.vb index d018a6108b515..4e0c843a67102 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/SyntaxTreeSemanticModel.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/SyntaxTreeSemanticModel.vb @@ -9,8 +9,8 @@ Imports System.Collections.ObjectModel Imports System.IO Imports System.Runtime.InteropServices Imports System.Threading -Imports Microsoft.CodeAnalysis.Operations Imports Microsoft.CodeAnalysis.PooledObjects +Imports Microsoft.CodeAnalysis.Operations Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Compilation/VisualBasicDiagnosticFilter.vb b/src/Compilers/VisualBasic/Portable/Compilation/VisualBasicDiagnosticFilter.vb index 1a7def072faf8..8f1f42fc0b9ca 100644 --- a/src/Compilers/VisualBasic/Portable/Compilation/VisualBasicDiagnosticFilter.vb +++ b/src/Compilers/VisualBasic/Portable/Compilation/VisualBasicDiagnosticFilter.vb @@ -3,8 +3,8 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports System.Runtime.InteropServices Imports System.Threading +Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.VisualBasic Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/DocumentationComments/PEDocumenationCommentUtils.vb b/src/Compilers/VisualBasic/Portable/DocumentationComments/PEDocumenationCommentUtils.vb index da5a298d8da8b..b39b01454325d 100644 --- a/src/Compilers/VisualBasic/Portable/DocumentationComments/PEDocumenationCommentUtils.vb +++ b/src/Compilers/VisualBasic/Portable/DocumentationComments/PEDocumenationCommentUtils.vb @@ -5,8 +5,8 @@ Imports System.Globalization Imports System.Threading Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Emit/NoPia/EmbeddedTypesManager.vb b/src/Compilers/VisualBasic/Portable/Emit/NoPia/EmbeddedTypesManager.vb index bd70c6c8a3786..07fb72e461044 100644 --- a/src/Compilers/VisualBasic/Portable/Emit/NoPia/EmbeddedTypesManager.vb +++ b/src/Compilers/VisualBasic/Portable/Emit/NoPia/EmbeddedTypesManager.vb @@ -2,11 +2,11 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Collections.Concurrent Imports System.Collections.Immutable -Imports System.Threading Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports System.Collections.Concurrent +Imports System.Threading #If Not DEBUG Then Imports SymbolAdapter = Microsoft.CodeAnalysis.VisualBasic.Symbol diff --git a/src/Compilers/VisualBasic/Portable/Parser/ParseScan.vb b/src/Compilers/VisualBasic/Portable/Parser/ParseScan.vb index 6a5b5ba28b712..bda8c67f97fc9 100644 --- a/src/Compilers/VisualBasic/Portable/Parser/ParseScan.vb +++ b/src/Compilers/VisualBasic/Portable/Parser/ParseScan.vb @@ -2,11 +2,11 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports System Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Syntax.InternalSyntax -Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax ' // diff --git a/src/Compilers/VisualBasic/Portable/Scanner/Scanner.vb b/src/Compilers/VisualBasic/Portable/Scanner/Scanner.vb index 524e805ba3312..7890a82cbd0bb 100644 --- a/src/Compilers/VisualBasic/Portable/Scanner/Scanner.vb +++ b/src/Compilers/VisualBasic/Portable/Scanner/Scanner.vb @@ -13,12 +13,12 @@ Imports System.Collections.Immutable Imports System.Globalization Imports System.Runtime.InteropServices Imports System.Text -Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.PooledObjects -Imports Microsoft.CodeAnalysis.Syntax.InternalSyntax Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.SyntaxFacts +Imports Microsoft.CodeAnalysis.Collections +Imports Microsoft.CodeAnalysis.Syntax.InternalSyntax Imports CoreInternalSyntax = Microsoft.CodeAnalysis.Syntax.InternalSyntax Namespace Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax diff --git a/src/Compilers/VisualBasic/Portable/Semantics/AccessCheck.vb b/src/Compilers/VisualBasic/Portable/Semantics/AccessCheck.vb index a9ef7455eb495..0d0a344bed7bc 100644 --- a/src/Compilers/VisualBasic/Portable/Semantics/AccessCheck.vb +++ b/src/Compilers/VisualBasic/Portable/Semantics/AccessCheck.vb @@ -2,12 +2,13 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Collections.Immutable -Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Collections.Immutable +Imports System.Runtime.InteropServices + Imports TypeKind = Microsoft.CodeAnalysis.TypeKind Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Symbols/AccessibilityExtensions.vb b/src/Compilers/VisualBasic/Portable/Symbols/AccessibilityExtensions.vb index c1d85cb2b4180..4b482dcf2de9f 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/AccessibilityExtensions.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/AccessibilityExtensions.vb @@ -3,12 +3,12 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Generic -Imports System.Runtime.CompilerServices Imports System.Text Imports System.Threading Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Runtime.CompilerServices Imports Roslyn.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/ArrayTypeSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/ArrayTypeSymbol.vb index 3e9547ceed4a6..86ec08f92b493 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/ArrayTypeSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/ArrayTypeSymbol.vb @@ -7,8 +7,8 @@ Imports System.Collections.Immutable Imports System.Collections.ObjectModel Imports System.Threading Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/AssemblySymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/AssemblySymbol.vb index d8e7d925645a4..eb9c6a5e7d30a 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/AssemblySymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/AssemblySymbol.vb @@ -5,13 +5,13 @@ Imports System.Collections.Concurrent Imports System.Collections.Generic Imports System.Collections.Immutable -Imports System.Runtime.InteropServices Imports System.Threading -Imports Microsoft.CodeAnalysis.Collections -Imports Microsoft.CodeAnalysis.Symbols Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Collections +Imports System.Runtime.InteropServices +Imports Microsoft.CodeAnalysis.Symbols Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Attributes/PEAttributeData.vb b/src/Compilers/VisualBasic/Portable/Symbols/Attributes/PEAttributeData.vb index ae277bc9a9708..0aebabd7e2454 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Attributes/PEAttributeData.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Attributes/PEAttributeData.vb @@ -4,8 +4,8 @@ Imports System.Collections.Immutable Imports System.Collections.ObjectModel -Imports System.Reflection.Metadata Imports System.Threading +Imports System.Reflection.Metadata Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Attributes/SourceAttributeData.vb b/src/Compilers/VisualBasic/Portable/Symbols/Attributes/SourceAttributeData.vb index 18dc56b61d6c8..acf0ea6c01182 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Attributes/SourceAttributeData.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Attributes/SourceAttributeData.vb @@ -5,14 +5,14 @@ Imports System Imports System.Collections.Generic Imports System.Collections.Immutable -Imports System.Reflection.Metadata Imports Microsoft.Cci Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.Emit -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Reflection.Metadata Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/BaseTypeAnalysis.vb b/src/Compilers/VisualBasic/Portable/Symbols/BaseTypeAnalysis.vb index 650d759cf2971..90edacfb61bda 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/BaseTypeAnalysis.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/BaseTypeAnalysis.vb @@ -7,8 +7,8 @@ Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEAssemblySymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEAssemblySymbol.vb index 48265e3f4a768..120294e440256 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEAssemblySymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEAssemblySymbol.vb @@ -6,10 +6,10 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Collections.ObjectModel Imports System.Linq.Enumerable -Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEEventSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEEventSymbol.vb index 542ce1614e32e..5a850d80434d7 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEEventSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEEventSymbol.vb @@ -5,9 +5,9 @@ Imports System Imports System.Collections.Immutable Imports System.Globalization +Imports System.Threading Imports System.Reflection Imports System.Reflection.Metadata -Imports System.Threading Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEFieldSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEFieldSymbol.vb index 0ac96040dd63e..eebcf922a7ced 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEFieldSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEFieldSymbol.vb @@ -6,10 +6,10 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Collections.ObjectModel Imports System.Globalization -Imports System.Reflection -Imports System.Reflection.Metadata Imports System.Runtime.InteropServices Imports System.Threading +Imports System.Reflection +Imports System.Reflection.Metadata Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.vb index 6793ae91aeb89..008058c1912b4 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEGlobalNamespaceSymbol.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Generic -Imports System.Reflection.Metadata Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Reflection.Metadata Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEMethodSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEMethodSymbol.vb index 406bb5ace561c..180613eb6950c 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEMethodSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEMethodSymbol.vb @@ -6,14 +6,14 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Collections.ObjectModel Imports System.Globalization +Imports System.Threading Imports System.Reflection Imports System.Reflection.Metadata -Imports System.Runtime.InteropServices -Imports System.Threading Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.vb index 721f1f3ffd0ac..8d6930537561a 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENamedTypeSymbol.vb @@ -6,9 +6,9 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Collections.ObjectModel Imports System.Globalization -Imports System.Linq Imports System.Reflection Imports System.Reflection.Metadata +Imports System.Linq Imports System.Runtime.InteropServices Imports System.Threading Imports Microsoft.CodeAnalysis.CodeGen @@ -16,9 +16,9 @@ Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports FieldAttributes = System.Reflection.FieldAttributes -Imports TypeAttributes = System.Reflection.TypeAttributes Imports TypeKind = Microsoft.CodeAnalysis.TypeKind +Imports TypeAttributes = System.Reflection.TypeAttributes +Imports FieldAttributes = System.Reflection.FieldAttributes Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.vb index a5f269c7807a2..00c6f1ffb132a 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PENestedNamespaceSymbol.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Generic +Imports System.Threading Imports System.Reflection Imports System.Reflection.Metadata -Imports System.Threading Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEParameterSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEParameterSymbol.vb index 0da3e65634e3a..7f9751ba6c461 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEParameterSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEParameterSymbol.vb @@ -4,10 +4,10 @@ Imports System.Collections.Generic Imports System.Collections.Immutable -Imports System.Reflection -Imports System.Reflection.Metadata Imports System.Runtime.InteropServices Imports System.Threading +Imports System.Reflection +Imports System.Reflection.Metadata Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEPropertySymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEPropertySymbol.vb index e434276d65c3e..d35e52b5b8d73 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEPropertySymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PEPropertySymbol.vb @@ -4,9 +4,9 @@ Imports System.Collections.Immutable Imports System.Globalization +Imports System.Threading Imports System.Reflection Imports System.Reflection.Metadata -Imports System.Threading Imports Microsoft.Cci Imports Microsoft.CodeAnalysis.PooledObjects diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PETypeParameterSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PETypeParameterSymbol.vb index 7bfa39005361f..af013bde4b967 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PETypeParameterSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Metadata/PE/PETypeParameterSymbol.vb @@ -4,13 +4,13 @@ Imports System.Collections.Generic Imports System.Collections.Immutable -Imports System.Reflection -Imports System.Reflection.Metadata Imports System.Threading +Imports System.Reflection.Metadata Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Reflection Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Portable/Symbols/NamedTypeSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/NamedTypeSymbol.vb index 616b7bdaccee8..ba37369b1598b 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/NamedTypeSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/NamedTypeSymbol.vb @@ -8,8 +8,8 @@ Imports System.Runtime.InteropServices Imports System.Text Imports System.Threading Imports Microsoft.CodeAnalysis.PooledObjects -Imports Microsoft.CodeAnalysis.Symbols Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports TypeKind = Microsoft.CodeAnalysis.TypeKind diff --git a/src/Compilers/VisualBasic/Portable/Symbols/NamespaceOrTypeSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/NamespaceOrTypeSymbol.vb index 7563fc1480563..b30611c87ecec 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/NamespaceOrTypeSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/NamespaceOrTypeSymbol.vb @@ -6,8 +6,8 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Threading Imports Microsoft.CodeAnalysis.Collections -Imports Microsoft.CodeAnalysis.Symbols Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Symbols/NamespaceSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/NamespaceSymbol.vb index 4ea8f0688963f..ab40ce94cd986 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/NamespaceSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/NamespaceSymbol.vb @@ -6,8 +6,8 @@ Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Threading Imports Microsoft.CodeAnalysis.PooledObjects -Imports Microsoft.CodeAnalysis.Symbols Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.vb index c90e600200027..d74fa93184cee 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingAssemblySymbol.vb @@ -6,12 +6,12 @@ Imports System.Collections.Concurrent Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Collections.ObjectModel -Imports System.Globalization -Imports System.Threading Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Globalization +Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Retargeting diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingModuleSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingModuleSymbol.vb index eb46e34e866bb..0ae763a10e97e 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingModuleSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingModuleSymbol.vb @@ -6,15 +6,15 @@ Imports System.Collections.Concurrent Imports System.Collections.Generic Imports System.Collections.Immutable Imports System.Collections.ObjectModel -Imports System.Globalization Imports System.Runtime.InteropServices -Imports System.Threading Imports Microsoft.Cci Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports TypeKind = Microsoft.CodeAnalysis.TypeKind +Imports System.Globalization +Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Retargeting diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.vb b/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.vb index 6dc129054f8e7..46e7c7e6a1bb2 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Retargeting/RetargetingSymbolTranslator.vb @@ -9,8 +9,8 @@ Imports System.Collections.ObjectModel Imports Microsoft.Cci Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols.Retargeting diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Source/SourceSimpleParameterSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Source/SourceSimpleParameterSymbol.vb index b804a273a9be9..42e76980383db 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Source/SourceSimpleParameterSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Source/SourceSimpleParameterSymbol.vb @@ -3,7 +3,6 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Generic -Imports System.Collections.Immutable Imports System.Collections.ObjectModel Imports System.Runtime.InteropServices Imports System.Threading @@ -12,6 +11,7 @@ Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Binder Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Collections.Immutable Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols ''' diff --git a/src/Compilers/VisualBasic/Portable/Symbols/TypeParameterSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/TypeParameterSymbol.vb index 6bb54a363af01..5e62b8ad9e7d9 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/TypeParameterSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/TypeParameterSymbol.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Symbols/TypeSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/TypeSymbol.vb index f72d79b66a39b..8ee0405eb018b 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/TypeSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/TypeSymbol.vb @@ -8,8 +8,8 @@ Imports System.Collections.Immutable Imports System.Runtime.InteropServices Imports System.Threading Imports Microsoft.CodeAnalysis.PooledObjects -Imports Microsoft.CodeAnalysis.Symbols Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Portable/Symbols/UnsupportedMetadataTypeSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/UnsupportedMetadataTypeSymbol.vb index 237fa00fb44c0..ba9c790f049e6 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/UnsupportedMetadataTypeSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/UnsupportedMetadataTypeSymbol.vb @@ -4,10 +4,10 @@ Imports System.Collections.Generic Imports System.Collections.ObjectModel -Imports System.Reflection.Metadata Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Reflection.Metadata Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols diff --git a/src/Compilers/VisualBasic/Portable/Syntax/LambdaUtilities.vb b/src/Compilers/VisualBasic/Portable/Syntax/LambdaUtilities.vb index 0b45f79889609..2f9ad037b77a3 100644 --- a/src/Compilers/VisualBasic/Portable/Syntax/LambdaUtilities.vb +++ b/src/Compilers/VisualBasic/Portable/Syntax/LambdaUtilities.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Runtime.InteropServices Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Syntax/SyntaxFactory.vb b/src/Compilers/VisualBasic/Portable/Syntax/SyntaxFactory.vb index aa760d33ae906..78252e87b8fb3 100644 --- a/src/Compilers/VisualBasic/Portable/Syntax/SyntaxFactory.vb +++ b/src/Compilers/VisualBasic/Portable/Syntax/SyntaxFactory.vb @@ -4,9 +4,9 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Feature = Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.Feature -Imports Parser = Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.Parser Imports VbObjectDisplay = Microsoft.CodeAnalysis.VisualBasic.ObjectDisplay.ObjectDisplay +Imports Parser = Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.Parser +Imports Feature = Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax.Feature Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Portable/Syntax/SyntaxNodeFactories.vb b/src/Compilers/VisualBasic/Portable/Syntax/SyntaxNodeFactories.vb index e0ee40e0f3725..a272b57adabbc 100644 --- a/src/Compilers/VisualBasic/Portable/Syntax/SyntaxNodeFactories.vb +++ b/src/Compilers/VisualBasic/Portable/Syntax/SyntaxNodeFactories.vb @@ -7,15 +7,15 @@ ' code-generated into SyntaxNodes.vb, but some are easier to hand-write. '----------------------------------------------------------------------------------------------------------- -Imports System.Collections.Immutable -Imports System.ComponentModel -Imports System.Text Imports System.Threading -Imports Microsoft.CodeAnalysis.Syntax +Imports System.Text Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.SyntaxFacts Imports InternalSyntax = Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax +Imports Microsoft.CodeAnalysis.Syntax +Imports System.Collections.Immutable +Imports System.ComponentModel Namespace Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Test/CommandLine/CommandLineBreakingChanges.vb b/src/Compilers/VisualBasic/Test/CommandLine/CommandLineBreakingChanges.vb index 26e83add6a68e..fbd1f78da018f 100644 --- a/src/Compilers/VisualBasic/Test/CommandLine/CommandLineBreakingChanges.vb +++ b/src/Compilers/VisualBasic/Test/CommandLine/CommandLineBreakingChanges.vb @@ -3,8 +3,8 @@ ' See the LICENSE file in the project root for more information. Imports System.Reflection -Imports Roslyn.Test.Utilities Imports Roslyn.Test.Utilities.SharedResourceHelpers +Imports Roslyn.Test.Utilities Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.CommandLine.UnitTests diff --git a/src/Compilers/VisualBasic/Test/CommandLine/SarifErrorLoggerTests.vb b/src/Compilers/VisualBasic/Test/CommandLine/SarifErrorLoggerTests.vb index bf88ac40ca668..db16718bf196c 100644 --- a/src/Compilers/VisualBasic/Test/CommandLine/SarifErrorLoggerTests.vb +++ b/src/Compilers/VisualBasic/Test/CommandLine/SarifErrorLoggerTests.vb @@ -4,11 +4,11 @@ Imports System.Globalization Imports System.IO -Imports Microsoft.CodeAnalysis.CommonDiagnosticAnalyzers Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests -Imports Roslyn.Test.Utilities.SharedResourceHelpers Imports Xunit +Imports Microsoft.CodeAnalysis.CommonDiagnosticAnalyzers +Imports Roslyn.Test.Utilities.SharedResourceHelpers Namespace Microsoft.CodeAnalysis.VisualBasic.CommandLine.UnitTests diff --git a/src/Compilers/VisualBasic/Test/CommandLine/SarifV1ErrorLoggerTests.vb b/src/Compilers/VisualBasic/Test/CommandLine/SarifV1ErrorLoggerTests.vb index cad942809686c..5edd37fc00b3f 100644 --- a/src/Compilers/VisualBasic/Test/CommandLine/SarifV1ErrorLoggerTests.vb +++ b/src/Compilers/VisualBasic/Test/CommandLine/SarifV1ErrorLoggerTests.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.IO -Imports Microsoft.CodeAnalysis.CommonDiagnosticAnalyzers -Imports Microsoft.CodeAnalysis.DiagnosticExtensions Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Xunit +Imports Microsoft.CodeAnalysis.CommonDiagnosticAnalyzers +Imports Microsoft.CodeAnalysis.DiagnosticExtensions Namespace Microsoft.CodeAnalysis.VisualBasic.CommandLine.UnitTests diff --git a/src/Compilers/VisualBasic/Test/CommandLine/SarifV2ErrorLoggerTests.vb b/src/Compilers/VisualBasic/Test/CommandLine/SarifV2ErrorLoggerTests.vb index 7ecb20d9ff2df..7edd02223ce99 100644 --- a/src/Compilers/VisualBasic/Test/CommandLine/SarifV2ErrorLoggerTests.vb +++ b/src/Compilers/VisualBasic/Test/CommandLine/SarifV2ErrorLoggerTests.vb @@ -4,10 +4,10 @@ Imports System.Globalization Imports System.IO -Imports Microsoft.CodeAnalysis.CommonDiagnosticAnalyzers Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Xunit +Imports Microsoft.CodeAnalysis.CommonDiagnosticAnalyzers Namespace Microsoft.CodeAnalysis.VisualBasic.CommandLine.UnitTests diff --git a/src/Compilers/VisualBasic/Test/CommandLine/TouchedFileLoggingTests.vb b/src/Compilers/VisualBasic/Test/CommandLine/TouchedFileLoggingTests.vb index adefd29d413c5..b6f1e330f8a55 100644 --- a/src/Compilers/VisualBasic/Test/CommandLine/TouchedFileLoggingTests.vb +++ b/src/Compilers/VisualBasic/Test/CommandLine/TouchedFileLoggingTests.vb @@ -7,8 +7,8 @@ Imports System.IO Imports System.Reflection Imports System.Runtime.InteropServices Imports Microsoft.CodeAnalysis.Test.Utilities -Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Roslyn.Test.Utilities.SharedResourceHelpers +Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.CommandLine.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Conditional.vb b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Conditional.vb index cbd3eb5add3a1..7e9dda7474ed2 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Conditional.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Conditional.vb @@ -14,8 +14,8 @@ Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Imports TypeKind = Microsoft.CodeAnalysis.TypeKind diff --git a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_MarshalAs.vb b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_MarshalAs.vb index b0dfada1001a4..098701467ec61 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_MarshalAs.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_MarshalAs.vb @@ -6,9 +6,9 @@ Imports System Imports System.Collections.Generic Imports System.Runtime.InteropServices Imports System.Text -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Imports Roslyn.Utilities Imports Xunit diff --git a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Tuples.vb b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Tuples.vb index 0a9b5d5f5ebc3..59ec5e484d03e 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Tuples.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_Tuples.vb @@ -9,8 +9,8 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenNullable.vb b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenNullable.vb index 6e903b11861d2..1afe5694d817e 100644 --- a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenNullable.vb +++ b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenNullable.vb @@ -2,7 +2,6 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Test.Utilities @@ -11,6 +10,7 @@ Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Emit +Imports System.Collections.Immutable Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenTuples.vb b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenTuples.vb index 1e69473f8a610..eeb80e41efae9 100644 --- a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenTuples.vb +++ b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenTuples.vb @@ -12,8 +12,8 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities -Imports Roslyn.Test.Utilities.TestMetadata Imports Xunit +Imports Roslyn.Test.Utilities.TestMetadata Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenWinMdDelegates.vb b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenWinMdDelegates.vb index 6b9f3569397d9..8b9e58d576e80 100644 --- a/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenWinMdDelegates.vb +++ b/src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenWinMdDelegates.vb @@ -2,11 +2,11 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Xml.Linq -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities +Imports System.Xml.Linq Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Emit/Emit/DeterministicTests.vb b/src/Compilers/VisualBasic/Test/Emit/Emit/DeterministicTests.vb index a29d0838cc91a..38d01e41d8290 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Emit/DeterministicTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Emit/DeterministicTests.vb @@ -3,13 +3,13 @@ ' See the LICENSE file in the project root for more information. Imports System +Imports System.IO Imports System.Collections.Generic Imports System.Collections.Immutable -Imports System.IO Imports System.Threading Imports Microsoft.CodeAnalysis.Test.Utilities -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Roslyn.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Emit diff --git a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/AssemblyReferencesTests.vb b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/AssemblyReferencesTests.vb index ae3ce72a60acd..f3be22ee50635 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/AssemblyReferencesTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/AssemblyReferencesTests.vb @@ -8,10 +8,10 @@ Imports System.IO Imports System.Linq Imports System.Reflection.Metadata Imports System.Threading -Imports Microsoft.CodeAnalysis.Emit -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests +Imports Microsoft.CodeAnalysis.Emit +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.MetadataUtilities Imports Roslyn.Test.Utilities Imports Xunit diff --git a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/EditAndContinuePdbTests.vb b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/EditAndContinuePdbTests.vb index 81a12c3c38bf4..35d0a023f9a22 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/EditAndContinuePdbTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/EditAndContinuePdbTests.vb @@ -4,10 +4,10 @@ Imports System.Collections.Immutable Imports System.Reflection.Metadata Imports System.Reflection.Metadata.Ecma335 -Imports Microsoft.CodeAnalysis.Emit -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests +Imports Microsoft.CodeAnalysis.Emit +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/SymbolMatcherTests.vb b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/SymbolMatcherTests.vb index daf25ddb8b9be..8cd4cdd848467 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/SymbolMatcherTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/SymbolMatcherTests.vb @@ -3,15 +3,15 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports System.Threading -Imports System.Threading.Tasks Imports Microsoft.CodeAnalysis.CodeGen Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.Test.Utilities -Imports Microsoft.CodeAnalysis.VisualBasic.Emit Imports Microsoft.CodeAnalysis.VisualBasic.Symbols -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Emit Imports Roslyn.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports System.Threading.Tasks +Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests Public Class SymbolMatcherTests diff --git a/src/Compilers/VisualBasic/Test/Emit/Emit/NoPiaEmbedTypes.vb b/src/Compilers/VisualBasic/Test/Emit/Emit/NoPiaEmbedTypes.vb index c721aa6c8bf61..e6fe80e2af427 100644 --- a/src/Compilers/VisualBasic/Test/Emit/Emit/NoPiaEmbedTypes.vb +++ b/src/Compilers/VisualBasic/Test/Emit/Emit/NoPiaEmbedTypes.vb @@ -2,20 +2,20 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Collections.Immutable -Imports System.IO -Imports System.Reflection -Imports System.Reflection.Metadata -Imports System.Xml.Linq -Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Emit Imports Roslyn.Test.Utilities -Imports Roslyn.Test.Utilities.TestMetadata +Imports System.IO +Imports System.Reflection +Imports System.Xml.Linq Imports Xunit +Imports System.Reflection.Metadata +Imports Microsoft.CodeAnalysis.Emit +Imports System.Collections.Immutable +Imports Roslyn.Test.Utilities.TestMetadata Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Emit/PDB/ChecksumTests.vb b/src/Compilers/VisualBasic/Test/Emit/PDB/ChecksumTests.vb index 8540aa24447d0..16edc2ffcd6bf 100644 --- a/src/Compilers/VisualBasic/Test/Emit/PDB/ChecksumTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/PDB/ChecksumTests.vb @@ -2,13 +2,13 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports Microsoft.CodeAnalysis.Text +Imports Roslyn.Test.Utilities Imports System.Collections.Immutable Imports System.IO Imports System.Xml.Linq -Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.Test.Utilities -Imports Microsoft.CodeAnalysis.Text -Imports Roslyn.Test.Utilities +Imports Microsoft.CodeAnalysis.Emit Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.PDB diff --git a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBConstLocalTests.vb b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBConstLocalTests.vb index ac43ce10c9b86..8c223892be73d 100644 --- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBConstLocalTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBConstLocalTests.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports Roslyn.Test.Utilities Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Test.Utilities -Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.PDB diff --git a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBLambdaTests.vb b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBLambdaTests.vb index e662bcf228e49..3c7a9d7e3d895 100644 --- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBLambdaTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBLambdaTests.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities +Imports System.Xml.Linq Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.PDB Public Class PDBLambdaTests diff --git a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBWinMdExpTests.vb b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBWinMdExpTests.vb index 9caa2900068b8..55af00c39e232 100644 --- a/src/Compilers/VisualBasic/Test/Emit/PDB/PDBWinMdExpTests.vb +++ b/src/Compilers/VisualBasic/Test/Emit/PDB/PDBWinMdExpTests.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports Roslyn.Test.Utilities Imports System.IO Imports System.Text Imports System.Xml -Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.PDB Public Class PDBWinMdExpTests diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArgument.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArgument.vb index 645eb745e9733..f0688530ba51f 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArgument.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArgument.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Operations -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.Operations Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArrayElementReferenceExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArrayElementReferenceExpression.vb index ac7ae3a83d74a..6ef31628f24c7 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArrayElementReferenceExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IArrayElementReferenceExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IAwaitExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IAwaitExpression.vb index 07b24339f3213..f31df66a0aa53 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IAwaitExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IAwaitExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBinaryOperatorExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBinaryOperatorExpression.vb index a2df221427a6e..830d524ac6f56 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBinaryOperatorExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBinaryOperatorExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBlockStatement_MethodBlocks.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBlockStatement_MethodBlocks.vb index fe749abf3a511..0bff05b1b401a 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBlockStatement_MethodBlocks.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IBlockStatement_MethodBlocks.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ICompoundAssignmentOperation.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ICompoundAssignmentOperation.vb index 6b5b385056d28..528fbc4e6a672 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ICompoundAssignmentOperation.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ICompoundAssignmentOperation.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Operations +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.Operations Imports Microsoft.CodeAnalysis.VisualBasic.Symbols -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IConversionExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IConversionExpression.vb index a476d8d2b7c5e..f624ec0d0a09d 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IConversionExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IConversionExpression.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Operations -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.Operations Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicInvocationExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicInvocationExpression.vb index 2569b10c98a1b..be06de39b70aa 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicInvocationExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicInvocationExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicMemberReferenceExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicMemberReferenceExpression.vb index be29c42ce8a83..90c8138044c8c 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicMemberReferenceExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IDynamicMemberReferenceExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IIfStatement.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IIfStatement.vb index d47a6b6c790bc..7c2f62f75dcc4 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IIfStatement.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IIfStatement.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IInterpolatedStringExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IInterpolatedStringExpression.vb index 8d910cfbe8c23..81b1c8d1ba091 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IInterpolatedStringExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IInterpolatedStringExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_INoPiaObjectCreationOperation.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_INoPiaObjectCreationOperation.vb index 1585a19c4f59c..8d580954e5591 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_INoPiaObjectCreationOperation.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_INoPiaObjectCreationOperation.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IObjectCreationExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IObjectCreationExpression.vb index a6533376787b3..2422a4b0d9712 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IObjectCreationExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IObjectCreationExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IReturnStatement.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IReturnStatement.vb index 0f95a7a717c5e..5505de8fdb6ae 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IReturnStatement.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IReturnStatement.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITupleExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITupleExpression.vb index 510ac1ab1fd7c..db9e4b01aa62d 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITupleExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITupleExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITypeOfExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITypeOfExpression.vb index 83d8844a5ab28..3d5d23aca2c13 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITypeOfExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_ITypeOfExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUnaryOperatorExpression.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUnaryOperatorExpression.vb index e00d2957f47b1..b908a3e194ee2 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUnaryOperatorExpression.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUnaryOperatorExpression.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUsingStatement.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUsingStatement.vb index 79e1d85aca59a..89c4b1b36b34e 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUsingStatement.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IUsingStatement.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Operations -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities +Imports Microsoft.CodeAnalysis.Operations Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics Partial Public Class IOperationTests diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IVariableDeclaration.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IVariableDeclaration.vb index 78cf95c808fb5..1c2ecd2125e0f 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IVariableDeclaration.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IVariableDeclaration.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IWithStatement.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IWithStatement.vb index 97533f46735d3..46bd430dd2c28 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IWithStatement.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_IWithStatement.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_TryCatch.vb b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_TryCatch.vb index 60c92f65c9b62..7f6450dddaabf 100644 --- a/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_TryCatch.vb +++ b/src/Compilers/VisualBasic/Test/IOperation/IOperation/IOperationTests_TryCatch.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Statements_Tests.vb b/src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Statements_Tests.vb index 10f38403a1f31..1f78dcc964257 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Statements_Tests.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Statements_Tests.vb @@ -7,8 +7,8 @@ Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Emit Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Semantic/Binding/LookupTests.vb b/src/Compilers/VisualBasic/Test/Semantic/Binding/LookupTests.vb index d3b0476cf70fe..08fa2cb65a2b4 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Binding/LookupTests.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/Binding/LookupTests.vb @@ -8,8 +8,8 @@ Imports System.Text Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Imports Roslyn.Test.Utilities.TestMetadata diff --git a/src/Compilers/VisualBasic/Test/Semantic/Compilation/CompilationAPITests.vb b/src/Compilers/VisualBasic/Test/Semantic/Compilation/CompilationAPITests.vb index ebe44c1ec74f2..f7dcfd92492c2 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Compilation/CompilationAPITests.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/Compilation/CompilationAPITests.vb @@ -19,9 +19,9 @@ Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Roslyn.Test.Utilities +Imports CS = Microsoft.CodeAnalysis.CSharp Imports Roslyn.Test.Utilities.TestHelpers Imports Roslyn.Test.Utilities.TestMetadata -Imports CS = Microsoft.CodeAnalysis.CSharp Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests Public Class CompilationAPITests diff --git a/src/Compilers/VisualBasic/Test/Semantic/FlowAnalysis/FlowDiagnosticTests.vb b/src/Compilers/VisualBasic/Test/Semantic/FlowAnalysis/FlowDiagnosticTests.vb index 24b6afd4dc590..0adbdd3f827ba 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/FlowAnalysis/FlowDiagnosticTests.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/FlowAnalysis/FlowDiagnosticTests.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System +Imports System.[Text] Imports System.Collections.Generic Imports System.Linq -Imports System.[Text] Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax diff --git a/src/Compilers/VisualBasic/Test/Semantic/Semantics/AsyncAwait.vb b/src/Compilers/VisualBasic/Test/Semantic/Semantics/AsyncAwait.vb index bf35ba5f52627..d6ff685ec29d3 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Semantics/AsyncAwait.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/Semantics/AsyncAwait.vb @@ -2,12 +2,13 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Collections.ObjectModel Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax + Imports Roslyn.Test.Utilities +Imports System.Collections.ObjectModel Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/Semantic/Semantics/GetSemanticInfoTests.vb b/src/Compilers/VisualBasic/Test/Semantic/Semantics/GetSemanticInfoTests.vb index 17d5c5831ac1e..c4a0121521627 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Semantics/GetSemanticInfoTests.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/Semantics/GetSemanticInfoTests.vb @@ -14,9 +14,10 @@ Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.OverloadResolution Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Roslyn.Test.Utilities Imports Roslyn.Test.Utilities.TestMetadata +Imports Roslyn.Test.Utilities + Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics Partial Public Class SemanticModelTests diff --git a/src/Compilers/VisualBasic/Test/Semantic/Semantics/MethodCalls.vb b/src/Compilers/VisualBasic/Test/Semantic/Semantics/MethodCalls.vb index e282ef889054b..7a57fef155062 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Semantics/MethodCalls.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/Semantics/MethodCalls.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics diff --git a/src/Compilers/VisualBasic/Test/Semantic/Semantics/NameLengthTests.vb b/src/Compilers/VisualBasic/Test/Semantic/Semantics/NameLengthTests.vb index e8eb06d87c455..ccf367fa258fc 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/Semantics/NameLengthTests.vb +++ b/src/Compilers/VisualBasic/Test/Semantic/Semantics/NameLengthTests.vb @@ -2,14 +2,14 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System Imports System.IO -Imports System.Xml.Linq -Imports Microsoft.Cci Imports Microsoft.CodeAnalysis.VisualBasic.Symbols 'Imports Microsoft.CodeAnalysis.VisualBasic.Test.Utilities Imports Roslyn.Test.Utilities Imports Xunit +Imports Microsoft.Cci +Imports System +Imports System.Xml.Linq Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests Public Class NameLengthTests : Inherits BasicTestBase diff --git a/src/Compilers/VisualBasic/Test/Symbol/DocumentationComments/DocCommentTests.vb b/src/Compilers/VisualBasic/Test/Symbol/DocumentationComments/DocCommentTests.vb index d19ed37746289..5f793c9ffff46 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/DocumentationComments/DocCommentTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/DocumentationComments/DocCommentTests.vb @@ -3,15 +3,15 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports System.IO -Imports System.Text -Imports System.Xml.Linq -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.VisualBasic.VisualBasicCompilation +Imports Microsoft.CodeAnalysis.Test.Utilities +Imports System.Xml.Linq +Imports System.Text +Imports System.IO Imports Roslyn.Test.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.VisualBasicCompilation Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests Public Class DocCommentTests diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesEmittedSymbolsTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesEmittedSymbolsTests.vb index 6f681559e0972..4b5a31722f9d7 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesEmittedSymbolsTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesEmittedSymbolsTests.vb @@ -7,9 +7,10 @@ Imports System.Runtime.CompilerServices Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax + Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesSemanticsTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesSemanticsTests.vb index 87a16184f0e64..75b57bd30213e 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesSemanticsTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AnonymousTypes/AnonymousTypesSemanticsTests.vb @@ -8,9 +8,10 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax + Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AssemblyAndNamespaceTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AssemblyAndNamespaceTests.vb index 9987bb038d380..e1716e18bca18 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AssemblyAndNamespaceTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/AssemblyAndNamespaceTests.vb @@ -2,7 +2,6 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Collections.Immutable Imports System.Globalization Imports System.Text Imports System.Xml.Linq @@ -12,6 +11,7 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities +Imports System.Collections.Immutable Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/CorLibrary/Choosing.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/CorLibrary/Choosing.vb index 7b17c0ad87d4a..15755584b9802 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/CorLibrary/Choosing.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/CorLibrary/Choosing.vb @@ -7,8 +7,8 @@ Imports CompilationCreationTestHelpers Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Metadata Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/InterfaceImplementationTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/InterfaceImplementationTests.vb index 3a8da66b63ccd..1b2aba8041ca3 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/InterfaceImplementationTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/InterfaceImplementationTests.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/BaseTypeResolution.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/BaseTypeResolution.vb index 9a1237ba83808..66500bd40b27c 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/BaseTypeResolution.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/BaseTypeResolution.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System.Reflection.Metadata -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/HasUnsupportedMetadata.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/HasUnsupportedMetadata.vb index 5e37c9a1f81eb..b21bf60a59231 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/HasUnsupportedMetadata.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/HasUnsupportedMetadata.vb @@ -6,8 +6,8 @@ Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis.PooledObjects Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadCustomModifiers.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadCustomModifiers.vb index b9164597bdcb1..ae61dedfb9587 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadCustomModifiers.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadCustomModifiers.vb @@ -4,14 +4,14 @@ Imports System.Runtime.CompilerServices Imports CompilationCreationTestHelpers -Imports Microsoft.CodeAnalysis.CSharp Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities +Imports Microsoft.CodeAnalysis.CSharp Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingAttributes.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingAttributes.vb index ecd6cbc1ca962..eb30bf3b1eeee 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingAttributes.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingAttributes.vb @@ -8,8 +8,8 @@ Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Imports Roslyn.Test.Utilities.TestMetadata diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingEvents.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingEvents.vb index a58983a538209..101bdd0a1c2e1 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingEvents.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingEvents.vb @@ -7,8 +7,8 @@ Imports CompilationCreationTestHelpers Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities Imports Roslyn.Test.Utilities.TestMetadata diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingFields.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingFields.vb index b24da14c90126..ab01bc4261bf8 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingFields.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingFields.vb @@ -7,8 +7,8 @@ Imports CompilationCreationTestHelpers Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingWithEvents.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingWithEvents.vb index 9821ff7d3cd2f..d59121d128c04 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingWithEvents.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/LoadingWithEvents.vb @@ -7,8 +7,8 @@ Imports CompilationCreationTestHelpers Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPia.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPia.vb index 2377d6d6624af..c8027ff848044 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPia.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPia.vb @@ -4,8 +4,8 @@ Imports System.Collections.Immutable Imports CompilationCreationTestHelpers -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Imports Roslyn.Test.Utilities.TestMetadata diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaInstantiationOfGenericClassAndStruct.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaInstantiationOfGenericClassAndStruct.vb index b1f39e13e66a4..dc7a529f0b3d8 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaInstantiationOfGenericClassAndStruct.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaInstantiationOfGenericClassAndStruct.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System +Imports System.[Text] Imports System.Collections.Generic Imports System.Linq -Imports System.[Text] Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaLocalHideAndTypeSubstitutionTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaLocalHideAndTypeSubstitutionTests.vb index 2e1a9bded2797..db74b257b2d0c 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaLocalHideAndTypeSubstitutionTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/PE/NoPiaLocalHideAndTypeSubstitutionTests.vb @@ -2,11 +2,11 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Collections.Immutable -Imports System.Runtime.CompilerServices Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Roslyn.Test.Utilities +Imports System.Collections.Immutable +Imports System.Runtime.CompilerServices Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Metadata.PE diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdEventTest.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdEventTest.vb index 3d0ecdf533d91..b8c8040294fdc 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdEventTest.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdEventTest.vb @@ -8,10 +8,11 @@ Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Retargeting +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax + Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Metadata diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdTypeTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdTypeTests.vb index db912cfd073b1..134fe73177a93 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdTypeTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Metadata/WinMdTypeTests.vb @@ -5,8 +5,8 @@ Imports CompilationCreationTestHelpers Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/MyBaseMyClassSemanticsTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/MyBaseMyClassSemanticsTests.vb index 5ff2bcdcf4a1f..da5abdc72004f 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/MyBaseMyClassSemanticsTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/MyBaseMyClassSemanticsTests.vb @@ -7,9 +7,10 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax + Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/NoPia.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/NoPia.vb index 0080a35091bc1..9d416fc9e17f5 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/NoPia.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/NoPia.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports System.Xml.Linq -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities +Imports System.Xml.Linq Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Retargeting diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetCustomModifiers.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetCustomModifiers.vb index 6e7e717cf669a..e1c3966fe2aed 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetCustomModifiers.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetCustomModifiers.vb @@ -3,20 +3,20 @@ ' See the LICENSE file in the project root for more information. Imports System +Imports System.[Text] Imports System.Collections.Generic Imports System.Linq -Imports System.[Text] Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Retargeting +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities -Imports Roslyn.Test.Utilities.TestMetadata Imports Xunit +Imports Roslyn.Test.Utilities.TestMetadata Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Retargeting diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingCustomAttributes.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingCustomAttributes.vb index 843de7a3b6b04..2f90adc55e351 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingCustomAttributes.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingCustomAttributes.vb @@ -3,16 +3,16 @@ ' See the LICENSE file in the project root for more information. Imports System +Imports System.[Text] Imports System.Collections.Generic Imports System.Linq Imports System.Reflection.Metadata -Imports System.[Text] Imports Microsoft.CodeAnalysis.Collections Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Retargeting +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingTests.vb index 1ccaf9e9ae8a5..b61ce12c60488 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Retargeting/RetargetingTests.vb @@ -5,8 +5,8 @@ Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Retargeting +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/BaseClassTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/BaseClassTests.vb index 2f13d57b8fe76..368c00bc79ace 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/BaseClassTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/BaseClassTests.vb @@ -4,8 +4,8 @@ Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.Test.Utilities -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Roslyn.Test.Utilities Imports Roslyn.Test.Utilities.TestMetadata diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/EventTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/EventTests.vb index 385213a7c28e3..b2b76a7ce6ef4 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/EventTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/EventTests.vb @@ -12,9 +12,10 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax + Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols.Metadata Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/GroupClassTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/GroupClassTests.vb index 93dd6a9dba106..a2accc8ce72e4 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/GroupClassTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/GroupClassTests.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Roslyn.Test.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/PropertyTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/PropertyTests.vb index 4e2390ab6fee8..cdc4facbb34f7 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/PropertyTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/PropertyTests.vb @@ -6,8 +6,8 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Emit Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Emit -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/SyntheticEntryPoint.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/SyntheticEntryPoint.vb index a2ae1d083f464..ba8bfbda4e7b8 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/SyntheticEntryPoint.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/SyntheticEntryPoint.vb @@ -9,9 +9,9 @@ Imports Microsoft.CodeAnalysis.SpecialType Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.OverloadResolution Imports Microsoft.CodeAnalysis.VisualBasic.Symbols -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/WithStatementSymbolsTests.vb b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/WithStatementSymbolsTests.vb index 34d9f064e8b7c..9c5d0fbc9c884 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/WithStatementSymbolsTests.vb +++ b/src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/WithStatementSymbolsTests.vb @@ -7,9 +7,10 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax + Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests.Symbols Imports Roslyn.Test.Utilities diff --git a/src/Compilers/VisualBasic/Test/Syntax/Syntax/GeneratedTests.vb b/src/Compilers/VisualBasic/Test/Syntax/Syntax/GeneratedTests.vb index cafc1ce52a1c7..1a089907f6e1b 100644 --- a/src/Compilers/VisualBasic/Test/Syntax/Syntax/GeneratedTests.vb +++ b/src/Compilers/VisualBasic/Test/Syntax/Syntax/GeneratedTests.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax Imports Roslyn.Test.Utilities Imports Xunit diff --git a/src/Compilers/VisualBasic/Test/Syntax/Syntax/SerializationTests.vb b/src/Compilers/VisualBasic/Test/Syntax/Syntax/SerializationTests.vb index 0b8ffa5f46810..e800fafb1a42c 100644 --- a/src/Compilers/VisualBasic/Test/Syntax/Syntax/SerializationTests.vb +++ b/src/Compilers/VisualBasic/Test/Syntax/Syntax/SerializationTests.vb @@ -5,9 +5,9 @@ Imports System Imports System.IO Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax Imports Roslyn.Test.Utilities Imports Xunit diff --git a/src/EditorFeatures/CSharpTest/ConvertAnonymousTypeToClass/ConvertAnonymousTypeToClassTests.cs b/src/EditorFeatures/CSharpTest/ConvertAnonymousTypeToClass/ConvertAnonymousTypeToClassTests.cs index 5c1e15701551b..7c92808b2b465 100644 --- a/src/EditorFeatures/CSharpTest/ConvertAnonymousTypeToClass/ConvertAnonymousTypeToClassTests.cs +++ b/src/EditorFeatures/CSharpTest/ConvertAnonymousTypeToClass/ConvertAnonymousTypeToClassTests.cs @@ -4,13 +4,13 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis.CodeRefactorings; -using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.ConvertAnonymousTypeToClass; -using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeActions; using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings; +using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeActions; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using Microsoft.CodeAnalysis.CSharp; namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ConvertAnonymousTypeToClass { diff --git a/src/EditorFeatures/CSharpTest/Debugging/ProximityExpressionsGetterTests.cs b/src/EditorFeatures/CSharpTest/Debugging/ProximityExpressionsGetterTests.cs index a6e54e7944911..6865676c9edb9 100644 --- a/src/EditorFeatures/CSharpTest/Debugging/ProximityExpressionsGetterTests.cs +++ b/src/EditorFeatures/CSharpTest/Debugging/ProximityExpressionsGetterTests.cs @@ -10,8 +10,8 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CSharp.Debugging; using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.CSharp.Debugging; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs b/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs index e84d08687f750..4fa5b89fd2ade 100644 --- a/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs +++ b/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs @@ -5,16 +5,16 @@ #nullable disable using System; -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.CSharp.UnitTests; using Microsoft.CodeAnalysis.EditAndContinue; using Microsoft.CodeAnalysis.EditAndContinue.UnitTests; -using Microsoft.CodeAnalysis.Emit; -using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.VisualStudio.Debugger.Contracts.EditAndContinue; +using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using Microsoft.CodeAnalysis.Emit; +using Microsoft.CodeAnalysis.CSharp.UnitTests; +using System.Linq; namespace Microsoft.CodeAnalysis.CSharp.EditAndContinue.UnitTests { diff --git a/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodBase.cs b/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodBase.cs index a5424734118e4..141c3d9e58981 100644 --- a/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodBase.cs +++ b/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodBase.cs @@ -13,8 +13,8 @@ using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.ExtractMethod; -using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; +using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; diff --git a/src/EditorFeatures/CSharpTest/MakeMemberStatic/MakeMemberStaticTests.cs b/src/EditorFeatures/CSharpTest/MakeMemberStatic/MakeMemberStaticTests.cs index 0870a0d227454..b8e700eafc5fb 100644 --- a/src/EditorFeatures/CSharpTest/MakeMemberStatic/MakeMemberStaticTests.cs +++ b/src/EditorFeatures/CSharpTest/MakeMemberStatic/MakeMemberStaticTests.cs @@ -4,9 +4,9 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.MakeMemberStatic; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CodeFixes; -using Microsoft.CodeAnalysis.CSharp.MakeMemberStatic; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Diagnostics; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/EditorFeatures/CSharpTest/PullMemberUp/CSharpPullMemberUpTests.cs b/src/EditorFeatures/CSharpTest/PullMemberUp/CSharpPullMemberUpTests.cs index 046154af66bbc..836dd583ba8b2 100644 --- a/src/EditorFeatures/CSharpTest/PullMemberUp/CSharpPullMemberUpTests.cs +++ b/src/EditorFeatures/CSharpTest/PullMemberUp/CSharpPullMemberUpTests.cs @@ -4,19 +4,19 @@ #nullable disable -using System.Collections.Generic; -using System.Collections.Immutable; using System.Linq; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CodeActions; using Microsoft.CodeAnalysis.CodeRefactorings; -using Microsoft.CodeAnalysis.CodeRefactorings.PullMemberUp.Dialog; using Microsoft.CodeAnalysis.CSharp.CodeRefactorings.PullMemberUp; using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings; using Microsoft.CodeAnalysis.Test.Utilities; +using Xunit; +using System.Collections.Immutable; +using Microsoft.CodeAnalysis.CodeActions; +using Microsoft.CodeAnalysis.CodeRefactorings.PullMemberUp.Dialog; +using System.Collections.Generic; using Microsoft.CodeAnalysis.Test.Utilities.PullMemberUp; using Roslyn.Test.Utilities; -using Xunit; namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.PullMemberUp { diff --git a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindDerivedSymbolsCommandHandler.cs b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindDerivedSymbolsCommandHandler.cs index 87458f70502c1..6577d0200543a 100644 --- a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindDerivedSymbolsCommandHandler.cs +++ b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindDerivedSymbolsCommandHandler.cs @@ -3,16 +3,15 @@ // See the LICENSE file in the project root for more information. using System; +using System.Linq; using System.Collections.Generic; using System.ComponentModel.Composition; -using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Editor.FindUsages; using Microsoft.CodeAnalysis.Editor.Host; using Microsoft.CodeAnalysis.ErrorReporting; using Microsoft.CodeAnalysis.FindSymbols; -using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Internal.Log; using Microsoft.CodeAnalysis.Shared.TestHooks; using Microsoft.VisualStudio.Commanding; @@ -20,6 +19,7 @@ using Microsoft.VisualStudio.Utilities; using Roslyn.Utilities; using VSCommanding = Microsoft.VisualStudio.Commanding; +using Microsoft.CodeAnalysis.Host.Mef; namespace Microsoft.CodeAnalysis.Editor.Implementation.NavigationCommandHandlers { diff --git a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindMemberOverloadsCommandHandler.cs b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindMemberOverloadsCommandHandler.cs index 9c1862bb22998..9f28f81723d43 100644 --- a/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindMemberOverloadsCommandHandler.cs +++ b/src/EditorFeatures/Core.Cocoa/NavigationCommandHandlers/FindMemberOverloadsCommandHandler.cs @@ -3,15 +3,13 @@ // See the LICENSE file in the project root for more information. using System; +using System.Linq; using System.Collections.Generic; using System.ComponentModel.Composition; -using System.Linq; -using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Editor.FindUsages; using Microsoft.CodeAnalysis.Editor.Host; using Microsoft.CodeAnalysis.ErrorReporting; -using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Internal.Log; using Microsoft.CodeAnalysis.Shared.TestHooks; using Microsoft.VisualStudio.Commanding; @@ -19,6 +17,8 @@ using Microsoft.VisualStudio.Utilities; using Roslyn.Utilities; using VSCommanding = Microsoft.VisualStudio.Commanding; +using Microsoft.CodeAnalysis.Host.Mef; +using System.Threading; namespace Microsoft.CodeAnalysis.Editor.Implementation.NavigationCommandHandlers { diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandContentTypeLanguageService.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandContentTypeLanguageService.cs index b8129287e141e..92787b1c45c5f 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandContentTypeLanguageService.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandContentTypeLanguageService.cs @@ -4,12 +4,12 @@ #nullable disable -using System; using System.Composition; -using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Interactive; -using Microsoft.VisualStudio.InteractiveWindow.Commands; using Microsoft.VisualStudio.Utilities; +using Microsoft.VisualStudio.InteractiveWindow.Commands; +using System; +using Microsoft.CodeAnalysis.Host.Mef; namespace Microsoft.CodeAnalysis.Editor.Implementation.Interactive { diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandHandler.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandHandler.cs index dba0d30e6c39c..3205db76bcd48 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandHandler.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandHandler.cs @@ -6,17 +6,17 @@ using System; using System.Diagnostics; -using System.Threading; -using Microsoft.CodeAnalysis.Editor.Host; -using Microsoft.VisualStudio.Commanding; using Microsoft.VisualStudio.InteractiveWindow; using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Editor; -using Microsoft.VisualStudio.Text.Editor.Commanding; -using Microsoft.VisualStudio.Text.Editor.Commanding.Commands; using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods; using Microsoft.VisualStudio.Text.Operations; using Microsoft.VisualStudio.Utilities; +using System.Threading; +using Microsoft.CodeAnalysis.Editor.Host; +using Microsoft.VisualStudio.Text.Editor.Commanding.Commands; +using Microsoft.VisualStudio.Commanding; +using Microsoft.VisualStudio.Text.Editor.Commanding; namespace Microsoft.CodeAnalysis.Editor.Interactive { diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveSupportsFeatureService.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveSupportsFeatureService.cs index f17fc08a47d57..78aaa3c847bbb 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveSupportsFeatureService.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveSupportsFeatureService.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using System.Composition; using Microsoft.CodeAnalysis.Editor.Shared; using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.CodeAnalysis.Shared; -using Microsoft.VisualStudio.InteractiveWindow; using Microsoft.VisualStudio.Text; +using Microsoft.VisualStudio.InteractiveWindow; +using Microsoft.CodeAnalysis.Shared; +using System; namespace Microsoft.CodeAnalysis.Editor.Implementation.Interactive { diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowResetCommand.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowResetCommand.cs index 846b936f26845..1424d5018481b 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowResetCommand.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowResetCommand.cs @@ -5,11 +5,11 @@ #nullable disable extern alias InteractiveHost; + using System; using System.Collections.Generic; using System.ComponentModel.Composition; using System.Threading.Tasks; -using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Editor.Interactive; using Microsoft.VisualStudio.InteractiveWindow; @@ -18,6 +18,7 @@ using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Classification; using Microsoft.VisualStudio.Utilities; +using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Editor.Interactive diff --git a/src/EditorFeatures/Core.Wpf/Interactive/ResetInteractive.cs b/src/EditorFeatures/Core.Wpf/Interactive/ResetInteractive.cs index cd716b8930254..bb49cea83a519 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/ResetInteractive.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/ResetInteractive.cs @@ -5,20 +5,21 @@ #nullable disable extern alias InteractiveHost; + using System; -using System.Collections.Generic; -using System.Collections.Immutable; using System.Linq; using System.Threading.Tasks; -using InteractiveHost::Microsoft.CodeAnalysis.Interactive; -using Microsoft.CodeAnalysis.Editor; +using Roslyn.Utilities; using Microsoft.CodeAnalysis.Editor.Host; using Microsoft.CodeAnalysis.Editor.Interactive; using Microsoft.VisualStudio.InteractiveWindow; +using System.Collections.Immutable; +using Microsoft.CodeAnalysis.Editor; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods; +using System.Collections.Generic; +using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Microsoft.VisualStudio.Utilities; -using Roslyn.Utilities; namespace Microsoft.VisualStudio.LanguageServices.Interactive { diff --git a/src/EditorFeatures/Core.Wpf/Preview/PreviewReferenceHighlightingTaggerProvider.cs b/src/EditorFeatures/Core.Wpf/Preview/PreviewReferenceHighlightingTaggerProvider.cs index c89669d7af469..6a93f1407d211 100644 --- a/src/EditorFeatures/Core.Wpf/Preview/PreviewReferenceHighlightingTaggerProvider.cs +++ b/src/EditorFeatures/Core.Wpf/Preview/PreviewReferenceHighlightingTaggerProvider.cs @@ -4,15 +4,15 @@ #nullable disable -using System; using System.ComponentModel.Composition; -using Microsoft.CodeAnalysis.Editor.ReferenceHighlighting; using Microsoft.CodeAnalysis.Editor.Shared.Preview; using Microsoft.CodeAnalysis.Editor.Shared.Tagging; -using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Text.Tagging; using Microsoft.VisualStudio.Utilities; +using Microsoft.CodeAnalysis.Editor.ReferenceHighlighting; +using System; +using Microsoft.CodeAnalysis.Host.Mef; namespace Microsoft.CodeAnalysis.Editor.Implementation.Preview { diff --git a/src/EditorFeatures/Core.Wpf/Preview/PreviewWarningViewTaggerProvider.cs b/src/EditorFeatures/Core.Wpf/Preview/PreviewWarningViewTaggerProvider.cs index d7229062a897d..4305338b3112e 100644 --- a/src/EditorFeatures/Core.Wpf/Preview/PreviewWarningViewTaggerProvider.cs +++ b/src/EditorFeatures/Core.Wpf/Preview/PreviewWarningViewTaggerProvider.cs @@ -4,15 +4,15 @@ #nullable disable -using System; using System.ComponentModel.Composition; -using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; using Microsoft.CodeAnalysis.Editor.Shared.Preview; using Microsoft.CodeAnalysis.Editor.Shared.Tagging; -using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Text.Tagging; using Microsoft.VisualStudio.Utilities; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; +using System; +using Microsoft.CodeAnalysis.Host.Mef; namespace Microsoft.CodeAnalysis.Editor.Implementation.Preview { diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/Api/IVSTypeScriptFormattingInteractionService.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/Api/IVSTypeScriptFormattingInteractionService.cs index 8b6f154e38c29..bdcff8b3229bc 100644 --- a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/Api/IVSTypeScriptFormattingInteractionService.cs +++ b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/Api/IVSTypeScriptFormattingInteractionService.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptEditorInlineRenameService.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptEditorInlineRenameService.cs index 838a6d138cf42..cf14751ed5a01 100644 --- a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptEditorInlineRenameService.cs +++ b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptEditorInlineRenameService.cs @@ -4,14 +4,14 @@ #nullable disable -using System; -using System.Composition; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Editor; -using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api; -using Microsoft.CodeAnalysis.Host.Mef; using Roslyn.Utilities; +using System.Composition; +using Microsoft.CodeAnalysis.Host.Mef; +using System; +using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api; namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript { diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFormattingInteractionService.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFormattingInteractionService.cs index 3a7eb26a88dd7..d4b2ab1481110 100644 --- a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFormattingInteractionService.cs +++ b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFormattingInteractionService.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -7,8 +7,8 @@ using System.Composition; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api; using Microsoft.CodeAnalysis.Formatting; +using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Shared.Utilities; diff --git a/src/EditorFeatures/Core/Implementation/Interactive/ISendToInteractiveSubmissionProvider.cs b/src/EditorFeatures/Core/Implementation/Interactive/ISendToInteractiveSubmissionProvider.cs index 4e6acac78ec34..0d525e4553186 100644 --- a/src/EditorFeatures/Core/Implementation/Interactive/ISendToInteractiveSubmissionProvider.cs +++ b/src/EditorFeatures/Core/Implementation/Interactive/ISendToInteractiveSubmissionProvider.cs @@ -4,9 +4,9 @@ #nullable disable -using System.Threading; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Text.Editor.Commanding; +using System.Threading; namespace Microsoft.CodeAnalysis.Editor.Interactive { diff --git a/src/EditorFeatures/Core/Implementation/Interactive/SendToInteractiveSubmissionProvider.cs b/src/EditorFeatures/Core/Implementation/Interactive/SendToInteractiveSubmissionProvider.cs index 1b3df3d0c1546..22512e24dfec3 100644 --- a/src/EditorFeatures/Core/Implementation/Interactive/SendToInteractiveSubmissionProvider.cs +++ b/src/EditorFeatures/Core/Implementation/Interactive/SendToInteractiveSubmissionProvider.cs @@ -4,17 +4,17 @@ #nullable disable +using Microsoft.CodeAnalysis.Editor.Shared.Extensions; +using Microsoft.CodeAnalysis.Text; +using Microsoft.VisualStudio.Text; using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Editor.Shared.Extensions; -using Microsoft.CodeAnalysis.Text; -using Microsoft.VisualStudio.Text; +using Roslyn.Utilities; using Microsoft.VisualStudio.Text.Editor; -using Microsoft.VisualStudio.Text.Editor.Commanding; using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods; -using Roslyn.Utilities; +using Microsoft.VisualStudio.Text.Editor.Commanding; namespace Microsoft.CodeAnalysis.Editor.Interactive { diff --git a/src/EditorFeatures/Core/Undo/EditorSourceTextUndoService.cs b/src/EditorFeatures/Core/Undo/EditorSourceTextUndoService.cs index dc7cb7b52845d..5cac788aec015 100644 --- a/src/EditorFeatures/Core/Undo/EditorSourceTextUndoService.cs +++ b/src/EditorFeatures/Core/Undo/EditorSourceTextUndoService.cs @@ -4,14 +4,14 @@ #nullable disable -using System; using System.Collections.Generic; using System.Composition; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Text; -using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Operations; +using Microsoft.VisualStudio.Text; +using System; namespace Microsoft.CodeAnalysis.Editor.Undo { diff --git a/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/VisualBasicCodeRefactoringVerifier`1+Test.cs b/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/VisualBasicCodeRefactoringVerifier`1+Test.cs index edb74a6f31199..0a20d8d15b116 100644 --- a/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/VisualBasicCodeRefactoringVerifier`1+Test.cs +++ b/src/EditorFeatures/DiagnosticsTestUtilities/CodeActions/VisualBasicCodeRefactoringVerifier`1+Test.cs @@ -3,10 +3,10 @@ // See the LICENSE file in the project root for more information. using System.Net; -using Microsoft.CodeAnalysis.CodeRefactorings; -using Microsoft.CodeAnalysis.Testing.Verifiers; using Microsoft.CodeAnalysis.VisualBasic; using Microsoft.CodeAnalysis.VisualBasic.Testing; +using Microsoft.CodeAnalysis.Testing.Verifiers; +using Microsoft.CodeAnalysis.CodeRefactorings; #if !CODE_STYLE using System; diff --git a/src/EditorFeatures/DiagnosticsTestUtilities/Diagnostics/AbstractUserDiagnosticTest.cs b/src/EditorFeatures/DiagnosticsTestUtilities/Diagnostics/AbstractUserDiagnosticTest.cs index cf7b84da5ba2e..e658351e39cc3 100644 --- a/src/EditorFeatures/DiagnosticsTestUtilities/Diagnostics/AbstractUserDiagnosticTest.cs +++ b/src/EditorFeatures/DiagnosticsTestUtilities/Diagnostics/AbstractUserDiagnosticTest.cs @@ -13,10 +13,8 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis.CodeActions; using Microsoft.CodeAnalysis.CodeFixes; -using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; -using Microsoft.CodeAnalysis.Remote.Testing; using Microsoft.CodeAnalysis.Shared.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; @@ -24,6 +22,8 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; +using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.Remote.Testing; using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics diff --git a/src/EditorFeatures/Test/CodeFixes/ErrorCases/CodeFixExceptionInRegisterMethodAsync.cs b/src/EditorFeatures/Test/CodeFixes/ErrorCases/CodeFixExceptionInRegisterMethodAsync.cs index ed86db1fcd4db..49ef3ad5c11eb 100644 --- a/src/EditorFeatures/Test/CodeFixes/ErrorCases/CodeFixExceptionInRegisterMethodAsync.cs +++ b/src/EditorFeatures/Test/CodeFixes/ErrorCases/CodeFixExceptionInRegisterMethodAsync.cs @@ -5,8 +5,8 @@ #nullable disable using System; -using System.Collections.Immutable; using System.Composition; +using System.Collections.Immutable; using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CodeFixes; diff --git a/src/EditorFeatures/Test/EditAndContinue/EditSessionActiveStatementsTests.cs b/src/EditorFeatures/Test/EditAndContinue/EditSessionActiveStatementsTests.cs index ff03d0e97c76c..9970ad51071df 100644 --- a/src/EditorFeatures/Test/EditAndContinue/EditSessionActiveStatementsTests.cs +++ b/src/EditorFeatures/Test/EditAndContinue/EditSessionActiveStatementsTests.cs @@ -7,9 +7,7 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.IO; using System.Linq; -using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CSharp.EditAndContinue; @@ -18,11 +16,13 @@ using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; -using Microsoft.VisualStudio.Debugger.Contracts.EditAndContinue; using Moq; using Roslyn.Test.Utilities; using Roslyn.Utilities; +using Microsoft.VisualStudio.Debugger.Contracts.EditAndContinue; using Xunit; +using System.Text; +using System.IO; namespace Microsoft.CodeAnalysis.EditAndContinue.UnitTests { diff --git a/src/EditorFeatures/Test/ValueTracking/AbstractBaseValueTrackingTests.cs b/src/EditorFeatures/Test/ValueTracking/AbstractBaseValueTrackingTests.cs index 9bea36c6631a3..549ff737d21ef 100644 --- a/src/EditorFeatures/Test/ValueTracking/AbstractBaseValueTrackingTests.cs +++ b/src/EditorFeatures/Test/ValueTracking/AbstractBaseValueTrackingTests.cs @@ -2,18 +2,18 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Collections.Generic; -using System.Collections.Immutable; using System.Linq; -using System.Threading; +using System.Collections.Immutable; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.ValueTracking; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Remote.Testing; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Test.Utilities; +using System.Threading; using Microsoft.CodeAnalysis.Text; -using Microsoft.CodeAnalysis.ValueTracking; using Xunit; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis.Editor.UnitTests.ValueTracking { diff --git a/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb b/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb index 5d34966b9f7c5..194417e33c655 100644 --- a/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb +++ b/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Threading -Imports Microsoft.CodeAnalysis.Editor.FindUsages Imports Microsoft.CodeAnalysis.Remote.Testing +Imports Microsoft.CodeAnalysis.Editor.FindUsages +Imports System.Threading Namespace Microsoft.CodeAnalysis.Editor.UnitTests.GoToImplementation <[UseExportProvider]> diff --git a/src/EditorFeatures/Test2/Rename/CSharp/AliasTests.vb b/src/EditorFeatures/Test2/Rename/CSharp/AliasTests.vb index 9f7c3be2843ba..3ea6cffbcd53d 100644 --- a/src/EditorFeatures/Test2/Rename/CSharp/AliasTests.vb +++ b/src/EditorFeatures/Test2/Rename/CSharp/AliasTests.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Remote.Testing Imports Microsoft.CodeAnalysis.Rename.ConflictEngine +Imports Microsoft.CodeAnalysis.Remote.Testing Imports Xunit.Abstractions Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename.CSharp diff --git a/src/EditorFeatures/TestUtilities/Completion/AbstractArgumentProviderTests`1.cs b/src/EditorFeatures/TestUtilities/Completion/AbstractArgumentProviderTests`1.cs index 31572163bb980..e57bde7378c16 100644 --- a/src/EditorFeatures/TestUtilities/Completion/AbstractArgumentProviderTests`1.cs +++ b/src/EditorFeatures/TestUtilities/Completion/AbstractArgumentProviderTests`1.cs @@ -10,11 +10,11 @@ using Microsoft.CodeAnalysis.Editor.UnitTests; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Options; -using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.VisualStudio.Composition; using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; +using Microsoft.CodeAnalysis.Shared.Extensions; namespace Microsoft.CodeAnalysis.Test.Utilities.Completion { diff --git a/src/EditorFeatures/TestUtilities/Diagnostics/TestDiagnosticAnalyzerDriver.cs b/src/EditorFeatures/TestUtilities/Diagnostics/TestDiagnosticAnalyzerDriver.cs index d1d9c6a8692eb..af046dee23461 100644 --- a/src/EditorFeatures/TestUtilities/Diagnostics/TestDiagnosticAnalyzerDriver.cs +++ b/src/EditorFeatures/TestUtilities/Diagnostics/TestDiagnosticAnalyzerDriver.cs @@ -11,10 +11,10 @@ using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics; using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Remote; using Microsoft.CodeAnalysis.Serialization; -using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; using Xunit; diff --git a/src/EditorFeatures/TestUtilities/EditAndContinue/ActiveStatementTestHelpers.cs b/src/EditorFeatures/TestUtilities/EditAndContinue/ActiveStatementTestHelpers.cs index b974ef3f307f1..0f99facf7e053 100644 --- a/src/EditorFeatures/TestUtilities/EditAndContinue/ActiveStatementTestHelpers.cs +++ b/src/EditorFeatures/TestUtilities/EditAndContinue/ActiveStatementTestHelpers.cs @@ -6,10 +6,10 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; -using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Text; -using Microsoft.VisualStudio.Debugger.Contracts.EditAndContinue; using Roslyn.Utilities; +using Microsoft.VisualStudio.Debugger.Contracts.EditAndContinue; +using Microsoft.CodeAnalysis.CSharp; namespace Microsoft.CodeAnalysis.EditAndContinue.UnitTests { diff --git a/src/EditorFeatures/TestUtilities/TextEditorFactoryExtensions.cs b/src/EditorFeatures/TestUtilities/TextEditorFactoryExtensions.cs index 93722e9ab0a47..910d8bda58004 100644 --- a/src/EditorFeatures/TestUtilities/TextEditorFactoryExtensions.cs +++ b/src/EditorFeatures/TestUtilities/TextEditorFactoryExtensions.cs @@ -4,10 +4,10 @@ #nullable disable -using System; -using System.Collections.Immutable; using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Editor; +using System; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.Editor.UnitTests { diff --git a/src/EditorFeatures/TestUtilities2/Intellisense/TestStateFactory.vb b/src/EditorFeatures/TestUtilities2/Intellisense/TestStateFactory.vb index 6199268ffad1b..4d4608f0b69be 100644 --- a/src/EditorFeatures/TestUtilities2/Intellisense/TestStateFactory.vb +++ b/src/EditorFeatures/TestUtilities2/Intellisense/TestStateFactory.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Completion Imports Microsoft.CodeAnalysis.CSharp +Imports Microsoft.CodeAnalysis.Completion Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense Friend Class TestStateFactory diff --git a/src/EditorFeatures/VisualBasic/DocumentationComments/DocumentationCommentCommandHandler.vb b/src/EditorFeatures/VisualBasic/DocumentationComments/DocumentationCommentCommandHandler.vb index ac160e94fac26..09b229ab96a33 100644 --- a/src/EditorFeatures/VisualBasic/DocumentationComments/DocumentationCommentCommandHandler.vb +++ b/src/EditorFeatures/VisualBasic/DocumentationComments/DocumentationCommentCommandHandler.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System.ComponentModel.Composition +Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.CodeAnalysis.Editor.Host Imports Microsoft.CodeAnalysis.Editor.Implementation.DocumentationComments -Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.VisualStudio.Commanding Imports Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion Imports Microsoft.VisualStudio.Text.Operations diff --git a/src/EditorFeatures/VisualBasicTest/AddFileBanner/AddFileBannerTests.vb b/src/EditorFeatures/VisualBasicTest/AddFileBanner/AddFileBannerTests.vb index 8645e47f4de84..34e51555d5cce 100644 --- a/src/EditorFeatures/VisualBasicTest/AddFileBanner/AddFileBannerTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AddFileBanner/AddFileBannerTests.vb @@ -4,8 +4,8 @@ Imports System.Threading.Tasks Imports Microsoft.CodeAnalysis.CodeRefactorings -Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings Imports Microsoft.CodeAnalysis.VisualBasic.AddFileBanner +Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings Imports Roslyn.Test.Utilities Imports Xunit diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb index 917049216134f..5777d8043472d 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Xml.Linq -Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces +Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion Public Class AutomaticBraceCompletionTests diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb index de177e314dc98..13728b565e302 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Xml.Linq -Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces +Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion Public Class AutomaticBracketCompletionTests diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb index 14d30f83deea2..75838e25a0686 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Xml.Linq -Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces +Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion Public Class AutomaticInterpolatedStringExpressionCompletionTests diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb index db4146e75bdba..7da7aa798f945 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Xml.Linq -Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces +Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion Public Class AutomaticInterpolationCompletionTests diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb index 0b836d38199fd..ff04188c4773d 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Xml.Linq -Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces +Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion Public Class AutomaticLessAndGreaterThanCompletionTests diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb index 1764c2368fa09..2e1c6957a158e 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Xml.Linq -Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces +Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion Public Class AutomaticParenthesesCompletionTests diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb index d799326d0d19a..e253c26cc6545 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb @@ -3,11 +3,11 @@ ' See the LICENSE file in the project root for more information. Imports System.Xml.Linq -Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces +Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion Public Class AutomaticStringLiteralCompletionTests diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/AbstractVisualBasicDiagnosticProviderBasedUserDiagnosticTest.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/AbstractVisualBasicDiagnosticProviderBasedUserDiagnosticTest.vb index d7c91efc5ad3f..b87ec47eb3680 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/AbstractVisualBasicDiagnosticProviderBasedUserDiagnosticTest.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/AbstractVisualBasicDiagnosticProviderBasedUserDiagnosticTest.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions -Imports Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces +Imports Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics +Imports Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions Imports Xunit.Abstractions Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEndConstruct/GenerateEndConstructTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEndConstruct/GenerateEndConstructTests.vb index 18a9d2aee22ee..24f91fe56b440 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEndConstruct/GenerateEndConstructTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEndConstruct/GenerateEndConstructTests.vb @@ -3,8 +3,8 @@ ' See the LICENSE file in the project root for more information. Imports Microsoft.CodeAnalysis.CodeFixes -Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.VisualBasic.CodeFixes.GenerateEndConstruct +Imports Microsoft.CodeAnalysis.Diagnostics Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.GenerateEndConstruct Public Class GenerateEndConstructTests diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEnumMember/GenerateEnumMemberTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEnumMember/GenerateEnumMemberTests.vb index edffcd1d54af1..45bdad8d11564 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEnumMember/GenerateEnumMemberTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEnumMember/GenerateEnumMemberTests.vb @@ -3,8 +3,8 @@ ' See the LICENSE file in the project root for more information. Imports Microsoft.CodeAnalysis.CodeFixes -Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.VisualBasic.CodeFixes.GenerateEnumMember +Imports Microsoft.CodeAnalysis.Diagnostics Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.GenerateEnumMember Public Class GenerateEnumMemberTests diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEvent/GenerateEventTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEvent/GenerateEventTests.vb index 61622087cbbd1..4d2d29c791736 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEvent/GenerateEventTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateEvent/GenerateEventTests.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. +Imports Microsoft.CodeAnalysis.VisualBasic.CodeFixes.GenerateEvent Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions -Imports Microsoft.CodeAnalysis.VisualBasic.CodeFixes.GenerateEvent Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.GenerateEvent Public Class GenerateEventTests diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateMethod/GenerateMethodTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateMethod/GenerateMethodTests.vb index c9fc119993514..eea20a4c03ae9 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateMethod/GenerateMethodTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateMethod/GenerateMethodTests.vb @@ -3,8 +3,8 @@ ' See the LICENSE file in the project root for more information. Imports Microsoft.CodeAnalysis.CodeFixes -Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.VisualBasic.CodeFixes.GenerateMethod +Imports Microsoft.CodeAnalysis.Diagnostics Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.GenerateMethod Public Class GenerateMethodTests diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/Spellcheck/SpellcheckTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/Spellcheck/SpellcheckTests.vb index 21ca3c79a3345..8e234fee4c445 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/Spellcheck/SpellcheckTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/Spellcheck/SpellcheckTests.vb @@ -7,8 +7,8 @@ Imports Microsoft.CodeAnalysis.CodeActions Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions -Imports Microsoft.CodeAnalysis.VisualBasic.Diagnostics Imports Microsoft.CodeAnalysis.VisualBasic.SpellCheck +Imports Microsoft.CodeAnalysis.VisualBasic.Diagnostics Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.Spellcheck Public Class SpellCheckTests diff --git a/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/VisualBasicEditAndContinueTestHelpers.vb b/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/VisualBasicEditAndContinueTestHelpers.vb index 4d99eb8e86a48..648d8e1319522 100644 --- a/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/VisualBasicEditAndContinueTestHelpers.vb +++ b/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/VisualBasicEditAndContinueTestHelpers.vb @@ -3,12 +3,12 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports Microsoft.CodeAnalysis.Differencing +Imports Microsoft.CodeAnalysis.VisualBasic.EditAndContinue +Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.EditAndContinue Imports Microsoft.CodeAnalysis.EditAndContinue.UnitTests Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.EditAndContinue -Imports Microsoft.CodeAnalysis.VisualBasic.Symbols +Imports Microsoft.CodeAnalysis.Differencing Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.EditAndContinue diff --git a/src/EditorFeatures/VisualBasicTest/Extensions/StatementSyntaxExtensionTests.vb b/src/EditorFeatures/VisualBasicTest/Extensions/StatementSyntaxExtensionTests.vb index d551d36f40a73..f708962fced45 100644 --- a/src/EditorFeatures/VisualBasicTest/Extensions/StatementSyntaxExtensionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Extensions/StatementSyntaxExtensionTests.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Threading +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.Extensions Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.ContextQuery -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Threading Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Extensions Public Class StatementSyntaxExtensionTests diff --git a/src/EditorFeatures/VisualBasicTest/IntroduceUsingStatement/IntroduceUsingStatementTests.vb b/src/EditorFeatures/VisualBasicTest/IntroduceUsingStatement/IntroduceUsingStatementTests.vb index 1a035900381d3..cc3e59bc32017 100644 --- a/src/EditorFeatures/VisualBasicTest/IntroduceUsingStatement/IntroduceUsingStatementTests.vb +++ b/src/EditorFeatures/VisualBasicTest/IntroduceUsingStatement/IntroduceUsingStatementTests.vb @@ -3,8 +3,8 @@ ' See the LICENSE file in the project root for more information. Imports Microsoft.CodeAnalysis.CodeRefactorings -Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings Imports Microsoft.CodeAnalysis.VisualBasic.IntroduceUsingStatement +Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.IntroduceUsingStatement diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Binders/WithTypeArgumentsBinder.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Binders/WithTypeArgumentsBinder.cs index d540791c46a8f..b81bf38e5353d 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Binders/WithTypeArgumentsBinder.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Binders/WithTypeArgumentsBinder.cs @@ -4,12 +4,12 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Roslyn.Utilities; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; using System.Threading; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpFrameDecoder.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpFrameDecoder.cs index facdafc3241d2..1a5d85860f086 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpFrameDecoder.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpFrameDecoder.cs @@ -4,9 +4,9 @@ using System; using System.Diagnostics; +using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; -using Microsoft.CodeAnalysis.ExpressionEvaluator; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpLanguageInstructionDecoder.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpLanguageInstructionDecoder.cs index fd725ab360b54..e6642ecd7a9f6 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpLanguageInstructionDecoder.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpLanguageInstructionDecoder.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using System; +using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; -using Microsoft.CodeAnalysis.ExpressionEvaluator; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CompilationContext.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CompilationContext.cs index 93ade15965527..d3dab807d90fe 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CompilationContext.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CompilationContext.cs @@ -2,13 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Threading; using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; @@ -20,6 +13,13 @@ using Microsoft.VisualStudio.Debugger.Clr; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using Roslyn.Utilities; +using System; +using System.Collections.Generic; +using System.Collections.Immutable; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using System.Threading; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/EEAssemblyBuilder.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/EEAssemblyBuilder.cs index fce99f09822bd..d7fe8de53c29e 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/EEAssemblyBuilder.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/EEAssemblyBuilder.cs @@ -2,10 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.Collections.Immutable; -using System.Diagnostics; -using System.Reflection.Metadata; using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.CSharp.Symbols; @@ -15,6 +11,10 @@ using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Symbols; using Roslyn.Utilities; +using System; +using System.Collections.Immutable; +using System.Diagnostics; +using System.Reflection.Metadata; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/CapturedVariableRewriter.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/CapturedVariableRewriter.cs index 5cfb54e768d12..137fb1b98f63c 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/CapturedVariableRewriter.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/CapturedVariableRewriter.cs @@ -4,12 +4,12 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols; +using Roslyn.Utilities; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Symbols; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/LocalDeclarationRewriter.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/LocalDeclarationRewriter.cs index 831eba27acefe..eac363440360d 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/LocalDeclarationRewriter.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/LocalDeclarationRewriter.cs @@ -4,12 +4,12 @@ #nullable disable -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.CodeAnalysis.PooledObjects; +using System.Collections.Generic; +using System.Collections.Immutable; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/PlaceholderLocalRewriter.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/PlaceholderLocalRewriter.cs index 0a8275fa6912a..1eae863ab14fb 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/PlaceholderLocalRewriter.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Rewriters/PlaceholderLocalRewriter.cs @@ -4,9 +4,9 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols; using System.Collections.Generic; using System.Diagnostics; -using Microsoft.CodeAnalysis.CSharp.Symbols; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassInstance.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassInstance.cs index 680bd30c944b9..55d2dd1783de4 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassInstance.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassInstance.cs @@ -4,9 +4,9 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols; using System; using System.Diagnostics; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassVariable.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassVariable.cs index 55aae23a9ba55..ac9473880375d 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassVariable.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/DisplayClassVariable.cs @@ -4,11 +4,11 @@ #nullable disable -using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +using System.Collections.Immutable; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/EEDisplayClassFieldLocalSymbol.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/EEDisplayClassFieldLocalSymbol.cs index 407e3782f9912..b83a057c4bc1d 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/EEDisplayClassFieldLocalSymbol.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/EEDisplayClassFieldLocalSymbol.cs @@ -4,9 +4,9 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Symbols; using System.Collections.Immutable; using System.Diagnostics; -using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ObjectIdLocalSymbol.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ObjectIdLocalSymbol.cs index c89c2345e09d8..8e6c6d346ac2a 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ObjectIdLocalSymbol.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ObjectIdLocalSymbol.cs @@ -4,10 +4,10 @@ #nullable disable -using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.ExpressionEvaluator; +using System.Collections.Immutable; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ReturnValueLocalSymbol.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ReturnValueLocalSymbol.cs index a86d3216eba61..9114143677872 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ReturnValueLocalSymbol.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/ReturnValueLocalSymbol.cs @@ -4,9 +4,9 @@ #nullable disable -using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.ExpressionEvaluator; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.cs index 16d259d843a53..de45ef9551757 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.cs @@ -4,10 +4,10 @@ #nullable disable -using System; -using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.Symbols; using Roslyn.Utilities; +using System; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/SyntaxHelpers.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/SyntaxHelpers.cs index fa71fda52d7f3..c67ee1d1d5839 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/SyntaxHelpers.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/SyntaxHelpers.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis.Text; using System.Collections.ObjectModel; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Linq; -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis.Text; using InternalSyntax = Microsoft.CodeAnalysis.CSharp.Syntax.InternalSyntax; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/AccessibilityTests.cs b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/AccessibilityTests.cs index 264a3e311c656..126c3bfeeff1a 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/AccessibilityTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/AccessibilityTests.cs @@ -4,15 +4,15 @@ #nullable disable -using System; using Microsoft.CodeAnalysis.CodeGen; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.ExpressionEvaluator; -using Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; -using Roslyn.Test.Utilities; +using System; using Xunit; +using Roslyn.Test.Utilities; +using Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.UnitTests { diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/ExpressionCompilerTests.cs b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/ExpressionCompilerTests.cs index bea1828c90eb3..4276cb3848c78 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/ExpressionCompilerTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/ExpressionCompilerTests.cs @@ -22,9 +22,9 @@ using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using Roslyn.Test.PdbUtilities; +using static Roslyn.Test.Utilities.SigningTestHelpers; using Roslyn.Test.Utilities; using Xunit; -using static Roslyn.Test.Utilities.SigningTestHelpers; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.UnitTests { diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/InstructionDecoderTests.cs b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/InstructionDecoderTests.cs index 5fa1c84a3d334..643aac2ec98bd 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/InstructionDecoderTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/InstructionDecoderTests.cs @@ -10,8 +10,8 @@ using System.Reflection.Metadata.Ecma335; using Microsoft.CodeAnalysis.CSharp.Symbols; using Microsoft.CodeAnalysis.CSharp.Symbols.Metadata.PE; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.ExpressionEvaluator; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.VisualStudio.Debugger.Evaluation; using Roslyn.Test.Utilities; diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/AccessibilityTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/AccessibilityTests.cs index 911f69f4e833b..4b69096e9e784 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/AccessibilityTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/AccessibilityTests.cs @@ -4,7 +4,6 @@ #nullable disable -using System; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.CodeAnalysis.Test.Utilities; @@ -12,6 +11,7 @@ using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using Roslyn.Test.Utilities; +using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTestBase.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTestBase.cs index af13766b4a7ca..a7a748440564e 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTestBase.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTestBase.cs @@ -7,8 +7,8 @@ using System; using System.Collections.Immutable; using System.Reflection; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.ExpressionEvaluator; +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.VisualStudio.Debugger.ComponentInterfaces; using Microsoft.VisualStudio.Debugger.Evaluation; diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DebuggerTypeProxyAttributeTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DebuggerTypeProxyAttributeTests.cs index 7ad17bd675dc2..12b3f07b5713e 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DebuggerTypeProxyAttributeTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DebuggerTypeProxyAttributeTests.cs @@ -4,11 +4,11 @@ #nullable disable -using System; -using System.Linq; using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; +using System; +using System.Linq; using Roslyn.Test.Utilities; using Xunit; diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DynamicViewTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DynamicViewTests.cs index e52b5c90d26a8..af01b1d78c3a7 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DynamicViewTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/DynamicViewTests.cs @@ -11,8 +11,8 @@ using Microsoft.VisualStudio.Debugger.Clr; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; -using Roslyn.Test.Utilities; using Xunit; +using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.UnitTests { diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FullNameTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FullNameTests.cs index 801be1e758756..79d4af226b5d8 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FullNameTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FullNameTests.cs @@ -9,8 +9,8 @@ using System.Linq; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.ExpressionEvaluator; -using Microsoft.VisualStudio.Debugger.Clr; using Microsoft.VisualStudio.Debugger.ComponentInterfaces; +using Microsoft.VisualStudio.Debugger.Clr; using Microsoft.VisualStudio.Debugger.Evaluation; using Roslyn.Test.Utilities; using Xunit; diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FunctionPointerTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FunctionPointerTests.cs index f0112689c4eba..3ea3c36009af4 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FunctionPointerTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FunctionPointerTests.cs @@ -4,13 +4,13 @@ #nullable disable -using System; -using System.Diagnostics; using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.VisualStudio.Debugger.Clr; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using Microsoft.VisualStudio.Debugger.Metadata; +using System; +using System.Diagnostics; using Xunit; using Type = Microsoft.VisualStudio.Debugger.Metadata.Type; diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/ObjectIdTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/ObjectIdTests.cs index cd965ca4f6c45..d807d8f45a3e8 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/ObjectIdTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/ObjectIdTests.cs @@ -4,11 +4,11 @@ #nullable disable -using System; using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.VisualStudio.Debugger.Clr; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; +using System; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TupleTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TupleTests.cs index 0435132b9c849..aef5039d02181 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TupleTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TupleTests.cs @@ -4,9 +4,6 @@ #nullable disable -using System; -using System.Collections.Immutable; -using System.Collections.ObjectModel; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.CodeAnalysis.Test.Utilities; @@ -14,6 +11,9 @@ using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using Roslyn.Test.Utilities; +using System; +using System.Collections.Immutable; +using System.Collections.ObjectModel; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TypeVariablesExpansionTests.cs b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TypeVariablesExpansionTests.cs index d35aa436a99b7..aa5f792454780 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TypeVariablesExpansionTests.cs +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/TypeVariablesExpansionTests.cs @@ -4,10 +4,10 @@ #nullable disable -using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.ExpressionEvaluator; using Microsoft.VisualStudio.Debugger.Evaluation; +using System.Collections.Immutable; using Xunit; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/AssemblyReference.cs b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/AssemblyReference.cs index fb1acef72006a..e71161d7191c7 100644 --- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/AssemblyReference.cs +++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/AssemblyReference.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.Collections.Generic; using Microsoft.Cci; using Microsoft.CodeAnalysis.Emit; using Roslyn.Utilities; +using System; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/CustomTypeInfo.cs b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/CustomTypeInfo.cs index 1bb4c6afa0434..3b17f46f02499 100644 --- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/CustomTypeInfo.cs +++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/CustomTypeInfo.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using System; using System.Collections.ObjectModel; using System.Diagnostics; using System.Text; -using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/LocalAndMethod.cs b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/LocalAndMethod.cs index 96e18f76705bf..33fc314adcc1c 100644 --- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/LocalAndMethod.cs +++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/LocalAndMethod.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using System; using System.Collections.ObjectModel; -using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/PseudoVariableUtilities.cs b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/PseudoVariableUtilities.cs index 264923f3291ca..f4527d25bd048 100644 --- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/PseudoVariableUtilities.cs +++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/PseudoVariableUtilities.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.VisualStudio.Debugger.Clr; +using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; +using Roslyn.Utilities; using System; using System.Collections.ObjectModel; using System.Diagnostics; using System.Globalization; -using Microsoft.VisualStudio.Debugger.Clr; -using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/MemberSignatureParser.cs b/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/MemberSignatureParser.cs index 25755517127dc..a5645d2b961a1 100644 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/MemberSignatureParser.cs +++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/MemberSignatureParser.cs @@ -4,10 +4,10 @@ #nullable disable +using Microsoft.CodeAnalysis.ExpressionEvaluator; using System; using System.Collections.Immutable; using System.Diagnostics; -using Microsoft.CodeAnalysis.ExpressionEvaluator; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/Scanner.cs b/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/Scanner.cs index 78fe9af4e1f00..77295f3bc2bad 100644 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/Scanner.cs +++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/CSharp/Scanner.cs @@ -4,9 +4,9 @@ #nullable disable +using Roslyn.Utilities; using System; using System.Diagnostics; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/FunctionResolverBase.cs b/src/ExpressionEvaluator/Core/Source/FunctionResolver/FunctionResolverBase.cs index a372beaadbcb2..33f63123f98bd 100644 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/FunctionResolverBase.cs +++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/FunctionResolverBase.cs @@ -4,10 +4,10 @@ #nullable disable +using Microsoft.VisualStudio.Debugger.Evaluation; using System; using System.Collections.Generic; using System.Reflection.Metadata; -using Microsoft.VisualStudio.Debugger.Evaluation; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/MetadataResolver.cs b/src/ExpressionEvaluator/Core/Source/FunctionResolver/MetadataResolver.cs index 1cae1951f912b..130d03f523eec 100644 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/MetadataResolver.cs +++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/MetadataResolver.cs @@ -4,6 +4,7 @@ #nullable disable +using Roslyn.Utilities; using System; using System.Collections.Immutable; using System.Diagnostics; @@ -11,7 +12,6 @@ using System.Reflection; using System.Reflection.Metadata; using System.Reflection.Metadata.Ecma335; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/MemberSignatureParser.cs b/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/MemberSignatureParser.cs index 524b9dc6401ed..63535822dc1c0 100644 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/MemberSignatureParser.cs +++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/MemberSignatureParser.cs @@ -4,10 +4,10 @@ #nullable disable +using Microsoft.CodeAnalysis.ExpressionEvaluator; using System; using System.Collections.Immutable; using System.Diagnostics; -using Microsoft.CodeAnalysis.ExpressionEvaluator; namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/Scanner.cs b/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/Scanner.cs index de2acad941386..ada24a9cd73be 100644 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/Scanner.cs +++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/VisualBasic/Scanner.cs @@ -4,9 +4,9 @@ #nullable disable +using Roslyn.Utilities; using System; using System.Diagnostics; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/DebuggerTypeProxyExpansion.cs b/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/DebuggerTypeProxyExpansion.cs index cde4876ac387e..a93e485f8c5a1 100644 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/DebuggerTypeProxyExpansion.cs +++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/DebuggerTypeProxyExpansion.cs @@ -4,10 +4,10 @@ #nullable disable -using System.Collections.ObjectModel; -using System.Diagnostics; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; +using System.Collections.ObjectModel; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/NativeViewExpansion.cs b/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/NativeViewExpansion.cs index d8e21e3746fd3..01400b3a2ac05 100644 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/NativeViewExpansion.cs +++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/NativeViewExpansion.cs @@ -4,10 +4,10 @@ #nullable disable -using System; using Microsoft.VisualStudio.Debugger; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; +using System; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/TupleExpansion.cs b/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/TupleExpansion.cs index ee3195ea728de..e06c5febff354 100644 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/TupleExpansion.cs +++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/TupleExpansion.cs @@ -4,13 +4,13 @@ #nullable disable -using System; -using System.Collections.ObjectModel; -using System.Diagnostics; using Microsoft.VisualStudio.Debugger.Clr; using Microsoft.VisualStudio.Debugger.ComponentInterfaces; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; +using System; +using System.Collections.ObjectModel; +using System.Diagnostics; using FieldInfo = Microsoft.VisualStudio.Debugger.Metadata.FieldInfo; using Type = Microsoft.VisualStudio.Debugger.Metadata.Type; diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/CustomTypeInfoTypeArgumentMap.cs b/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/CustomTypeInfoTypeArgumentMap.cs index e9b152795bb88..d7577931736af 100644 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/CustomTypeInfoTypeArgumentMap.cs +++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/CustomTypeInfoTypeArgumentMap.cs @@ -4,10 +4,10 @@ #nullable disable +using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using System; using System.Collections.ObjectModel; using System.Diagnostics; -using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; using Type = Microsoft.VisualStudio.Debugger.Metadata.Type; namespace Microsoft.CodeAnalysis.ExpressionEvaluator diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/ValueHelpers.cs b/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/ValueHelpers.cs index 892dcb677d0af..83cf812b482db 100644 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/ValueHelpers.cs +++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/ValueHelpers.cs @@ -4,11 +4,11 @@ #nullable disable -using System.Diagnostics; -using System.Text; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; +using System.Diagnostics; +using System.Text; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestHelpers.cs b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestHelpers.cs index f6da8080cd5ec..4cb86e9d0299f 100644 --- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestHelpers.cs +++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestHelpers.cs @@ -5,6 +5,7 @@ #nullable disable extern alias PDB; + using System; using System.Collections.Generic; using System.Collections.Immutable; @@ -29,10 +30,10 @@ using Microsoft.Metadata.Tools; using Microsoft.VisualStudio.Debugger.Evaluation; using Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation; -using PDB::Roslyn.Test.PdbUtilities; -using PDB::Roslyn.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; +using PDB::Roslyn.Test.Utilities; +using PDB::Roslyn.Test.PdbUtilities; namespace Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests { diff --git a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/NamespaceTypeDefinitionNoBase.cs b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/NamespaceTypeDefinitionNoBase.cs index 69815529f637d..d602dcf4c985e 100644 --- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/NamespaceTypeDefinitionNoBase.cs +++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/NamespaceTypeDefinitionNoBase.cs @@ -4,11 +4,11 @@ #nullable disable +using Microsoft.Cci; +using Microsoft.CodeAnalysis.Emit; using System.Collections.Generic; using System.Reflection.Metadata; using System.Runtime.InteropServices; -using Microsoft.Cci; -using Microsoft.CodeAnalysis.Emit; namespace Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests { diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/CSharpFunctionResolverTests.cs b/src/ExpressionEvaluator/Core/Test/FunctionResolver/CSharpFunctionResolverTests.cs index b9499af616172..f3d40b5802997 100644 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/CSharpFunctionResolverTests.cs +++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/CSharpFunctionResolverTests.cs @@ -4,13 +4,13 @@ #nullable disable -using System; -using System.Collections.Immutable; using Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.VisualStudio.Debugger.Evaluation; using Roslyn.Test.Utilities; +using System; +using System.Collections.Immutable; using Xunit; namespace Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTestBase.cs b/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTestBase.cs index 0f8321f3741ba..0db6d71dbda36 100644 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTestBase.cs +++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTestBase.cs @@ -4,6 +4,8 @@ #nullable disable +using Microsoft.CodeAnalysis.CSharp.Test.Utilities; +using Roslyn.Test.Utilities; using System; using System.Collections.Immutable; using System.Diagnostics; @@ -11,8 +13,6 @@ using System.Reflection.Metadata; using System.Reflection.Metadata.Ecma335; using System.Text; -using Microsoft.CodeAnalysis.CSharp.Test.Utilities; -using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests { diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/ParsingTestBase.cs b/src/ExpressionEvaluator/Core/Test/FunctionResolver/ParsingTestBase.cs index ac805e36680f5..cbcafcf0ef785 100644 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/ParsingTestBase.cs +++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/ParsingTestBase.cs @@ -4,10 +4,10 @@ #nullable disable -using System.Collections.Immutable; -using System.Linq; using Microsoft.CodeAnalysis.CSharp.Test.Utilities; using Roslyn.Test.Utilities; +using System.Collections.Immutable; +using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicFunctionResolverTests.cs b/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicFunctionResolverTests.cs index 7e8d711eea94c..0f09469937596 100644 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicFunctionResolverTests.cs +++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicFunctionResolverTests.cs @@ -4,11 +4,11 @@ #nullable disable -using System; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator; using Microsoft.VisualStudio.Debugger.Evaluation; using Roslyn.Test.Utilities; +using System; using Xunit; namespace Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicParsingTests.cs b/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicParsingTests.cs index e6789339a83eb..c998701451341 100644 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicParsingTests.cs +++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/VisualBasicParsingTests.cs @@ -4,12 +4,12 @@ #nullable disable -using System; -using System.Collections.Immutable; -using System.Linq; using Microsoft.CodeAnalysis.VisualBasic; using Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator; using Roslyn.Test.Utilities; +using System; +using System.Collections.Immutable; +using System.Linq; using Xunit; namespace Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrModuleInstance.cs b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrModuleInstance.cs index f999c8466e92a..b6940815f033d 100644 --- a/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrModuleInstance.cs +++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrModuleInstance.cs @@ -9,14 +9,14 @@ #endregion +using Microsoft.CodeAnalysis.ExpressionEvaluator; +using Microsoft.VisualStudio.Debugger.Symbols; using System; using System.Collections.ObjectModel; using System.Diagnostics; using System.Linq; using System.Reflection; using System.Threading; -using Microsoft.CodeAnalysis.ExpressionEvaluator; -using Microsoft.VisualStudio.Debugger.Symbols; namespace Microsoft.VisualStudio.Debugger.Clr { diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/ReflectionUtilities.cs b/src/ExpressionEvaluator/Core/Test/ResultProvider/ReflectionUtilities.cs index 8f1fb4cbe27e1..37b9599074121 100644 --- a/src/ExpressionEvaluator/Core/Test/ResultProvider/ReflectionUtilities.cs +++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/ReflectionUtilities.cs @@ -4,11 +4,11 @@ #nullable disable +using Microsoft.VisualStudio.Debugger.Clr; using System; using System.Collections.Immutable; using System.Linq; using System.Reflection; -using Microsoft.VisualStudio.Debugger.Clr; namespace Microsoft.CodeAnalysis.ExpressionEvaluator { diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestBase.cs b/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestBase.cs index 49c15aa8362b6..634ef933a7c6d 100644 --- a/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestBase.cs +++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestBase.cs @@ -5,8 +5,8 @@ #nullable disable using System; -using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Collections.Generic; using System.Linq; using System.Runtime.ExceptionServices; using Microsoft.CodeAnalysis.Collections; diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/EEAssemblyBuilder.vb b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/EEAssemblyBuilder.vb index 09b33137f7a0f..dc8dfea4640be 100644 --- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/EEAssemblyBuilder.vb +++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/EEAssemblyBuilder.vb @@ -2,10 +2,6 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Collections.Immutable -Imports System.Diagnostics -Imports System.Reflection.Metadata -Imports System.Runtime.InteropServices Imports Microsoft.Cci Imports Microsoft.CodeAnalysis.CodeGen Imports Microsoft.CodeAnalysis.Emit @@ -15,6 +11,10 @@ Imports Microsoft.CodeAnalysis.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Emit Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports System.Collections.Immutable +Imports System.Diagnostics +Imports System.Reflection.Metadata +Imports System.Runtime.InteropServices Imports Roslyn.Utilities Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicEESymbolProvider.vb b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicEESymbolProvider.vb index 1a36ab9ed5db1..ad61fb053d091 100644 --- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicEESymbolProvider.vb +++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicEESymbolProvider.vb @@ -5,10 +5,10 @@ Imports System Imports System.Collections.Immutable Imports System.Reflection.Metadata -Imports Microsoft.CodeAnalysis.ExpressionEvaluator -Imports Microsoft.CodeAnalysis.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE +Imports Microsoft.CodeAnalysis.ExpressionEvaluator +Imports Microsoft.CodeAnalysis.Symbols Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicInstructionDecoder.vb b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicInstructionDecoder.vb index 52c3ed187b2b6..137dcd41d6a1a 100644 --- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicInstructionDecoder.vb +++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/VisualBasicInstructionDecoder.vb @@ -5,12 +5,12 @@ Imports System.Collections.Immutable Imports System.Reflection.Metadata Imports System.Reflection.Metadata.Ecma335 -Imports System.Text Imports Microsoft.CodeAnalysis.ExpressionEvaluator Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Symbols.Metadata.PE Imports Microsoft.VisualStudio.Debugger Imports Microsoft.VisualStudio.Debugger.Clr +Imports System.Text Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/LocalsTests.vb b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/LocalsTests.vb index a94ed46c0670a..5324abefe0c83 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/LocalsTests.vb +++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/LocalsTests.vb @@ -7,9 +7,9 @@ Imports Microsoft.CodeAnalysis.CodeGen Imports Microsoft.CodeAnalysis.ExpressionEvaluator Imports Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests Imports Microsoft.CodeAnalysis.PooledObjects -Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests +Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.VisualStudio.Debugger.Evaluation Imports Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation Imports Roslyn.Test.Utilities diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/ResultPropertiesTests.vb b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/ResultPropertiesTests.vb index dcc71728de381..e9bbe29077ed7 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/ResultPropertiesTests.vb +++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/ResultPropertiesTests.vb @@ -6,9 +6,9 @@ Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis.CodeGen Imports Microsoft.CodeAnalysis.ExpressionEvaluator Imports Microsoft.CodeAnalysis.ExpressionEvaluator.UnitTests -Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Microsoft.VisualStudio.Debugger.Evaluation Imports Microsoft.VisualStudio.Debugger.Evaluation.ClrCompilation +Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Roslyn.Test.PdbUtilities Imports Roslyn.Test.Utilities Imports Xunit diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/ResultsViewTests.vb b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/ResultsViewTests.vb index 87c4f4f7e2115..bd826b6e7d8fb 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/ResultsViewTests.vb +++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/ResultsViewTests.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Reflection Imports Microsoft.CodeAnalysis.ExpressionEvaluator Imports Microsoft.VisualStudio.Debugger.Clr Imports Microsoft.VisualStudio.Debugger.Evaluation +Imports System.Reflection Imports Roslyn.Test.Utilities Imports Xunit diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TupleTests.vb b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TupleTests.vb index 54a75a5802c38..4030e47c2e289 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TupleTests.vb +++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TupleTests.vb @@ -2,7 +2,6 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis.CSharp Imports Microsoft.CodeAnalysis.ExpressionEvaluator Imports Microsoft.CodeAnalysis.Test.Utilities @@ -10,6 +9,7 @@ Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Microsoft.VisualStudio.Debugger.Clr Imports Microsoft.VisualStudio.Debugger.Evaluation Imports Roslyn.Test.Utilities +Imports System.Collections.Immutable Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.UnitTests diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TypeVariablesExpansionTests.vb b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TypeVariablesExpansionTests.vb index 82a66029c8fe4..370e60fd32502 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TypeVariablesExpansionTests.vb +++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/TypeVariablesExpansionTests.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis.ExpressionEvaluator Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests Imports Microsoft.VisualStudio.Debugger.Evaluation +Imports System.Collections.Immutable Imports Xunit Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.UnitTests diff --git a/src/Features/CSharp/Portable/CodeFixes/HideBase/HideBaseCodeFixProvider.AddNewKeywordAction.cs b/src/Features/CSharp/Portable/CodeFixes/HideBase/HideBaseCodeFixProvider.AddNewKeywordAction.cs index 980e72dd18eb7..b7e5b04f8a007 100644 --- a/src/Features/CSharp/Portable/CodeFixes/HideBase/HideBaseCodeFixProvider.AddNewKeywordAction.cs +++ b/src/Features/CSharp/Portable/CodeFixes/HideBase/HideBaseCodeFixProvider.AddNewKeywordAction.cs @@ -5,13 +5,13 @@ #nullable disable using System.Linq; -using System.Threading; using System.Threading.Tasks; +using System.Threading; using Microsoft.CodeAnalysis.CSharp.CodeStyle; -using Microsoft.CodeAnalysis.CSharp.LanguageServices; using Microsoft.CodeAnalysis.CSharp.OrderModifiers; using Microsoft.CodeAnalysis.OrderModifiers; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.CSharp.LanguageServices; namespace Microsoft.CodeAnalysis.CSharp.CodeFixes.HideBase { diff --git a/src/Features/CSharp/Portable/Completion/KeywordRecommenders/RefKeywordRecommender.cs b/src/Features/CSharp/Portable/Completion/KeywordRecommenders/RefKeywordRecommender.cs index 5691416eecb4f..09d24f5ede379 100644 --- a/src/Features/CSharp/Portable/Completion/KeywordRecommenders/RefKeywordRecommender.cs +++ b/src/Features/CSharp/Portable/Completion/KeywordRecommenders/RefKeywordRecommender.cs @@ -4,9 +4,9 @@ #nullable disable -using System.Collections.Generic; using System.Threading; using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery; +using System.Collections.Generic; using Microsoft.CodeAnalysis.CSharp.Utilities; using Microsoft.CodeAnalysis.Shared.Extensions; diff --git a/src/Features/CSharp/Portable/Completion/KeywordRecommenders/StringKeywordRecommender.cs b/src/Features/CSharp/Portable/Completion/KeywordRecommenders/StringKeywordRecommender.cs index 27c3b061fe716..c1224ccde8710 100644 --- a/src/Features/CSharp/Portable/Completion/KeywordRecommenders/StringKeywordRecommender.cs +++ b/src/Features/CSharp/Portable/Completion/KeywordRecommenders/StringKeywordRecommender.cs @@ -5,9 +5,9 @@ #nullable disable using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Extensions; using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery; -using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Utilities; using Microsoft.CodeAnalysis.Shared.Extensions; diff --git a/src/Features/CSharp/Portable/Debugging/BreakpointResolver.cs b/src/Features/CSharp/Portable/Debugging/BreakpointResolver.cs index c9ec9885ab5e0..915669299135c 100644 --- a/src/Features/CSharp/Portable/Debugging/BreakpointResolver.cs +++ b/src/Features/CSharp/Portable/Debugging/BreakpointResolver.cs @@ -11,8 +11,8 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Extensions; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Debugging; using Microsoft.CodeAnalysis.Shared.Extensions; +using Microsoft.CodeAnalysis.Debugging; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.CSharp.Debugging diff --git a/src/Features/CSharp/Portable/ExternalAccess/Pythia/PythiaSignatureHelpProvider.cs b/src/Features/CSharp/Portable/ExternalAccess/Pythia/PythiaSignatureHelpProvider.cs index 38b5a12fa8202..df31038cc9e84 100644 --- a/src/Features/CSharp/Portable/ExternalAccess/Pythia/PythiaSignatureHelpProvider.cs +++ b/src/Features/CSharp/Portable/ExternalAccess/Pythia/PythiaSignatureHelpProvider.cs @@ -2,16 +2,16 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using System.Collections.Immutable; using System.Composition; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.CSharp.SignatureHelp; using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.SignatureHelp; using Microsoft.CodeAnalysis.ExternalAccess.Pythia.Api; +using System; using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.CodeAnalysis.SignatureHelp; namespace Microsoft.CodeAnalysis.ExternalAccess.Pythia { diff --git a/src/Features/CSharp/Portable/InitializeParameter/CSharpAddParameterCheckCodeRefactoringProvider.cs b/src/Features/CSharp/Portable/InitializeParameter/CSharpAddParameterCheckCodeRefactoringProvider.cs index c5621c35c33ce..e11ffcac31b0b 100644 --- a/src/Features/CSharp/Portable/InitializeParameter/CSharpAddParameterCheckCodeRefactoringProvider.cs +++ b/src/Features/CSharp/Portable/InitializeParameter/CSharpAddParameterCheckCodeRefactoringProvider.cs @@ -8,10 +8,10 @@ using System.Composition; using System.Diagnostics.CodeAnalysis; using Microsoft.CodeAnalysis.CodeRefactorings; +using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.CSharp.CodeStyle; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Editing; -using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.InitializeParameter; using Microsoft.CodeAnalysis.Options; using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory; diff --git a/src/Features/CSharp/Portable/InternalUtilities/InternalExtensions.cs b/src/Features/CSharp/Portable/InternalUtilities/InternalExtensions.cs index 3e762f3661ec1..16b125fb8edd9 100644 --- a/src/Features/CSharp/Portable/InternalUtilities/InternalExtensions.cs +++ b/src/Features/CSharp/Portable/InternalUtilities/InternalExtensions.cs @@ -4,10 +4,10 @@ #nullable disable -using System; -using System.Threading; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Shared.Extensions; +using System; +using System.Threading; namespace Microsoft.CodeAnalysis.CSharp { diff --git a/src/Features/CSharp/Portable/SignatureHelp/SignatureHelpUtilities.cs b/src/Features/CSharp/Portable/SignatureHelp/SignatureHelpUtilities.cs index 5773f051e3fff..46e4c738a3187 100644 --- a/src/Features/CSharp/Portable/SignatureHelp/SignatureHelpUtilities.cs +++ b/src/Features/CSharp/Portable/SignatureHelp/SignatureHelpUtilities.cs @@ -7,9 +7,9 @@ using System.Linq; using Microsoft.CodeAnalysis.CSharp.Extensions; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.SignatureHelp; using Microsoft.CodeAnalysis.Text; +using Microsoft.CodeAnalysis.Shared.Extensions; namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp { diff --git a/src/Features/CSharp/Portable/UsePatternCombinators/CSharpUsePatternCombinatorsCodeFixProvider.cs b/src/Features/CSharp/Portable/UsePatternCombinators/CSharpUsePatternCombinatorsCodeFixProvider.cs index 20716531c90df..987149659bbe3 100644 --- a/src/Features/CSharp/Portable/UsePatternCombinators/CSharpUsePatternCombinatorsCodeFixProvider.cs +++ b/src/Features/CSharp/Portable/UsePatternCombinators/CSharpUsePatternCombinatorsCodeFixProvider.cs @@ -24,8 +24,8 @@ namespace Microsoft.CodeAnalysis.CSharp.UsePatternCombinators { - using static AnalyzedPattern; using static SyntaxFactory; + using static AnalyzedPattern; [ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.UsePatternCombinators), Shared] internal class CSharpUsePatternCombinatorsCodeFixProvider : SyntaxEditorBasedCodeFixProvider diff --git a/src/Features/Core/Portable/CodeCleanup/DiagnosticSet.cs b/src/Features/Core/Portable/CodeCleanup/DiagnosticSet.cs index 29fd7b4dbd97e..79843492db80d 100644 --- a/src/Features/Core/Portable/CodeCleanup/DiagnosticSet.cs +++ b/src/Features/Core/Portable/CodeCleanup/DiagnosticSet.cs @@ -21,4 +21,4 @@ public DiagnosticSet(string description, params string[] diagnosticIds) DiagnosticIds = ImmutableArray.Create(diagnosticIds); } } -} +} \ No newline at end of file diff --git a/src/Features/Core/Portable/Completion/Providers/Scripting/AbstractDirectivePathCompletionProvider.cs b/src/Features/Core/Portable/Completion/Providers/Scripting/AbstractDirectivePathCompletionProvider.cs index 901436dc922a3..9c443daa0e12f 100644 --- a/src/Features/Core/Portable/Completion/Providers/Scripting/AbstractDirectivePathCompletionProvider.cs +++ b/src/Features/Core/Portable/Completion/Providers/Scripting/AbstractDirectivePathCompletionProvider.cs @@ -4,17 +4,17 @@ using System; using System.Collections.Immutable; -using System.Diagnostics; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Completion; -using Microsoft.CodeAnalysis.ErrorReporting; using Microsoft.CodeAnalysis.Options; +using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.Scripting; +using Roslyn.Utilities; +using Microsoft.CodeAnalysis.ErrorReporting; +using System.Diagnostics; using Microsoft.CodeAnalysis.Scripting.Hosting; using Microsoft.CodeAnalysis.Shared.Extensions; -using Microsoft.CodeAnalysis.Text; -using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Completion.Providers { diff --git a/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerLanguageService.cs b/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerLanguageService.cs index ce1d4e2d30037..9cd7494600492 100644 --- a/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerLanguageService.cs +++ b/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerLanguageService.cs @@ -4,9 +4,9 @@ using System; using System.Composition; -using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api; using Microsoft.CodeAnalysis.Host; using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api; namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript { diff --git a/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerService.cs b/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerService.cs index 5ef825303488c..48a9d4d5008d3 100644 --- a/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerService.cs +++ b/src/Features/Core/Portable/ExternalAccess/VSTypeScript/VSTypeScriptDiagnosticAnalyzerService.cs @@ -3,11 +3,11 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; using System.Composition; -using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api; using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api; +using System.Collections.Generic; +using Microsoft.CodeAnalysis.Diagnostics; namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript { diff --git a/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs b/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs index b05633d3cf97f..d3187efe61d82 100644 --- a/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs +++ b/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Features/Core/Portable/ReplaceMethodWithProperty/AbstractReplaceMethodWithPropertyService.cs b/src/Features/Core/Portable/ReplaceMethodWithProperty/AbstractReplaceMethodWithPropertyService.cs index 4d143a100de8c..91ea835f19368 100644 --- a/src/Features/Core/Portable/ReplaceMethodWithProperty/AbstractReplaceMethodWithPropertyService.cs +++ b/src/Features/Core/Portable/ReplaceMethodWithProperty/AbstractReplaceMethodWithPropertyService.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using System.Collections.Generic; using Microsoft.CodeAnalysis.CodeRefactorings; using Microsoft.CodeAnalysis.LanguageServices; diff --git a/src/Features/Core/Portable/ValueTracking/ValueTrackedItem.cs b/src/Features/Core/Portable/ValueTracking/ValueTrackedItem.cs index 786885aab25b0..5d4654fd52358 100644 --- a/src/Features/Core/Portable/ValueTracking/ValueTrackedItem.cs +++ b/src/Features/Core/Portable/ValueTracking/ValueTrackedItem.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Collections.Immutable; using System.Linq; +using System.Collections.Immutable; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Classification; diff --git a/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs b/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs index 6489a8023e4c7..a0bb3496df8ec 100644 --- a/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs +++ b/src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; +using System.Diagnostics; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.ErrorReporting; diff --git a/src/Features/VisualBasic/Portable/CodeFixes/IncorrectExitContinue/IncorrectExitContinueCodeFixProvider.ReplaceTokenKeywordCodeAction.vb b/src/Features/VisualBasic/Portable/CodeFixes/IncorrectExitContinue/IncorrectExitContinueCodeFixProvider.ReplaceTokenKeywordCodeAction.vb index 3481fd5ca2726..9fec4c378d81a 100644 --- a/src/Features/VisualBasic/Portable/CodeFixes/IncorrectExitContinue/IncorrectExitContinueCodeFixProvider.ReplaceTokenKeywordCodeAction.vb +++ b/src/Features/VisualBasic/Portable/CodeFixes/IncorrectExitContinue/IncorrectExitContinueCodeFixProvider.ReplaceTokenKeywordCodeAction.vb @@ -2,9 +2,9 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Threading Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.CodeActions +Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.CodeFixes.IncorrectExitContinue Partial Friend Class IncorrectExitContinueCodeFixProvider diff --git a/src/Features/VisualBasic/Portable/CodeRefactorings/VisualBasicRefactoringHelpersService.vb b/src/Features/VisualBasic/Portable/CodeRefactorings/VisualBasicRefactoringHelpersService.vb index eb4a0645007f3..d72eba291c950 100644 --- a/src/Features/VisualBasic/Portable/CodeRefactorings/VisualBasicRefactoringHelpersService.vb +++ b/src/Features/VisualBasic/Portable/CodeRefactorings/VisualBasicRefactoringHelpersService.vb @@ -4,9 +4,9 @@ Imports System.Composition Imports Microsoft.CodeAnalysis.CodeRefactorings +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.CodeAnalysis.LanguageServices -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings diff --git a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/KeywordCompletionProvider.vb b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/KeywordCompletionProvider.vb index a794c67c19a06..956551f202227 100644 --- a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/KeywordCompletionProvider.vb +++ b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/KeywordCompletionProvider.vb @@ -2,16 +2,16 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Collections.Immutable -Imports System.Composition Imports System.Threading -Imports Microsoft.CodeAnalysis.Completion +Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis.Completion.Providers -Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.CodeAnalysis.Options -Imports Microsoft.CodeAnalysis.Tags Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.ContextQuery +Imports Microsoft.CodeAnalysis.Completion +Imports System.Composition +Imports Microsoft.CodeAnalysis.Host.Mef +Imports Microsoft.CodeAnalysis.Tags Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers diff --git a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.vb b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.vb index 62531cd7ee106..5afcb1cb1455e 100644 --- a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.vb +++ b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/NamedParameterCompletionProvider.vb @@ -3,16 +3,16 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable -Imports System.Composition Imports System.Threading Imports Microsoft.CodeAnalysis.Completion Imports Microsoft.CodeAnalysis.Completion.Providers -Imports Microsoft.CodeAnalysis.ErrorReporting -Imports Microsoft.CodeAnalysis.Host.Mef -Imports Microsoft.CodeAnalysis.Options Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.ContextQuery Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Options +Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.ContextQuery +Imports Microsoft.CodeAnalysis.ErrorReporting +Imports System.Composition +Imports Microsoft.CodeAnalysis.Host.Mef Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers diff --git a/src/Features/VisualBasic/Portable/ConvertIfToSwitch/VisualBasicConvertIfToSwitchCodeRefactoringProvider.Rewriting.vb b/src/Features/VisualBasic/Portable/ConvertIfToSwitch/VisualBasicConvertIfToSwitchCodeRefactoringProvider.Rewriting.vb index 3594aec102ec6..26a4c2cc134be 100644 --- a/src/Features/VisualBasic/Portable/ConvertIfToSwitch/VisualBasicConvertIfToSwitchCodeRefactoringProvider.Rewriting.vb +++ b/src/Features/VisualBasic/Portable/ConvertIfToSwitch/VisualBasicConvertIfToSwitchCodeRefactoringProvider.Rewriting.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System.Collections.Immutable +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.Operations Imports Microsoft.CodeAnalysis.VisualBasic.CodeGeneration -Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Namespace Microsoft.CodeAnalysis.VisualBasic.ConvertIfToSwitch Partial Friend NotInheritable Class VisualBasicConvertIfToSwitchCodeRefactoringProvider diff --git a/src/Features/VisualBasic/Portable/Debugging/BreakpointResolver.vb b/src/Features/VisualBasic/Portable/Debugging/BreakpointResolver.vb index efd51e4abecff..a4563ab669c04 100644 --- a/src/Features/VisualBasic/Portable/Debugging/BreakpointResolver.vb +++ b/src/Features/VisualBasic/Portable/Debugging/BreakpointResolver.vb @@ -4,8 +4,8 @@ Imports System.Threading Imports Microsoft.CodeAnalysis -Imports Microsoft.CodeAnalysis.Debugging Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Debugging Namespace Microsoft.CodeAnalysis.VisualBasic.Debugging diff --git a/src/Features/VisualBasic/Portable/EditAndContinue/BreakpointSpans.vb b/src/Features/VisualBasic/Portable/EditAndContinue/BreakpointSpans.vb index db0303e168c5e..a8fb76ddbc6c0 100644 --- a/src/Features/VisualBasic/Portable/EditAndContinue/BreakpointSpans.vb +++ b/src/Features/VisualBasic/Portable/EditAndContinue/BreakpointSpans.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Runtime.InteropServices -Imports System.Threading -Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Text +Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue Friend Module BreakpointSpans diff --git a/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicMethodExtractor.VisualBasicCodeGenerator.vb b/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicMethodExtractor.VisualBasicCodeGenerator.vb index 575af60bc0a60..7a92589b69c61 100644 --- a/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicMethodExtractor.VisualBasicCodeGenerator.vb +++ b/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicMethodExtractor.VisualBasicCodeGenerator.vb @@ -2,16 +2,16 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Collections.Immutable Imports System.Threading Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.CodeGeneration Imports Microsoft.CodeAnalysis.Editing Imports Microsoft.CodeAnalysis.ExtractMethod Imports Microsoft.CodeAnalysis.Formatting -Imports Microsoft.CodeAnalysis.Simplification Imports Microsoft.CodeAnalysis.VisualBasic Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.Simplification +Imports System.Collections.Immutable Namespace Microsoft.CodeAnalysis.VisualBasic.ExtractMethod Partial Friend Class VisualBasicMethodExtractor diff --git a/src/Features/VisualBasic/Portable/GenerateMember/GenerateParameterizedMember/VisualBasicGenerateParameterizedMemberService.vb b/src/Features/VisualBasic/Portable/GenerateMember/GenerateParameterizedMember/VisualBasicGenerateParameterizedMemberService.vb index 6cfb9cd4416c5..279a1e3e2a737 100644 --- a/src/Features/VisualBasic/Portable/GenerateMember/GenerateParameterizedMember/VisualBasicGenerateParameterizedMemberService.vb +++ b/src/Features/VisualBasic/Portable/GenerateMember/GenerateParameterizedMember/VisualBasicGenerateParameterizedMemberService.vb @@ -2,16 +2,16 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Collections.Immutable Imports System.Threading Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.CodeGeneration -Imports Microsoft.CodeAnalysis.GenerateMember.GenerateParameterizedMember Imports Microsoft.CodeAnalysis.LanguageServices Imports Microsoft.CodeAnalysis.PooledObjects -Imports Microsoft.CodeAnalysis.Utilities Imports Microsoft.CodeAnalysis.VisualBasic.Symbols Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.GenerateMember.GenerateParameterizedMember +Imports Microsoft.CodeAnalysis.Utilities +Imports System.Collections.Immutable Namespace Microsoft.CodeAnalysis.VisualBasic.GenerateMember.GenerateMethod Partial Friend MustInherit Class VisualBasicGenerateParameterizedMemberService(Of TService As AbstractGenerateParameterizedMemberService(Of TService, SimpleNameSyntax, ExpressionSyntax, InvocationExpressionSyntax)) diff --git a/src/Features/VisualBasic/Portable/IntroduceVariable/VisualBasicIntroduceVariableService.vb b/src/Features/VisualBasic/Portable/IntroduceVariable/VisualBasicIntroduceVariableService.vb index 28a3cd368a134..1500f8128a0b6 100644 --- a/src/Features/VisualBasic/Portable/IntroduceVariable/VisualBasicIntroduceVariableService.vb +++ b/src/Features/VisualBasic/Portable/IntroduceVariable/VisualBasicIntroduceVariableService.vb @@ -2,13 +2,13 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Composition Imports System.Threading Imports Microsoft.CodeAnalysis -Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.CodeAnalysis.IntroduceVariable +Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.CodeAnalysis.Text Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports System.Composition Namespace Microsoft.CodeAnalysis.VisualBasic.IntroduceVariable diff --git a/src/Features/VisualBasic/Portable/ReplaceMethodWithProperty/VisualBasicReplaceMethodWithPropertyService.vb b/src/Features/VisualBasic/Portable/ReplaceMethodWithProperty/VisualBasicReplaceMethodWithPropertyService.vb index 03e6798d29a95..623bfd254d72c 100644 --- a/src/Features/VisualBasic/Portable/ReplaceMethodWithProperty/VisualBasicReplaceMethodWithPropertyService.vb +++ b/src/Features/VisualBasic/Portable/ReplaceMethodWithProperty/VisualBasicReplaceMethodWithPropertyService.vb @@ -9,8 +9,8 @@ Imports Microsoft.CodeAnalysis.Formatting Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.CodeAnalysis.Options Imports Microsoft.CodeAnalysis.ReplaceMethodWithProperty -Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.ReplaceMethodWithProperty diff --git a/src/Interactive/Host/Interactive/Core/InteractiveHost.LazyRemoteService.cs b/src/Interactive/Host/Interactive/Core/InteractiveHost.LazyRemoteService.cs index 3359bf966f8f9..6e3d51c9bf249 100644 --- a/src/Interactive/Host/Interactive/Core/InteractiveHost.LazyRemoteService.cs +++ b/src/Interactive/Host/Interactive/Core/InteractiveHost.LazyRemoteService.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. extern alias Scripting; + using System; using System.Collections.Immutable; using System.Diagnostics; @@ -14,8 +15,8 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis.ErrorReporting; using Roslyn.Utilities; -using Scripting::Microsoft.CodeAnalysis.Scripting.Hosting; using StreamJsonRpc; +using Scripting::Microsoft.CodeAnalysis.Scripting.Hosting; namespace Microsoft.CodeAnalysis.Interactive { diff --git a/src/Scripting/CSharpTest.Desktop/InteractiveSessionReferencesTests.cs b/src/Scripting/CSharpTest.Desktop/InteractiveSessionReferencesTests.cs index 947c34ec78e3c..af94d57047929 100644 --- a/src/Scripting/CSharpTest.Desktop/InteractiveSessionReferencesTests.cs +++ b/src/Scripting/CSharpTest.Desktop/InteractiveSessionReferencesTests.cs @@ -5,6 +5,7 @@ #nullable disable extern alias PortableTestUtils; + using System; using System.Collections.Generic; using System.Diagnostics; @@ -20,11 +21,11 @@ using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; using Xunit; -using static Microsoft.CodeAnalysis.Scripting.TestCompilationFactory; -using static Roslyn.Test.Utilities.TestMetadata; using AssertEx = PortableTestUtils::Roslyn.Test.Utilities.AssertEx; using TestBase = PortableTestUtils::Roslyn.Test.Utilities.TestBase; using WorkItemAttribute = PortableTestUtils::Roslyn.Test.Utilities.WorkItemAttribute; +using static Microsoft.CodeAnalysis.Scripting.TestCompilationFactory; +using static Roslyn.Test.Utilities.TestMetadata; namespace Microsoft.CodeAnalysis.CSharp.Scripting.Test { diff --git a/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatter.cs b/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatter.cs index 906307e40a5ed..16a56641938e2 100644 --- a/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatter.cs +++ b/src/Scripting/Core/Hosting/ObjectFormatter/CommonTypeNameFormatter.cs @@ -8,9 +8,9 @@ using System.Globalization; using System.Reflection; using System.Text; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Collections; -using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.CodeAnalysis.Scripting.Hosting { diff --git a/src/Scripting/Core/Script.cs b/src/Scripting/Core/Script.cs index 268b55348af58..98b3f5be4bee6 100644 --- a/src/Scripting/Core/Script.cs +++ b/src/Scripting/Core/Script.cs @@ -10,17 +10,17 @@ using System.Collections.Immutable; using System.Diagnostics; using System.Globalization; -using System.IO; using System.Linq; -using System.Reflection; -using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis; +using System.Reflection; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; +using Roslyn.Utilities; using Microsoft.CodeAnalysis.Scripting.Hosting; +using System.Runtime.CompilerServices; using Microsoft.CodeAnalysis.Text; -using Roslyn.Utilities; +using System.IO; namespace Microsoft.CodeAnalysis.Scripting { diff --git a/src/Scripting/Core/ScriptState.cs b/src/Scripting/Core/ScriptState.cs index a6d1b0277d226..39dd690f97052 100644 --- a/src/Scripting/Core/ScriptState.cs +++ b/src/Scripting/Core/ScriptState.cs @@ -5,12 +5,12 @@ #nullable disable using System; -using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Reflection; using System.Threading; using System.Threading.Tasks; +using System.Reflection; +using System.Collections.Generic; using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.CodeAnalysis.Scripting diff --git a/src/Scripting/CoreTest.Desktop/GlobalAssemblyCacheTests.cs b/src/Scripting/CoreTest.Desktop/GlobalAssemblyCacheTests.cs index 6dbe5ef1c92fb..eb62f635ebb37 100644 --- a/src/Scripting/CoreTest.Desktop/GlobalAssemblyCacheTests.cs +++ b/src/Scripting/CoreTest.Desktop/GlobalAssemblyCacheTests.cs @@ -5,12 +5,12 @@ #nullable disable using System; -using System.Collections.Immutable; using System.IO; using System.Linq; using System.Reflection; -using Roslyn.Test.Utilities; using Xunit; +using System.Collections.Immutable; +using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Scripting/CoreTest.Desktop/MetadataShadowCopyProviderTests.cs b/src/Scripting/CoreTest.Desktop/MetadataShadowCopyProviderTests.cs index 311dd261e5dd3..a9dea8d201ae3 100644 --- a/src/Scripting/CoreTest.Desktop/MetadataShadowCopyProviderTests.cs +++ b/src/Scripting/CoreTest.Desktop/MetadataShadowCopyProviderTests.cs @@ -5,16 +5,17 @@ #nullable disable using System; -using System.Collections.Immutable; -using System.Globalization; -using System.IO; using System.Linq; -using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.Test.Utilities; +using System.IO; using Roslyn.Test.Utilities; -using Roslyn.Utilities; +using Microsoft.CodeAnalysis.Test.Utilities; using Xunit; +using Microsoft.CodeAnalysis; +using System.Collections.Immutable; +using Roslyn.Utilities; +using System.Runtime.InteropServices; +using System.Globalization; + using static Roslyn.Utilities.PlatformInformation; namespace Microsoft.CodeAnalysis.Scripting.Hosting.UnitTests diff --git a/src/Scripting/CoreTest/RuntimeMetadataReferenceResolverTests.cs b/src/Scripting/CoreTest/RuntimeMetadataReferenceResolverTests.cs index 803ddaa9bea64..d56d4b7c12708 100644 --- a/src/Scripting/CoreTest/RuntimeMetadataReferenceResolverTests.cs +++ b/src/Scripting/CoreTest/RuntimeMetadataReferenceResolverTests.cs @@ -5,10 +5,11 @@ #nullable disable extern alias Scripting; -using System.Collections.Immutable; + using Microsoft.CodeAnalysis.Scripting.Hosting; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using System.Collections.Immutable; using Xunit; namespace Microsoft.CodeAnalysis.UnitTests.Interactive diff --git a/src/Scripting/CoreTestUtilities/ScriptingTestHelpers.cs b/src/Scripting/CoreTestUtilities/ScriptingTestHelpers.cs index df635ac778984..649d0240210f1 100644 --- a/src/Scripting/CoreTestUtilities/ScriptingTestHelpers.cs +++ b/src/Scripting/CoreTestUtilities/ScriptingTestHelpers.cs @@ -4,13 +4,13 @@ #nullable disable -using System; using System.Linq; -using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Test.Utilities; -using Roslyn.Test.Utilities; using Xunit; +using System; +using System.Threading.Tasks; +using Roslyn.Test.Utilities; namespace Microsoft.CodeAnalysis.Scripting.Test { diff --git a/src/Test/PdbUtilities/Reader/CustomDebugInfoUtilities.cs b/src/Test/PdbUtilities/Reader/CustomDebugInfoUtilities.cs index 18cbb3414c4c2..10e7ad6b4a2ba 100644 --- a/src/Test/PdbUtilities/Reader/CustomDebugInfoUtilities.cs +++ b/src/Test/PdbUtilities/Reader/CustomDebugInfoUtilities.cs @@ -5,11 +5,12 @@ #nullable disable extern alias DSR; + using System.Collections.Immutable; using System.Reflection.Metadata; using System.Reflection.Metadata.Ecma335; -using DSR::Microsoft.DiaSymReader; using Microsoft.CodeAnalysis.Debugging; +using DSR::Microsoft.DiaSymReader; namespace Roslyn.Test.PdbUtilities { diff --git a/src/Test/PdbUtilities/Reader/PdbTestUtilities.cs b/src/Test/PdbUtilities/Reader/PdbTestUtilities.cs index a7d477a28e6e3..0845b48e57a42 100644 --- a/src/Test/PdbUtilities/Reader/PdbTestUtilities.cs +++ b/src/Test/PdbUtilities/Reader/PdbTestUtilities.cs @@ -5,17 +5,18 @@ #nullable disable extern alias DSR; + using System; using System.Collections.Immutable; using System.IO; using System.Reflection.Metadata; using System.Runtime.InteropServices; -using DSR::Microsoft.DiaSymReader; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Collections; using Microsoft.CodeAnalysis.Debugging; using Microsoft.CodeAnalysis.Emit; using Microsoft.CodeAnalysis.Test.Utilities; +using DSR::Microsoft.DiaSymReader; using Roslyn.Test.PdbUtilities; namespace Roslyn.Test.Utilities diff --git a/src/Test/PdbUtilities/Shared/DummyMetadataImport.cs b/src/Test/PdbUtilities/Shared/DummyMetadataImport.cs index d04cc7d7ea3a6..8d8737776f385 100644 --- a/src/Test/PdbUtilities/Shared/DummyMetadataImport.cs +++ b/src/Test/PdbUtilities/Shared/DummyMetadataImport.cs @@ -5,14 +5,14 @@ #nullable disable using System; -using System.Collections.Generic; using System.IO; -using System.Reflection; -using System.Reflection.Metadata; -using System.Reflection.Metadata.Ecma335; using System.Runtime.InteropServices; using System.Text; +using System.Collections.Generic; +using System.Reflection.Metadata; +using System.Reflection.Metadata.Ecma335; using Microsoft.DiaSymReader.PortablePdb; +using System.Reflection; namespace Roslyn.Test.PdbUtilities { diff --git a/src/Test/Perf/StackDepthTest/Program.cs b/src/Test/Perf/StackDepthTest/Program.cs index c737ec86b409c..fba85a290f88c 100644 --- a/src/Test/Perf/StackDepthTest/Program.cs +++ b/src/Test/Perf/StackDepthTest/Program.cs @@ -4,11 +4,11 @@ #nullable disable +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp; using System; using System.Runtime.InteropServices; using System.Text; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp; namespace OverflowSensitivity { diff --git a/src/Test/Perf/Utilities/TraceManager.cs b/src/Test/Perf/Utilities/TraceManager.cs index 01053853feaa6..61342fa1e60c0 100644 --- a/src/Test/Perf/Utilities/TraceManager.cs +++ b/src/Test/Perf/Utilities/TraceManager.cs @@ -4,11 +4,11 @@ #nullable disable +using Roslyn.Test.Performance.Utilities; using System.Collections.Generic; using System.Diagnostics; -using System.IO; using System.Linq; -using Roslyn.Test.Performance.Utilities; +using System.IO; using static Roslyn.Test.Performance.Utilities.TestUtilities; namespace Roslyn.Test.Performance.Utilities diff --git a/src/Tools/ExternalAccess/FSharp/Internal/DocumentHighlighting/FSharpDocumentHighlightsService.cs b/src/Tools/ExternalAccess/FSharp/Internal/DocumentHighlighting/FSharpDocumentHighlightsService.cs index a9b19e96d11c2..4c4a64efee832 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/DocumentHighlighting/FSharpDocumentHighlightsService.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/DocumentHighlighting/FSharpDocumentHighlightsService.cs @@ -5,14 +5,14 @@ #nullable disable using System; -using System.Collections.Immutable; -using System.Composition; using System.Linq; +using System.Composition; +using System.Collections.Immutable; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.DocumentHighlighting; -using Microsoft.CodeAnalysis.ExternalAccess.FSharp.DocumentHighlighting; using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.CodeAnalysis.ExternalAccess.FSharp.DocumentHighlighting; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.DocumentHighlighting diff --git a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpContentTypeLanguageService.cs b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpContentTypeLanguageService.cs index b8a9ac5ebf37d..df4a382adf2df 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpContentTypeLanguageService.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpContentTypeLanguageService.cs @@ -7,9 +7,9 @@ using System; using System.Composition; using Microsoft.CodeAnalysis.Editor; +using Microsoft.VisualStudio.Utilities; using Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor; using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.VisualStudio.Utilities; namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.Editor { diff --git a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpEditorInlineRenameService.cs b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpEditorInlineRenameService.cs index 42da07ea93d32..0f645ef1565e3 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpEditorInlineRenameService.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpEditorInlineRenameService.cs @@ -5,10 +5,9 @@ #nullable disable using System; +using System.Linq; using System.Collections.Generic; -using System.Collections.Immutable; using System.Composition; -using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Editor; @@ -17,6 +16,7 @@ using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Collections.Immutable; namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.Editor { diff --git a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpGoToDefinitionService.cs b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpGoToDefinitionService.cs index 23dc3febe8e59..3c62db841dc00 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpGoToDefinitionService.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/Editor/FSharpGoToDefinitionService.cs @@ -5,16 +5,16 @@ #nullable disable using System; -using System.Collections.Generic; -using System.Composition; using System.Linq; +using System.Composition; +using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Editor; +using Microsoft.CodeAnalysis.Navigation; +using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor; using Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.Navigation; -using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.CodeAnalysis.Navigation; namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.Editor { diff --git a/src/Tools/ExternalAccess/FSharp/Internal/SignatureHelp/FSharpSignatureHelpProvider.cs b/src/Tools/ExternalAccess/FSharp/Internal/SignatureHelp/FSharpSignatureHelpProvider.cs index 315c5dab120cd..0447ba2e03b44 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/SignatureHelp/FSharpSignatureHelpProvider.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/SignatureHelp/FSharpSignatureHelpProvider.cs @@ -5,8 +5,8 @@ #nullable disable using System; -using System.Composition; using System.Linq; +using System.Composition; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.ExternalAccess.FSharp.SignatureHelp; diff --git a/src/Tools/ExternalAccess/FSharp/Internal/Structure/FSharpBlockStructureService.cs b/src/Tools/ExternalAccess/FSharp/Internal/Structure/FSharpBlockStructureService.cs index be34ea522a584..588bc7fb239ef 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/Structure/FSharpBlockStructureService.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/Structure/FSharpBlockStructureService.cs @@ -4,13 +4,13 @@ #nullable disable -using System; using System.Composition; using System.Threading; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.Structure; using Microsoft.CodeAnalysis.ExternalAccess.FSharp.Structure; using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.CodeAnalysis.Structure; +using System; namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.Structure { diff --git a/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/FSharpProjectExternalErrorReporterFactory.cs b/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/FSharpProjectExternalErrorReporterFactory.cs index 618d6c4b32586..0a24fc5cee25c 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/FSharpProjectExternalErrorReporterFactory.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/FSharpProjectExternalErrorReporterFactory.cs @@ -5,12 +5,12 @@ #nullable disable using System; +using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.LanguageServices; +using Microsoft.VisualStudio.LanguageServices.Implementation.TaskList; using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem; using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem.Extensions; -using Microsoft.VisualStudio.LanguageServices.Implementation.TaskList; using Microsoft.VisualStudio.Shell; -using Microsoft.VisualStudio.Shell.Interop; namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.VisualStudio { diff --git a/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/Text/Classification/FSharpSignatureHelpClassifierProvider.cs b/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/Text/Classification/FSharpSignatureHelpClassifierProvider.cs index b1d06f68cc6ef..d19b2188f4081 100644 --- a/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/Text/Classification/FSharpSignatureHelpClassifierProvider.cs +++ b/src/Tools/ExternalAccess/FSharp/Internal/VisualStudio/Text/Classification/FSharpSignatureHelpClassifierProvider.cs @@ -6,13 +6,13 @@ using System; using System.ComponentModel.Composition; -using Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.SignatureHelp.Presentation; -using Microsoft.CodeAnalysis.Editor.Shared.Utilities; +using Microsoft.VisualStudio.Text.Classification; using Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor; +using Microsoft.VisualStudio.Utilities; +using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Text; -using Microsoft.VisualStudio.Text.Classification; -using Microsoft.VisualStudio.Utilities; +using Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.SignatureHelp.Presentation; namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Internal.VisualStudio.Text.Classification { diff --git a/src/Tools/ExternalAccess/OmniSharp/Structure/OmniSharpBlockStructureService.cs b/src/Tools/ExternalAccess/OmniSharp/Structure/OmniSharpBlockStructureService.cs index 9c47b8a1e0e33..7b56f4a38cf46 100644 --- a/src/Tools/ExternalAccess/OmniSharp/Structure/OmniSharpBlockStructureService.cs +++ b/src/Tools/ExternalAccess/OmniSharp/Structure/OmniSharpBlockStructureService.cs @@ -6,8 +6,8 @@ using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Structure; +using Microsoft.CodeAnalysis.Shared.Extensions; namespace Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.Structure { diff --git a/src/Tools/Source/RunTests/Program.cs b/src/Tools/Source/RunTests/Program.cs index c98c1d916c49b..40f16e82681d9 100644 --- a/src/Tools/Source/RunTests/Program.cs +++ b/src/Tools/Source/RunTests/Program.cs @@ -6,13 +6,13 @@ using System; using System.Collections.Generic; -using System.Collections.Immutable; -using System.Diagnostics; using System.IO; using System.Linq; -using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; +using System.Collections.Immutable; +using System.Diagnostics; +using System.Text.RegularExpressions; namespace RunTests { diff --git a/src/VisualStudio/CSharp/Impl/Interactive/CSharpVsResetInteractiveCommand.cs b/src/VisualStudio/CSharp/Impl/Interactive/CSharpVsResetInteractiveCommand.cs index 44b7842505d89..f2afd8c007cda 100644 --- a/src/VisualStudio/CSharp/Impl/Interactive/CSharpVsResetInteractiveCommand.cs +++ b/src/VisualStudio/CSharp/Impl/Interactive/CSharpVsResetInteractiveCommand.cs @@ -4,12 +4,12 @@ #nullable disable -using System; -using System.ComponentModel.Composition; using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Shell; using Roslyn.VisualStudio.Services.Interactive; +using System; +using System.ComponentModel.Composition; namespace Microsoft.VisualStudio.LanguageServices.CSharp.Interactive { diff --git a/src/VisualStudio/CSharp/Impl/LanguageService/CSharpCodeCleanupFixerProvider.cs b/src/VisualStudio/CSharp/Impl/LanguageService/CSharpCodeCleanupFixerProvider.cs index 45b98a5af483a..93823b5ae6970 100644 --- a/src/VisualStudio/CSharp/Impl/LanguageService/CSharpCodeCleanupFixerProvider.cs +++ b/src/VisualStudio/CSharp/Impl/LanguageService/CSharpCodeCleanupFixerProvider.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -26,4 +26,4 @@ public CSharpCodeCleanUpFixerProvider( { } } -} +} \ No newline at end of file diff --git a/src/VisualStudio/CSharp/Impl/LanguageService/CSharpLanguageService.cs b/src/VisualStudio/CSharp/Impl/LanguageService/CSharpLanguageService.cs index 91bbb31caeafc..72e8f3d593b12 100644 --- a/src/VisualStudio/CSharp/Impl/LanguageService/CSharpLanguageService.cs +++ b/src/VisualStudio/CSharp/Impl/LanguageService/CSharpLanguageService.cs @@ -14,11 +14,11 @@ using Microsoft.VisualStudio.LanguageServices.CSharp.ProjectSystemShim; using Microsoft.VisualStudio.LanguageServices.Implementation.DebuggerIntelliSense; using Microsoft.VisualStudio.LanguageServices.Implementation.LanguageService; -using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.TextManager.Interop; +using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem; namespace Microsoft.VisualStudio.LanguageServices.CSharp.LanguageService { diff --git a/src/VisualStudio/CSharp/Impl/Options/Formatting/FormattingOptionPageControl.xaml.cs b/src/VisualStudio/CSharp/Impl/Options/Formatting/FormattingOptionPageControl.xaml.cs index 9a414abfb4e61..b595de2c15574 100644 --- a/src/VisualStudio/CSharp/Impl/Options/Formatting/FormattingOptionPageControl.xaml.cs +++ b/src/VisualStudio/CSharp/Impl/Options/Formatting/FormattingOptionPageControl.xaml.cs @@ -4,11 +4,11 @@ #nullable disable -using System.Runtime.CompilerServices; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.BraceCompletion; using Microsoft.CodeAnalysis.Formatting; using Microsoft.VisualStudio.LanguageServices.Implementation.Options; +using System.Runtime.CompilerServices; // 🐉 The XAML markup compiler does not recognize InternalsVisibleTo. However, since it allows type // forwarding, we use TypeForwardedTo to make CodeStyleNoticeTextBlock appear to the markup compiler diff --git a/src/VisualStudio/CSharp/Test/Interactive/Commands/ResetInteractiveTests.cs b/src/VisualStudio/CSharp/Test/Interactive/Commands/ResetInteractiveTests.cs index a27131538ef95..39e463281d2cc 100644 --- a/src/VisualStudio/CSharp/Test/Interactive/Commands/ResetInteractiveTests.cs +++ b/src/VisualStudio/CSharp/Test/Interactive/Commands/ResetInteractiveTests.cs @@ -5,21 +5,22 @@ #nullable disable extern alias InteractiveHost; + using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; using System.Threading.Tasks; -using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Microsoft.CodeAnalysis.Editor.Host; -using Microsoft.CodeAnalysis.Editor.UnitTests; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Test.Utilities; -using Microsoft.VisualStudio.InteractiveWindow; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods; -using Microsoft.VisualStudio.Utilities; using Roslyn.Test.Utilities; using Xunit; +using InteractiveHost::Microsoft.CodeAnalysis.Interactive; +using Microsoft.CodeAnalysis.Editor.UnitTests; +using Microsoft.VisualStudio.InteractiveWindow; +using Microsoft.VisualStudio.Utilities; namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Interactive.Commands { diff --git a/src/VisualStudio/CSharp/Test/Interactive/Commands/TestResetInteractive.cs b/src/VisualStudio/CSharp/Test/Interactive/Commands/TestResetInteractive.cs index bf94db871e10c..30ae70228355a 100644 --- a/src/VisualStudio/CSharp/Test/Interactive/Commands/TestResetInteractive.cs +++ b/src/VisualStudio/CSharp/Test/Interactive/Commands/TestResetInteractive.cs @@ -5,17 +5,18 @@ #nullable disable extern alias InteractiveHost; + +using Microsoft.CodeAnalysis.Editor.Host; +using Microsoft.VisualStudio.LanguageServices.Interactive; +using Microsoft.VisualStudio.Text.Editor; using System; -using System.Collections.Generic; using System.Collections.Immutable; using System.Threading.Tasks; -using InteractiveHost::Microsoft.CodeAnalysis.Interactive; -using Microsoft.CodeAnalysis.Editor.Host; using Microsoft.VisualStudio.InteractiveWindow; -using Microsoft.VisualStudio.Language.Intellisense.Utilities; -using Microsoft.VisualStudio.LanguageServices.Interactive; -using Microsoft.VisualStudio.Text.Editor; +using System.Collections.Generic; +using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Microsoft.VisualStudio.Utilities; +using Microsoft.VisualStudio.Language.Intellisense.Utilities; namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Interactive.Commands { diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml.cs index 830be56ff9abb..2e1bbac25a334 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml.cs @@ -6,12 +6,12 @@ using System.Linq; using System.Windows.Controls; using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.Editor.Shared.Utilities; -using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.VisualStudio.Editor; using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common; using Microsoft.VisualStudio.Shell.TableControl; using Microsoft.VisualStudio.TextManager.Interop; +using Microsoft.CodeAnalysis.Shared.Extensions; +using Microsoft.CodeAnalysis.Editor.Shared.Utilities; namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings { diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorPane.SearchFilter.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorPane.SearchFilter.cs index 906772e16580e..8148321792dea 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorPane.SearchFilter.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorPane.SearchFilter.cs @@ -3,10 +3,10 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; using Microsoft.VisualStudio.PlatformUI; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.Shell.TableControl; +using System.Collections.Generic; namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings { diff --git a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyChecker.cs b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyChecker.cs index bb83165ff0dd3..6ddd4b292c651 100644 --- a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyChecker.cs +++ b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyChecker.cs @@ -7,14 +7,14 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; using System.IO; using System.Linq; -using System.Reflection; using System.Reflection.Metadata; using System.Reflection.PortableExecutable; using System.Threading; using Microsoft.CodeAnalysis; +using System.Reflection; +using System.Diagnostics; using SystemMetadataReader = System.Reflection.Metadata.MetadataReader; namespace Microsoft.VisualStudio.LanguageServices.Implementation diff --git a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyConflict.cs b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyConflict.cs index 041735604c88a..ebeb90aaedf65 100644 --- a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyConflict.cs +++ b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/AnalyzerDependencyConflict.cs @@ -4,8 +4,8 @@ #nullable disable -using System.Diagnostics; using Microsoft.CodeAnalysis; +using System.Diagnostics; namespace Microsoft.VisualStudio.LanguageServices.Implementation { diff --git a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/IgnorableAssemblyNameList.cs b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/IgnorableAssemblyNameList.cs index 5d86b3f74716a..1444eeff1cff3 100644 --- a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/IgnorableAssemblyNameList.cs +++ b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/IgnorableAssemblyNameList.cs @@ -4,8 +4,8 @@ #nullable disable -using System.Collections.Immutable; using System.Diagnostics; +using System.Collections.Immutable; using Microsoft.CodeAnalysis; namespace Microsoft.VisualStudio.LanguageServices.Implementation diff --git a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/MissingAnalyzerDependency.cs b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/MissingAnalyzerDependency.cs index 94e638cd30b9e..a4ba5d81e3b46 100644 --- a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/MissingAnalyzerDependency.cs +++ b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependency/MissingAnalyzerDependency.cs @@ -4,8 +4,8 @@ #nullable disable -using System.Diagnostics; using Microsoft.CodeAnalysis; +using System.Diagnostics; namespace Microsoft.VisualStudio.LanguageServices.Implementation { diff --git a/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerService.cs b/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerService.cs index 88e0ea123ac84..72361d8369cc2 100644 --- a/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerService.cs +++ b/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerService.cs @@ -12,15 +12,15 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; -using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.CodeAnalysis.Shared.TestHooks; using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem; using Microsoft.VisualStudio.LanguageServices.Implementation.TaskList; -using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities; +using Microsoft.CodeAnalysis.Shared.TestHooks; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; using Roslyn.Utilities; using Task = System.Threading.Tasks.Task; +using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Diagnostics { diff --git a/src/VisualStudio/Core/Def/Implementation/FindReferences/FindReferencesTableControlEventProcessorProvider.cs b/src/VisualStudio/Core/Def/Implementation/FindReferences/FindReferencesTableControlEventProcessorProvider.cs index 8ad8a8b4c8852..182db6c5dc3fb 100644 --- a/src/VisualStudio/Core/Def/Implementation/FindReferences/FindReferencesTableControlEventProcessorProvider.cs +++ b/src/VisualStudio/Core/Def/Implementation/FindReferences/FindReferencesTableControlEventProcessorProvider.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; +using Microsoft.VisualStudio.Utilities; using System.ComponentModel.Composition; -using System.Threading; -using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Shell.TableControl; using Microsoft.VisualStudio.Text.Classification; -using Microsoft.VisualStudio.Utilities; +using System; +using Microsoft.CodeAnalysis.Host.Mef; +using System.Threading; namespace Microsoft.VisualStudio.LanguageServices.FindUsages { diff --git a/src/VisualStudio/Core/Def/Implementation/Interactive/AbstractResetInteractiveMenuCommand.cs b/src/VisualStudio/Core/Def/Implementation/Interactive/AbstractResetInteractiveMenuCommand.cs index 1382c2a3fb8d8..055135a5c5e1f 100644 --- a/src/VisualStudio/Core/Def/Implementation/Interactive/AbstractResetInteractiveMenuCommand.cs +++ b/src/VisualStudio/Core/Def/Implementation/Interactive/AbstractResetInteractiveMenuCommand.cs @@ -4,17 +4,17 @@ #nullable disable +using Microsoft.VisualStudio.Shell; +using Microsoft.VisualStudio.Shell.Interop; +using Roslyn.VisualStudio.Services.Interactive; using System; -using System.ComponentModel.Design; using System.Linq; using System.Runtime.InteropServices; using System.Runtime.Versioning; -using System.Threading; -using Microsoft.CodeAnalysis.Editor; +using System.ComponentModel.Design; using Microsoft.VisualStudio.ComponentModelHost; -using Microsoft.VisualStudio.Shell; -using Microsoft.VisualStudio.Shell.Interop; -using Roslyn.VisualStudio.Services.Interactive; +using Microsoft.CodeAnalysis.Editor; +using System.Threading; using Task = System.Threading.Tasks.Task; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Interactive diff --git a/src/VisualStudio/Core/Def/Implementation/Interactive/CSharpResetInteractiveMenuCommand.cs b/src/VisualStudio/Core/Def/Implementation/Interactive/CSharpResetInteractiveMenuCommand.cs index b7772cafb3f68..0c1bc81389e51 100644 --- a/src/VisualStudio/Core/Def/Implementation/Interactive/CSharpResetInteractiveMenuCommand.cs +++ b/src/VisualStudio/Core/Def/Implementation/Interactive/CSharpResetInteractiveMenuCommand.cs @@ -4,11 +4,11 @@ #nullable disable -using System.ComponentModel.Design; using Microsoft.CodeAnalysis.Editor; using Microsoft.VisualStudio.ComponentModelHost; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; +using System.ComponentModel.Design; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Interactive { diff --git a/src/VisualStudio/Core/Def/Implementation/Interactive/VisualBasicResetInteractiveMenuCommand.cs b/src/VisualStudio/Core/Def/Implementation/Interactive/VisualBasicResetInteractiveMenuCommand.cs index cc4cdd14ab2c1..8ca97337ef305 100644 --- a/src/VisualStudio/Core/Def/Implementation/Interactive/VisualBasicResetInteractiveMenuCommand.cs +++ b/src/VisualStudio/Core/Def/Implementation/Interactive/VisualBasicResetInteractiveMenuCommand.cs @@ -4,11 +4,11 @@ #nullable disable -using System.ComponentModel.Design; using Microsoft.CodeAnalysis.Editor; using Microsoft.VisualStudio.ComponentModelHost; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; +using System.ComponentModel.Design; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Interactive { diff --git a/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractListItemFactory.cs b/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractListItemFactory.cs index 66f1219ce17c9..ab1e2c7197596 100644 --- a/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractListItemFactory.cs +++ b/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/AbstractListItemFactory.cs @@ -10,9 +10,9 @@ using System.Diagnostics; using System.Linq; using System.Threading; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.LanguageServices; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Shared.Utilities; using Microsoft.VisualStudio.LanguageServices.Implementation.Library.ObjectBrowser.Lists; diff --git a/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/ObjectBrowserTaskExtensions.cs b/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/ObjectBrowserTaskExtensions.cs index 27dcb0cd5004d..75ac5718e31dd 100644 --- a/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/ObjectBrowserTaskExtensions.cs +++ b/src/VisualStudio/Core/Def/Implementation/Library/ObjectBrowser/ObjectBrowserTaskExtensions.cs @@ -8,9 +8,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using System.Threading; using System.Threading.Tasks; using Roslyn.Utilities; +using System.Threading; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Library.ObjectBrowser { diff --git a/src/VisualStudio/Core/Def/Implementation/Preview/ReferenceChange.cs b/src/VisualStudio/Core/Def/Implementation/Preview/ReferenceChange.cs index 39997b65a9c35..c9501b51f0f01 100644 --- a/src/VisualStudio/Core/Def/Implementation/Preview/ReferenceChange.cs +++ b/src/VisualStudio/Core/Def/Implementation/Preview/ReferenceChange.cs @@ -7,8 +7,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; using Microsoft.VisualStudio.Language.Intellisense; using Microsoft.VisualStudio.Shell.Interop; diff --git a/src/VisualStudio/Core/Def/Implementation/PreviewPane/PreviewPane.xaml.cs b/src/VisualStudio/Core/Def/Implementation/PreviewPane/PreviewPane.xaml.cs index 4d5ac5b5e7a9c..ce07bc5ac6bce 100644 --- a/src/VisualStudio/Core/Def/Implementation/PreviewPane/PreviewPane.xaml.cs +++ b/src/VisualStudio/Core/Def/Implementation/PreviewPane/PreviewPane.xaml.cs @@ -12,12 +12,12 @@ using System.Windows.Documents; using System.Windows.Navigation; using Microsoft.CodeAnalysis.Diagnostics.Log; -using Microsoft.CodeAnalysis.Editor.Implementation.Preview; using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities; -using Microsoft.VisualStudio.Text.Differencing; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.Editor.Implementation.Preview; using IVsUIShell = Microsoft.VisualStudio.Shell.Interop.IVsUIShell; using OLECMDEXECOPT = Microsoft.VisualStudio.OLE.Interop.OLECMDEXECOPT; +using Microsoft.VisualStudio.Text.Differencing; namespace Microsoft.VisualStudio.LanguageServices.Implementation.PreviewPane { diff --git a/src/VisualStudio/Core/Def/Implementation/Progression/GraphQueries/SearchGraphQuery.cs b/src/VisualStudio/Core/Def/Implementation/Progression/GraphQueries/SearchGraphQuery.cs index 7cad8392ba633..9839277a77d9f 100644 --- a/src/VisualStudio/Core/Def/Implementation/Progression/GraphQueries/SearchGraphQuery.cs +++ b/src/VisualStudio/Core/Def/Implementation/Progression/GraphQueries/SearchGraphQuery.cs @@ -7,15 +7,15 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; -using System.Runtime.ExceptionServices; using System.Threading; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.FindSymbols; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.VisualStudio.GraphModel; using Roslyn.Utilities; +using System.Runtime.ExceptionServices; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Progression { diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeTracker.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeTracker.cs index 4d92cf2c3ce43..7a41ce6cac66e 100644 --- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeTracker.cs +++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeTracker.cs @@ -10,9 +10,9 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.ErrorReporting; +using IVsAsyncFileChangeEx = Microsoft.VisualStudio.Shell.IVsAsyncFileChangeEx; using Microsoft.VisualStudio.Shell.Interop; using Roslyn.Utilities; -using IVsAsyncFileChangeEx = Microsoft.VisualStudio.Shell.IVsAsyncFileChangeEx; namespace Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem { diff --git a/src/VisualStudio/Core/Def/Implementation/Utilities/AutomationDelegatingListView.cs b/src/VisualStudio/Core/Def/Implementation/Utilities/AutomationDelegatingListView.cs index 7fca803c000e1..c668c0eefa5bf 100644 --- a/src/VisualStudio/Core/Def/Implementation/Utilities/AutomationDelegatingListView.cs +++ b/src/VisualStudio/Core/Def/Implementation/Utilities/AutomationDelegatingListView.cs @@ -5,14 +5,15 @@ #nullable disable extern alias slowautomation; + using System.Collections.Generic; using System.Linq; using System.Windows; +using slowautomation::System.Windows.Automation; using System.Windows.Automation.Peers; using System.Windows.Controls; using System.Windows.Input; using Roslyn.Utilities; -using slowautomation::System.Windows.Automation; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Utilities { diff --git a/src/VisualStudio/Core/Def/Implementation/Venus/VenusTaskExtensions.cs b/src/VisualStudio/Core/Def/Implementation/Venus/VenusTaskExtensions.cs index 480e0cd8334bd..28294671cedaa 100644 --- a/src/VisualStudio/Core/Def/Implementation/Venus/VenusTaskExtensions.cs +++ b/src/VisualStudio/Core/Def/Implementation/Venus/VenusTaskExtensions.cs @@ -8,9 +8,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using System.Threading; using System.Threading.Tasks; using Roslyn.Utilities; +using System.Threading; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Venus { diff --git a/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioWorkspaceStatusServiceFactory.cs b/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioWorkspaceStatusServiceFactory.cs index 68ba817cde14f..6dab746014f7b 100644 --- a/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioWorkspaceStatusServiceFactory.cs +++ b/src/VisualStudio/Core/Def/Implementation/Workspace/VisualStudioWorkspaceStatusServiceFactory.cs @@ -17,9 +17,10 @@ using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.Threading; -using IAsyncServiceProvider2 = Microsoft.VisualStudio.Shell.IAsyncServiceProvider2; using Task = System.Threading.Tasks.Task; +using IAsyncServiceProvider2 = Microsoft.VisualStudio.Shell.IAsyncServiceProvider2; + namespace Microsoft.VisualStudio.LanguageServices.Implementation { [ExportWorkspaceServiceFactory(typeof(IWorkspaceStatusService), ServiceLayer.Host), Shared] diff --git a/src/VisualStudio/Core/Def/Interactive/AbstractResetInteractiveCommand.cs b/src/VisualStudio/Core/Def/Interactive/AbstractResetInteractiveCommand.cs index 307a58d36db74..e1496699080d2 100644 --- a/src/VisualStudio/Core/Def/Interactive/AbstractResetInteractiveCommand.cs +++ b/src/VisualStudio/Core/Def/Interactive/AbstractResetInteractiveCommand.cs @@ -4,12 +4,12 @@ #nullable disable -using System; using EnvDTE; using Microsoft.VisualStudio.ComponentModelHost; using Microsoft.VisualStudio.LanguageServices; using Microsoft.VisualStudio.LanguageServices.Interactive; using Microsoft.VisualStudio.Shell.Interop; +using System; namespace Roslyn.VisualStudio.Services.Interactive { diff --git a/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowProvider.cs b/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowProvider.cs index 27553f0d7d9aa..bb5c04a0853b8 100644 --- a/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowProvider.cs +++ b/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowProvider.cs @@ -5,24 +5,25 @@ #nullable disable extern alias InteractiveHost; + using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Microsoft.CodeAnalysis.Editor.Interactive; -using Microsoft.CodeAnalysis.Internal.Log; using Microsoft.VisualStudio.Editor.Interactive; -using Microsoft.VisualStudio.InteractiveWindow; using Microsoft.VisualStudio.InteractiveWindow.Commands; using Microsoft.VisualStudio.InteractiveWindow.Shell; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.Text.Classification; -using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Utilities; +using Microsoft.VisualStudio.Text.Editor; +using Microsoft.VisualStudio.InteractiveWindow; +using Microsoft.CodeAnalysis.Internal.Log; using Roslyn.Utilities; +using InteractiveHost::Microsoft.CodeAnalysis.Interactive; namespace Microsoft.VisualStudio.LanguageServices.Interactive { diff --git a/src/VisualStudio/Core/Def/Interactive/VsResetInteractive.cs b/src/VisualStudio/Core/Def/Interactive/VsResetInteractive.cs index 3c38b8902c02a..e55001a37dc47 100644 --- a/src/VisualStudio/Core/Def/Interactive/VsResetInteractive.cs +++ b/src/VisualStudio/Core/Def/Interactive/VsResetInteractive.cs @@ -5,6 +5,7 @@ #nullable disable extern alias InteractiveHost; + using System; using System.Collections.Generic; using System.Collections.Immutable; @@ -13,7 +14,6 @@ using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; -using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Editor.Host; using Microsoft.CodeAnalysis.Shared.Extensions; @@ -22,8 +22,9 @@ using Microsoft.VisualStudio.InteractiveWindow; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.Text.Editor; -using Microsoft.VisualStudio.Utilities; using Roslyn.Utilities; +using InteractiveHost::Microsoft.CodeAnalysis.Interactive; +using Microsoft.VisualStudio.Utilities; namespace Microsoft.VisualStudio.LanguageServices.Interactive { diff --git a/src/VisualStudio/Core/Def/ValueTracking/ValueTrackedTreeItemViewModel.cs b/src/VisualStudio/Core/Def/ValueTracking/ValueTrackedTreeItemViewModel.cs index e064ff8bc0b58..af14262cd990d 100644 --- a/src/VisualStudio/Core/Def/ValueTracking/ValueTrackedTreeItemViewModel.cs +++ b/src/VisualStudio/Core/Def/ValueTracking/ValueTrackedTreeItemViewModel.cs @@ -9,10 +9,10 @@ using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Navigation; using Microsoft.CodeAnalysis.Options; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.ValueTracking; using Microsoft.VisualStudio.Language.Intellisense; +using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.VisualStudio.Shell; namespace Microsoft.VisualStudio.LanguageServices.ValueTracking diff --git a/src/VisualStudio/Core/Def/ValueTracking/ValueTrackingToolWindow.cs b/src/VisualStudio/Core/Def/ValueTracking/ValueTrackingToolWindow.cs index 9b613a3dcfff7..35e8fe5ab766b 100644 --- a/src/VisualStudio/Core/Def/ValueTracking/ValueTrackingToolWindow.cs +++ b/src/VisualStudio/Core/Def/ValueTracking/ValueTrackingToolWindow.cs @@ -4,8 +4,8 @@ using System; using System.Linq; -using System.Runtime.InteropServices; using System.Windows.Controls; +using System.Runtime.InteropServices; using Microsoft.VisualStudio.Shell; using Roslyn.Utilities; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/CodeElementSnapshot.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/CodeElementSnapshot.cs index ffaa7c0d2eb32..06366442f8934 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/CodeElementSnapshot.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/CodeElementSnapshot.cs @@ -6,8 +6,8 @@ using System; using System.Collections.Immutable; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; using Microsoft.VisualStudio; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalMemberCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalMemberCollection.cs index 4be9be6099e6b..8ae84323f557d 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalMemberCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalMemberCollection.cs @@ -6,8 +6,8 @@ using System.Collections.Immutable; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalNamespaceCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalNamespaceCollection.cs index 51b515e16fff5..98863c7df7748 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalNamespaceCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalNamespaceCollection.cs @@ -7,8 +7,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalOverloadsCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalOverloadsCollection.cs index a1e409c88ae59..7abaa6666bac6 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalOverloadsCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/ExternalOverloadsCollection.cs @@ -6,8 +6,8 @@ using System.Collections.Immutable; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.ExternalElements; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/InheritsImplementsCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/InheritsImplementsCollection.cs index 3a276fc383ea4..e10589427e33d 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/InheritsImplementsCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/InheritsImplementsCollection.cs @@ -8,8 +8,8 @@ using System.Diagnostics; using System.Linq; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.InternalElements; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/NamespaceCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/NamespaceCollection.cs index a8c54eb66a0cb..03f81d3b3432b 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/NamespaceCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/NamespaceCollection.cs @@ -8,8 +8,8 @@ using System.Diagnostics; using System.Linq; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.InternalElements; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/OverloadsCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/OverloadsCollection.cs index df9dca4b14715..a14adab265119 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/OverloadsCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/OverloadsCollection.cs @@ -7,8 +7,8 @@ using System.Collections.Immutable; using System.Linq; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.InternalElements; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/PartialTypeCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/PartialTypeCollection.cs index c14b577d65f75..df9be25dedf62 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/PartialTypeCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/PartialTypeCollection.cs @@ -7,8 +7,8 @@ using System.Collections.Immutable; using System.Linq; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.InternalElements; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/Collections/TypeCollection.cs b/src/VisualStudio/Core/Impl/CodeModel/Collections/TypeCollection.cs index 07c43dfd77b0c..6e341b5093a6d 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/Collections/TypeCollection.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/Collections/TypeCollection.cs @@ -9,8 +9,8 @@ using System.Diagnostics; using System.Linq; using System.Runtime.InteropServices; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.InternalElements; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.Interop; diff --git a/src/VisualStudio/Core/Impl/CodeModel/ExternalElements/AbstractExternalCodeType.cs b/src/VisualStudio/Core/Impl/CodeModel/ExternalElements/AbstractExternalCodeType.cs index 9b7cad5ba4fd8..1274f3c33d546 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/ExternalElements/AbstractExternalCodeType.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/ExternalElements/AbstractExternalCodeType.cs @@ -7,8 +7,8 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics.CodeAnalysis; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; +using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel.Collections; using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities; diff --git a/src/VisualStudio/Core/Test/ObjectBrowser/Helpers.vb b/src/VisualStudio/Core/Test/ObjectBrowser/Helpers.vb index 98540e0e0514e..4b01cb60f5181 100644 --- a/src/VisualStudio/Core/Test/ObjectBrowser/Helpers.vb +++ b/src/VisualStudio/Core/Test/ObjectBrowser/Helpers.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Runtime.CompilerServices -Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces +Imports Microsoft.VisualStudio.Shell.Interop Imports Microsoft.VisualStudio.LanguageServices.Implementation.Library.ObjectBrowser Imports Microsoft.VisualStudio.LanguageServices.UnitTests.ObjectBrowser.Mocks -Imports Microsoft.VisualStudio.Shell.Interop +Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ObjectBrowser Friend Module Helpers diff --git a/src/VisualStudio/LiveShare/Impl/Client/RoslynLSPClientService.cs b/src/VisualStudio/LiveShare/Impl/Client/RoslynLSPClientService.cs index f90ea88064a11..1a5916c8956c4 100644 --- a/src/VisualStudio/LiveShare/Impl/Client/RoslynLSPClientService.cs +++ b/src/VisualStudio/LiveShare/Impl/Client/RoslynLSPClientService.cs @@ -9,12 +9,12 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.LanguageServer.Protocol; using Microsoft.VisualStudio.LiveShare; using Newtonsoft.Json.Linq; -using LS = Microsoft.VisualStudio.LiveShare.LanguageServices; using Task = System.Threading.Tasks.Task; +using LS = Microsoft.VisualStudio.LiveShare.LanguageServices; +using Microsoft.CodeAnalysis.Host.Mef; namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client { diff --git a/src/VisualStudio/LiveShare/Impl/CustomProtocol/LspRequestExtensions.cs b/src/VisualStudio/LiveShare/Impl/CustomProtocol/LspRequestExtensions.cs index 6f72799a25ca8..25907cadabd8f 100644 --- a/src/VisualStudio/LiveShare/Impl/CustomProtocol/LspRequestExtensions.cs +++ b/src/VisualStudio/LiveShare/Impl/CustomProtocol/LspRequestExtensions.cs @@ -5,8 +5,8 @@ #nullable disable using Microsoft.VisualStudio.LanguageServices.Implementation.LanguageService; -using LS = Microsoft.VisualStudio.LiveShare.LanguageServices; using LSP = Microsoft.VisualStudio.LanguageServer.Protocol; +using LS = Microsoft.VisualStudio.LiveShare.LanguageServices; namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Protocol { diff --git a/src/VisualStudio/TestUtilities2/CodeModel/CodeModelTestState.vb b/src/VisualStudio/TestUtilities2/CodeModel/CodeModelTestState.vb index 69265130f2cfc..cc5803a6da2f3 100644 --- a/src/VisualStudio/TestUtilities2/CodeModel/CodeModelTestState.vb +++ b/src/VisualStudio/TestUtilities2/CodeModel/CodeModelTestState.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces +Imports Microsoft.CodeAnalysis Imports Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel Imports Microsoft.VisualStudio.LanguageServices.Implementation.Interop diff --git a/src/VisualStudio/TestUtilities2/ProjectSystemShim/Framework/MockHierarchy.vb b/src/VisualStudio/TestUtilities2/ProjectSystemShim/Framework/MockHierarchy.vb index e9344a09f0235..fbe57c1b08659 100644 --- a/src/VisualStudio/TestUtilities2/ProjectSystemShim/Framework/MockHierarchy.vb +++ b/src/VisualStudio/TestUtilities2/ProjectSystemShim/Framework/MockHierarchy.vb @@ -2,14 +2,14 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.IO -Imports System.Runtime.InteropServices -Imports Microsoft.VisualStudio.LanguageServices.ProjectSystem +Imports Microsoft.VisualStudio.Shell.Interop Imports Microsoft.VisualStudio.OLE.Interop +Imports System.Runtime.InteropServices Imports Microsoft.VisualStudio.Shell -Imports Microsoft.VisualStudio.Shell.Interop -Imports Moq Imports Roslyn.Utilities +Imports System.IO +Imports Moq +Imports Microsoft.VisualStudio.LanguageServices.ProjectSystem Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim.Framework Public NotInheritable Class MockHierarchy diff --git a/src/VisualStudio/TestUtilities2/PropertyChangedTestMonitor.vb b/src/VisualStudio/TestUtilities2/PropertyChangedTestMonitor.vb index f999bde630118..f47ad8a1205b8 100644 --- a/src/VisualStudio/TestUtilities2/PropertyChangedTestMonitor.vb +++ b/src/VisualStudio/TestUtilities2/PropertyChangedTestMonitor.vb @@ -2,8 +2,8 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.ComponentModel Imports System.Linq.Expressions +Imports System.ComponentModel Namespace Microsoft.VisualStudio.LanguageServices.UnitTests Public Class PropertyChangedTestMonitor diff --git a/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicCodeCleanupFixerProvider.vb b/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicCodeCleanupFixerProvider.vb index 850c805e40da7..d1df51e52f392 100644 --- a/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicCodeCleanupFixerProvider.vb +++ b/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicCodeCleanupFixerProvider.vb @@ -1,4 +1,4 @@ -' Licensed to the .NET Foundation under one or more agreements. +' Licensed to the .NET Foundation under one or more agreements. ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. @@ -23,4 +23,4 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeCleanup MyBase.New(codeCleanUpFixers) End Sub End Class -End Namespace +End Namespace \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/DescriptionBuilder.vb b/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/DescriptionBuilder.vb index 36acd18072f6e..9a0d12b5cc9e4 100644 --- a/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/DescriptionBuilder.vb +++ b/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/DescriptionBuilder.vb @@ -4,8 +4,8 @@ Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis -Imports Microsoft.VisualStudio.LanguageServices.Implementation.Library.ObjectBrowser Imports Microsoft.VisualStudio.Shell.Interop +Imports Microsoft.VisualStudio.LanguageServices.Implementation.Library.ObjectBrowser Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.ObjectBrowser Friend Class DescriptionBuilder diff --git a/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/ObjectBrowserLibraryManager.vb b/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/ObjectBrowserLibraryManager.vb index 6675c5c1b3815..7ef52cd3126ee 100644 --- a/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/ObjectBrowserLibraryManager.vb +++ b/src/VisualStudio/VisualBasic/Impl/ObjectBrowser/ObjectBrowserLibraryManager.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports Microsoft.CodeAnalysis -Imports Microsoft.VisualStudio.ComponentModelHost -Imports Microsoft.VisualStudio.LanguageServices.Implementation.Library.ObjectBrowser Imports Microsoft.VisualStudio.Shell.Interop +Imports Microsoft.VisualStudio.LanguageServices.Implementation.Library.ObjectBrowser +Imports Microsoft.VisualStudio.ComponentModelHost Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.ObjectBrowser Friend Class ObjectBrowserLibraryManager diff --git a/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionClassName.vb b/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionClassName.vb index 0d2efe2991548..59882fec379e2 100644 --- a/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionClassName.vb +++ b/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionClassName.vb @@ -7,8 +7,8 @@ Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.Shared.Extensions Imports Microsoft.CodeAnalysis.VisualBasic.Extensions Imports Microsoft.CodeAnalysis.VisualBasic.Syntax -Imports Microsoft.VisualStudio.LanguageServices.Implementation.Snippets Imports Microsoft.VisualStudio.Text +Imports Microsoft.VisualStudio.LanguageServices.Implementation.Snippets Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Snippets.SnippetFunctions Friend NotInheritable Class SnippetFunctionClassName diff --git a/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionSimpleTypeName.vb b/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionSimpleTypeName.vb index 5b487f494b120..1aff2bcfecd7e 100644 --- a/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionSimpleTypeName.vb +++ b/src/VisualStudio/VisualBasic/Impl/Snippets/SnippetFunctions/SnippetFunctionSimpleTypeName.vb @@ -6,8 +6,8 @@ Imports System.Threading Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.Simplification Imports Microsoft.CodeAnalysis.Text -Imports Microsoft.VisualStudio.LanguageServices.Implementation.Snippets.SnippetFunctions Imports Microsoft.VisualStudio.Text +Imports Microsoft.VisualStudio.LanguageServices.Implementation.Snippets.SnippetFunctions Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Snippets.SnippetFunctions Friend NotInheritable Class SnippetFunctionSimpleTypeName diff --git a/src/Workspaces/CSharp/Portable/CodeGeneration/ParameterGenerator.cs b/src/Workspaces/CSharp/Portable/CodeGeneration/ParameterGenerator.cs index c6245f3333f28..e74ceef5ade30 100644 --- a/src/Workspaces/CSharp/Portable/CodeGeneration/ParameterGenerator.cs +++ b/src/Workspaces/CSharp/Portable/CodeGeneration/ParameterGenerator.cs @@ -10,8 +10,9 @@ using Microsoft.CodeAnalysis.CodeGeneration; using Microsoft.CodeAnalysis.CSharp.Extensions; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Shared.Extensions; + +using Microsoft.CodeAnalysis.PooledObjects; using static Microsoft.CodeAnalysis.CodeGeneration.CodeGenerationHelpers; namespace Microsoft.CodeAnalysis.CSharp.CodeGeneration diff --git a/src/Workspaces/CSharp/Portable/Extensions/SemanticModelExtensions.cs b/src/Workspaces/CSharp/Portable/Extensions/SemanticModelExtensions.cs index 5f3f6d95ef6de..5c682c504e4e6 100644 --- a/src/Workspaces/CSharp/Portable/Extensions/SemanticModelExtensions.cs +++ b/src/Workspaces/CSharp/Portable/Extensions/SemanticModelExtensions.cs @@ -8,15 +8,15 @@ using System.Collections.Immutable; using System.Linq; using System.Threading; -using Humanizer; using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp.LanguageServices; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles; -using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Shared.Utilities; using Microsoft.CodeAnalysis.Utilities; +using Humanizer; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.Shared.Extensions; +using Microsoft.CodeAnalysis.CSharp.LanguageServices; namespace Microsoft.CodeAnalysis.CSharp.Extensions { diff --git a/src/Workspaces/CSharpTest/Formatting/FormattingTriviaTests.cs b/src/Workspaces/CSharpTest/Formatting/FormattingTriviaTests.cs index 10941ddc17e68..eb7f5943341f9 100644 --- a/src/Workspaces/CSharpTest/Formatting/FormattingTriviaTests.cs +++ b/src/Workspaces/CSharpTest/Formatting/FormattingTriviaTests.cs @@ -5,11 +5,11 @@ #nullable disable using System.Linq; -using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Formatting; using Microsoft.CodeAnalysis.Test.Utilities; +using Microsoft.CodeAnalysis.Formatting; using Roslyn.Test.Utilities; using Xunit; +using System.Threading.Tasks; namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Formatting { diff --git a/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs b/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs index d08e55cfcf188..f1c98c4de478f 100644 --- a/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs +++ b/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker_ResolveReferences.cs b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker_ResolveReferences.cs index 5b1c167ea3511..cd64608f7bc44 100644 --- a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker_ResolveReferences.cs +++ b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker_ResolveReferences.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.cs b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.cs index 2f323d373ff82..ad504f88f359a 100644 --- a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.cs +++ b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/Extensions.cs b/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/Extensions.cs index a21ee61b0a180..eec1823393a06 100644 --- a/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/Extensions.cs +++ b/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/Extensions.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Workspaces/Core/MSBuild/MSBuild/ProjectMap.cs b/src/Workspaces/Core/MSBuild/MSBuild/ProjectMap.cs index 242809c13f33d..cae640133d341 100644 --- a/src/Workspaces/Core/MSBuild/MSBuild/ProjectMap.cs +++ b/src/Workspaces/Core/MSBuild/MSBuild/ProjectMap.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Workspaces/Core/Portable/Classification/AbstractClassificationService.cs b/src/Workspaces/Core/Portable/Classification/AbstractClassificationService.cs index 66269ab783707..d25611e3fcb6e 100644 --- a/src/Workspaces/Core/Portable/Classification/AbstractClassificationService.cs +++ b/src/Workspaces/Core/Portable/Classification/AbstractClassificationService.cs @@ -8,10 +8,10 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis.Extensions; using Microsoft.CodeAnalysis.PooledObjects; -using Microsoft.CodeAnalysis.ReassignedVariable; using Microsoft.CodeAnalysis.Remote; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Text; +using Microsoft.CodeAnalysis.ReassignedVariable; namespace Microsoft.CodeAnalysis.Classification { diff --git a/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs b/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs index 6e5f47622c7cb..0148466ebcc7e 100644 --- a/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs +++ b/src/Workspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs @@ -7,8 +7,8 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.ErrorReporting; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.ErrorReporting; namespace Microsoft.CodeAnalysis.Options.EditorConfig { diff --git a/src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs b/src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs index 4f77bdfce35f1..4ea7f93f3debe 100644 --- a/src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs +++ b/src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs @@ -8,8 +8,8 @@ using System.IO.Pipelines; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Host; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.Host; namespace Microsoft.CodeAnalysis.Remote { diff --git a/src/Workspaces/Core/Portable/Rename/RenameLocation.ReferenceProcessing.cs b/src/Workspaces/Core/Portable/Rename/RenameLocation.ReferenceProcessing.cs index b7a6562be21d6..0fbb42ff3b1a9 100644 --- a/src/Workspaces/Core/Portable/Rename/RenameLocation.ReferenceProcessing.cs +++ b/src/Workspaces/Core/Portable/Rename/RenameLocation.ReferenceProcessing.cs @@ -4,11 +4,8 @@ using System; using System.Collections.Generic; -using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using System.Text; -using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.FindSymbols; @@ -17,6 +14,9 @@ using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System.Text.RegularExpressions; +using System.Collections.Immutable; +using System.Text; namespace Microsoft.CodeAnalysis.Rename { diff --git a/src/Workspaces/Core/Portable/Rename/Renamer.RenameSymbolDocumentAction.cs b/src/Workspaces/Core/Portable/Rename/Renamer.RenameSymbolDocumentAction.cs index 16e518ed34fd5..023f3a26b0f94 100644 --- a/src/Workspaces/Core/Portable/Rename/Renamer.RenameSymbolDocumentAction.cs +++ b/src/Workspaces/Core/Portable/Rename/Renamer.RenameSymbolDocumentAction.cs @@ -4,12 +4,12 @@ using System.Collections.Immutable; using System.Globalization; -using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.LanguageServices; using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Shared.Extensions; +using System.Linq; using Microsoft.CodeAnalysis.Utilities; namespace Microsoft.CodeAnalysis.Rename diff --git a/src/Workspaces/Core/Portable/SymbolKey/SymbolKey.TupleTypeSymbolKey.cs b/src/Workspaces/Core/Portable/SymbolKey/SymbolKey.TupleTypeSymbolKey.cs index 3316f77f2a944..26bb5a200a1b4 100644 --- a/src/Workspaces/Core/Portable/SymbolKey/SymbolKey.TupleTypeSymbolKey.cs +++ b/src/Workspaces/Core/Portable/SymbolKey/SymbolKey.TupleTypeSymbolKey.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using System; +using System.Linq; using System.Collections.Immutable; using System.Diagnostics; -using System.Linq; using Microsoft.CodeAnalysis.PooledObjects; namespace Microsoft.CodeAnalysis diff --git a/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/TaskSchedulerProvider.cs b/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/TaskSchedulerProvider.cs index 9368b5fe79c08..7ba81127bffa6 100644 --- a/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/TaskSchedulerProvider.cs +++ b/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/TaskSchedulerProvider.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.CodeAnalysis.Host.Mef; using System; using System.Composition; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Host.Mef; namespace Microsoft.CodeAnalysis.Host { diff --git a/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/WorkspaceAsynchronousOperationListenerProvider.cs b/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/WorkspaceAsynchronousOperationListenerProvider.cs index 1427894468b42..431161c07ebb8 100644 --- a/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/WorkspaceAsynchronousOperationListenerProvider.cs +++ b/src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/WorkspaceAsynchronousOperationListenerProvider.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.Composition; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Shared.TestHooks; +using System; +using System.Composition; namespace Microsoft.CodeAnalysis.Host { diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/Checksum_Factory.cs b/src/Workspaces/Core/Portable/Workspace/Solution/Checksum_Factory.cs index 3df26598044a5..40099c259dfdc 100644 --- a/src/Workspaces/Core/Portable/Workspace/Solution/Checksum_Factory.cs +++ b/src/Workspaces/Core/Portable/Workspace/Solution/Checksum_Factory.cs @@ -7,14 +7,14 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; using System.IO; -using System.Runtime.InteropServices; using System.Security.Cryptography; +using System.Runtime.InteropServices; using System.Threading; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Serialization; using Roslyn.Utilities; +using System.Diagnostics; namespace Microsoft.CodeAnalysis { diff --git a/src/Workspaces/CoreTest/Differencing/LongestCommonSubsequenceTests.cs b/src/Workspaces/CoreTest/Differencing/LongestCommonSubsequenceTests.cs index ed39996eed540..76bd073234001 100644 --- a/src/Workspaces/CoreTest/Differencing/LongestCommonSubsequenceTests.cs +++ b/src/Workspaces/CoreTest/Differencing/LongestCommonSubsequenceTests.cs @@ -5,9 +5,9 @@ #nullable disable using System; -using System.Collections.Generic; using System.Text; using Xunit; +using System.Collections.Generic; namespace Microsoft.CodeAnalysis.Differencing.UnitTests { diff --git a/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs b/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs index f9ef136d18e51..5978c4fc4b511 100644 --- a/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs +++ b/src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs @@ -32,8 +32,8 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using static Microsoft.CodeAnalysis.UnitTests.SolutionTestHelpers; using CS = Microsoft.CodeAnalysis.CSharp; +using static Microsoft.CodeAnalysis.UnitTests.SolutionTestHelpers; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Workspaces/CoreTest/WorkspaceTests/GeneralWorkspaceTests.cs b/src/Workspaces/CoreTest/WorkspaceTests/GeneralWorkspaceTests.cs index a101afa53eec8..725174528d573 100644 --- a/src/Workspaces/CoreTest/WorkspaceTests/GeneralWorkspaceTests.cs +++ b/src/Workspaces/CoreTest/WorkspaceTests/GeneralWorkspaceTests.cs @@ -4,11 +4,11 @@ #nullable disable -using System; using Microsoft.CodeAnalysis.Host; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; using Xunit; +using System; namespace Microsoft.CodeAnalysis.UnitTests { diff --git a/src/Workspaces/MSBuildTest/MSBuildWorkspaceTests.cs b/src/Workspaces/MSBuildTest/MSBuildWorkspaceTests.cs index 2a049e2ad5432..2e88834903b65 100644 --- a/src/Workspaces/MSBuildTest/MSBuildWorkspaceTests.cs +++ b/src/Workspaces/MSBuildTest/MSBuildWorkspaceTests.cs @@ -25,8 +25,8 @@ using Roslyn.Test.Utilities; using Roslyn.Utilities; using Xunit; -using static Microsoft.CodeAnalysis.CSharp.LanguageVersionFacts; using static Microsoft.CodeAnalysis.MSBuild.UnitTests.SolutionGeneration; +using static Microsoft.CodeAnalysis.CSharp.LanguageVersionFacts; using CS = Microsoft.CodeAnalysis.CSharp; using VB = Microsoft.CodeAnalysis.VisualBasic; diff --git a/src/Workspaces/Remote/Core/SolutionAssetProvider.cs b/src/Workspaces/Remote/Core/SolutionAssetProvider.cs index c59a0d7d115a1..5323a236e5866 100644 --- a/src/Workspaces/Remote/Core/SolutionAssetProvider.cs +++ b/src/Workspaces/Remote/Core/SolutionAssetProvider.cs @@ -15,8 +15,8 @@ using Microsoft.CodeAnalysis.Host; using Microsoft.CodeAnalysis.Serialization; using Microsoft.VisualStudio.Threading; -using Nerdbank.Streams; using Roslyn.Utilities; +using Nerdbank.Streams; namespace Microsoft.CodeAnalysis.Remote { diff --git a/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.SolutionCreator.cs b/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.SolutionCreator.cs index 054563ce21b23..b1e4b22cebb2a 100644 --- a/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.SolutionCreator.cs +++ b/src/Workspaces/Remote/ServiceHub/Host/RemoteWorkspace.SolutionCreator.cs @@ -2,19 +2,19 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.CodeAnalysis.ErrorReporting; -using Microsoft.CodeAnalysis.Host; -using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Serialization; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +using System; +using Microsoft.CodeAnalysis.Options; +using Microsoft.CodeAnalysis.ErrorReporting; +using Microsoft.CodeAnalysis.Host; namespace Microsoft.CodeAnalysis.Remote { diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Formatting/CSharpFormattingOptions2.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Formatting/CSharpFormattingOptions2.cs index b8832955c6c92..cc4d342d9f158 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Formatting/CSharpFormattingOptions2.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Formatting/CSharpFormattingOptions2.cs @@ -4,8 +4,8 @@ using System.Collections.Immutable; using System.Diagnostics; -using Microsoft.CodeAnalysis.Options; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.Options; #if CODE_STYLE using CSharpWorkspaceResources = Microsoft.CodeAnalysis.CSharp.CSharpCodeStyleResources; diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/FormattingOptions2.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/FormattingOptions2.cs index 54a99aa74136d..3e3a9dc2fbfe0 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/FormattingOptions2.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/FormattingOptions2.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Immutable; -using Microsoft.CodeAnalysis.Options; using Roslyn.Utilities; +using Microsoft.CodeAnalysis.Options; #if CODE_STYLE using WorkspacesResources = Microsoft.CodeAnalysis.CodeStyleResources; diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/Rules/Operations/FormattingOperations.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/Rules/Operations/FormattingOperations.cs index 08be1a345bb7c..2bc00ddbaf6b1 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/Rules/Operations/FormattingOperations.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Formatting/Rules/Operations/FormattingOperations.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; -using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Shared.Utilities; using Microsoft.CodeAnalysis.Text; +using Microsoft.CodeAnalysis.Diagnostics; namespace Microsoft.CodeAnalysis.Formatting.Rules { diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/AbstractDocumentationCommentService.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/AbstractDocumentationCommentService.cs index 1a8840ef9e32d..4f08f053b65bf 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/AbstractDocumentationCommentService.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Services/SyntaxFacts/AbstractDocumentationCommentService.cs @@ -6,9 +6,9 @@ using System.Diagnostics; using System.Linq; -using System.Text; using System.Threading; using Roslyn.Utilities; +using System.Text; namespace Microsoft.CodeAnalysis.LanguageServices { diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/BKTree.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/BKTree.cs index 4004feae54eb1..4cabf69b29df9 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/BKTree.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Utilities/BKTree.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Utilities; +using System; namespace Roslyn.Utilities { diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ContextQuery/SyntaxTreeExtensions.vb b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ContextQuery/SyntaxTreeExtensions.vb index 430998296ed06..610820363645e 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ContextQuery/SyntaxTreeExtensions.vb +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ContextQuery/SyntaxTreeExtensions.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System.Runtime.CompilerServices -Imports System.Threading Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.Utilities +Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions.ContextQuery Friend Module SyntaxTreeExtensions diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ParameterSyntaxExtensions.vb b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ParameterSyntaxExtensions.vb index ccc67843337a2..b5331f3297c29 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ParameterSyntaxExtensions.vb +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ParameterSyntaxExtensions.vb @@ -3,9 +3,9 @@ ' See the LICENSE file in the project root for more information. Imports System.Runtime.CompilerServices -Imports System.Threading Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.Utilities +Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions Friend Module ParameterSyntaxExtensions diff --git a/src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicCodeGenerationServiceFactory.vb b/src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicCodeGenerationServiceFactory.vb index 04bf283872943..ca86268e822da 100644 --- a/src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicCodeGenerationServiceFactory.vb +++ b/src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicCodeGenerationServiceFactory.vb @@ -2,10 +2,10 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports System.Composition -Imports Microsoft.CodeAnalysis.CodeGeneration Imports Microsoft.CodeAnalysis.Host Imports Microsoft.CodeAnalysis.Host.Mef +Imports Microsoft.CodeAnalysis.CodeGeneration +Imports System.Composition Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGeneration diff --git a/src/Workspaces/VisualBasic/Portable/Extensions/SemanticModelExtensions.vb b/src/Workspaces/VisualBasic/Portable/Extensions/SemanticModelExtensions.vb index f04026d8e8bad..7d59fb71e21f1 100644 --- a/src/Workspaces/VisualBasic/Portable/Extensions/SemanticModelExtensions.vb +++ b/src/Workspaces/VisualBasic/Portable/Extensions/SemanticModelExtensions.vb @@ -8,8 +8,8 @@ Imports System.Threading Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.Diagnostics.Analyzers.NamingStyles Imports Microsoft.CodeAnalysis.Utilities -Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Microsoft.CodeAnalysis.VisualBasic.LanguageServices Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions Partial Friend Module SemanticModelExtensions diff --git a/src/Workspaces/VisualBasic/Portable/Serialization/VisualBasicOptionsSerializationService.vb b/src/Workspaces/VisualBasic/Portable/Serialization/VisualBasicOptionsSerializationService.vb index 5f8cad0a1341f..7d57111fce0ca 100644 --- a/src/Workspaces/VisualBasic/Portable/Serialization/VisualBasicOptionsSerializationService.vb +++ b/src/Workspaces/VisualBasic/Portable/Serialization/VisualBasicOptionsSerializationService.vb @@ -5,8 +5,8 @@ Imports System.Collections.Immutable Imports System.Composition Imports System.Threading -Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.CodeAnalysis.Serialization +Imports Microsoft.CodeAnalysis.Host.Mef Namespace Microsoft.CodeAnalysis.VisualBasic.Serialization diff --git a/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.Expander.vb b/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.Expander.vb index bd16c7c09dce2..0fb536a4880ed 100644 --- a/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.Expander.vb +++ b/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.Expander.vb @@ -5,9 +5,9 @@ Imports System.Threading Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.Simplification -Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.ContextQuery Imports Microsoft.CodeAnalysis.VisualBasic.Syntax Imports Microsoft.CodeAnalysis.VisualBasic.Utilities +Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.ContextQuery Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification Partial Friend Class VisualBasicSimplificationService diff --git a/src/Workspaces/VisualBasicTest/OrganizeImports/OrganizeImportsTests.vb b/src/Workspaces/VisualBasicTest/OrganizeImports/OrganizeImportsTests.vb index a0f6abcac81bd..c70ebd02137dc 100644 --- a/src/Workspaces/VisualBasicTest/OrganizeImports/OrganizeImportsTests.vb +++ b/src/Workspaces/VisualBasicTest/OrganizeImports/OrganizeImportsTests.vb @@ -5,12 +5,12 @@ Imports System.Threading Imports Microsoft.CodeAnalysis.Editing Imports Microsoft.CodeAnalysis.Formatting -Imports Microsoft.CodeAnalysis.Options -Imports Microsoft.CodeAnalysis.[Shared].Extensions Imports Microsoft.CodeAnalysis.Test.Utilities Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.Options Imports Roslyn.Test.Utilities Imports Xunit +Imports Microsoft.CodeAnalysis.[Shared].Extensions Namespace Microsoft.CodeAnalysis.VisualBasic.Workspaces.UnitTests.OrganizeImports <[UseExportProvider]> diff --git a/src/Workspaces/VisualBasicTest/VisualBasicExtensionsTests.vb b/src/Workspaces/VisualBasicTest/VisualBasicExtensionsTests.vb index 0e24ae1e2d0e9..91f875cafeea6 100644 --- a/src/Workspaces/VisualBasicTest/VisualBasicExtensionsTests.vb +++ b/src/Workspaces/VisualBasicTest/VisualBasicExtensionsTests.vb @@ -3,10 +3,10 @@ ' See the LICENSE file in the project root for more information. Imports System.Text -Imports System.Threading -Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.SyntaxTreeExtensions Imports Roslyn.Test.Utilities Imports Xunit +Imports Microsoft.CodeAnalysis.VisualBasic.Extensions.SyntaxTreeExtensions +Imports System.Threading Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests From abce41d282ac631be5217140f1bd46d0e250ad02 Mon Sep 17 00:00:00 2001 From: Andrew Hall Date: Fri, 18 Jun 2021 15:01:48 -0700 Subject: [PATCH 16/24] dotnet-format -w Roslyn.sln --- src/Compilers/CSharp/Portable/Binder/MethodArgumentInfo.cs | 2 +- .../Core/Portable/InternalUtilities/IsExternalInit.cs | 2 +- .../Core/Portable/InternalUtilities/SpanUtilities.cs | 2 +- ...ntrolFlowGraphBuilder.ConditionalAccessOperationTracker.cs | 2 +- .../Core/Portable/Operations/Operation.Enumerable.cs | 2 +- src/Compilers/Core/Portable/Operations/OperationMapBuilder.cs | 2 +- .../Api/IVSTypeScriptFormattingInteractionService.cs | 2 +- .../VSTypeScript/VSTypeScriptFormattingInteractionService.cs | 2 +- src/Features/Core/Portable/CodeCleanup/DiagnosticSet.cs | 2 +- .../Portable/MetadataAsSource/MetadataAsSourceFileService.cs | 2 +- .../Impl/LanguageService/CSharpCodeCleanupFixerProvider.cs | 4 ++-- .../LanguageService/VisualBasicCodeCleanupFixerProvider.vb | 4 ++-- .../Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs | 2 +- .../MSBuild/MSBuildProjectLoader.Worker_ResolveReferences.cs | 2 +- src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.cs | 2 +- src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/Extensions.cs | 2 +- src/Workspaces/Core/MSBuild/MSBuild/ProjectMap.cs | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Compilers/CSharp/Portable/Binder/MethodArgumentInfo.cs b/src/Compilers/CSharp/Portable/Binder/MethodArgumentInfo.cs index 5e742d84d72a7..b8a2f76c02e53 100644 --- a/src/Compilers/CSharp/Portable/Binder/MethodArgumentInfo.cs +++ b/src/Compilers/CSharp/Portable/Binder/MethodArgumentInfo.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/Core/Portable/InternalUtilities/IsExternalInit.cs b/src/Compilers/Core/Portable/InternalUtilities/IsExternalInit.cs index 19138060ce89d..7d1e003609644 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/IsExternalInit.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/IsExternalInit.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/Core/Portable/InternalUtilities/SpanUtilities.cs b/src/Compilers/Core/Portable/InternalUtilities/SpanUtilities.cs index 98b512186e329..78b7a1d66c43d 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/SpanUtilities.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/SpanUtilities.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/Core/Portable/Operations/ControlFlowGraphBuilder.ConditionalAccessOperationTracker.cs b/src/Compilers/Core/Portable/Operations/ControlFlowGraphBuilder.ConditionalAccessOperationTracker.cs index d51ad4e5303cf..f3f77c8bfdb6c 100644 --- a/src/Compilers/Core/Portable/Operations/ControlFlowGraphBuilder.ConditionalAccessOperationTracker.cs +++ b/src/Compilers/Core/Portable/Operations/ControlFlowGraphBuilder.ConditionalAccessOperationTracker.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/Core/Portable/Operations/Operation.Enumerable.cs b/src/Compilers/Core/Portable/Operations/Operation.Enumerable.cs index 84e466976926e..a0e1ef8b253dd 100644 --- a/src/Compilers/Core/Portable/Operations/Operation.Enumerable.cs +++ b/src/Compilers/Core/Portable/Operations/Operation.Enumerable.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Compilers/Core/Portable/Operations/OperationMapBuilder.cs b/src/Compilers/Core/Portable/Operations/OperationMapBuilder.cs index e3beda6e9cfb3..7a31dcb0fcc12 100644 --- a/src/Compilers/Core/Portable/Operations/OperationMapBuilder.cs +++ b/src/Compilers/Core/Portable/Operations/OperationMapBuilder.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/Api/IVSTypeScriptFormattingInteractionService.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/Api/IVSTypeScriptFormattingInteractionService.cs index bdcff8b3229bc..8b6f154e38c29 100644 --- a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/Api/IVSTypeScriptFormattingInteractionService.cs +++ b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/Api/IVSTypeScriptFormattingInteractionService.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFormattingInteractionService.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFormattingInteractionService.cs index d4b2ab1481110..6a6bb7990ca23 100644 --- a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFormattingInteractionService.cs +++ b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptFormattingInteractionService.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Features/Core/Portable/CodeCleanup/DiagnosticSet.cs b/src/Features/Core/Portable/CodeCleanup/DiagnosticSet.cs index 79843492db80d..29fd7b4dbd97e 100644 --- a/src/Features/Core/Portable/CodeCleanup/DiagnosticSet.cs +++ b/src/Features/Core/Portable/CodeCleanup/DiagnosticSet.cs @@ -21,4 +21,4 @@ public DiagnosticSet(string description, params string[] diagnosticIds) DiagnosticIds = ImmutableArray.Create(diagnosticIds); } } -} \ No newline at end of file +} diff --git a/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs b/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs index d3187efe61d82..b05633d3cf97f 100644 --- a/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs +++ b/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceFileService.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/VisualStudio/CSharp/Impl/LanguageService/CSharpCodeCleanupFixerProvider.cs b/src/VisualStudio/CSharp/Impl/LanguageService/CSharpCodeCleanupFixerProvider.cs index 93823b5ae6970..45b98a5af483a 100644 --- a/src/VisualStudio/CSharp/Impl/LanguageService/CSharpCodeCleanupFixerProvider.cs +++ b/src/VisualStudio/CSharp/Impl/LanguageService/CSharpCodeCleanupFixerProvider.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -26,4 +26,4 @@ public CSharpCodeCleanUpFixerProvider( { } } -} \ No newline at end of file +} diff --git a/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicCodeCleanupFixerProvider.vb b/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicCodeCleanupFixerProvider.vb index d1df51e52f392..850c805e40da7 100644 --- a/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicCodeCleanupFixerProvider.vb +++ b/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicCodeCleanupFixerProvider.vb @@ -1,4 +1,4 @@ -' Licensed to the .NET Foundation under one or more agreements. +' Licensed to the .NET Foundation under one or more agreements. ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. @@ -23,4 +23,4 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeCleanup MyBase.New(codeCleanUpFixers) End Sub End Class -End Namespace \ No newline at end of file +End Namespace diff --git a/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs b/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs index f1c98c4de478f..d08e55cfcf188 100644 --- a/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs +++ b/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker_ResolveReferences.cs b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker_ResolveReferences.cs index cd64608f7bc44..5b1c167ea3511 100644 --- a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker_ResolveReferences.cs +++ b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker_ResolveReferences.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.cs b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.cs index ad504f88f359a..2f323d373ff82 100644 --- a/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.cs +++ b/src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/Extensions.cs b/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/Extensions.cs index eec1823393a06..a21ee61b0a180 100644 --- a/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/Extensions.cs +++ b/src/Workspaces/Core/MSBuild/MSBuild/ProjectFile/Extensions.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/src/Workspaces/Core/MSBuild/MSBuild/ProjectMap.cs b/src/Workspaces/Core/MSBuild/MSBuild/ProjectMap.cs index cae640133d341..242809c13f33d 100644 --- a/src/Workspaces/Core/MSBuild/MSBuild/ProjectMap.cs +++ b/src/Workspaces/Core/MSBuild/MSBuild/ProjectMap.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. From dc88b2276da2654052a8cd7de9af389bcd155465 Mon Sep 17 00:00:00 2001 From: Andrew Hall Date: Fri, 18 Jun 2021 15:02:29 -0700 Subject: [PATCH 17/24] update ignore-revs file to latest change --- .git-blame-ignore-revs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index dfb46f6f9249f..efdda18ee9aca 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,2 @@ # Dotnet-format -w Roslyn.sln -57278e7dcbf7bffb310e8b14105f657f0fdbab78 \ No newline at end of file +abce41d282ac631be5217140f1bd46d0e250ad02 From 49aff9367793e1a55099a5b87630866ed82972f3 Mon Sep 17 00:00:00 2001 From: tmat Date: Tue, 22 Jun 2021 11:30:48 -0700 Subject: [PATCH 18/24] HasChangesAsync may be called outside of the debugging session --- .../ManagedEditAndContinueLanguageService.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/VisualStudio/Core/Def/Implementation/EditAndContinue/ManagedEditAndContinueLanguageService.cs b/src/VisualStudio/Core/Def/Implementation/EditAndContinue/ManagedEditAndContinueLanguageService.cs index 663e1bc86c070..10f0351999e98 100644 --- a/src/VisualStudio/Core/Def/Implementation/EditAndContinue/ManagedEditAndContinueLanguageService.cs +++ b/src/VisualStudio/Core/Def/Implementation/EditAndContinue/ManagedEditAndContinueLanguageService.cs @@ -186,9 +186,15 @@ public async Task HasChangesAsync(string? sourceFilePath, CancellationToke { try { + var debuggingSession = _debuggingSession; + if (debuggingSession == null) + { + return false; + } + var solution = GetCurrentCompileTimeSolution(); var activeStatementSpanProvider = GetActiveStatementSpanProvider(solution); - return await GetDebuggingSession().HasChangesAsync(solution, activeStatementSpanProvider, sourceFilePath, cancellationToken).ConfigureAwait(false); + return await debuggingSession.HasChangesAsync(solution, activeStatementSpanProvider, sourceFilePath, cancellationToken).ConfigureAwait(false); } catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e, cancellationToken)) { From 519bf81da3eb1fc715d0c052d36901446e071067 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Jun 2021 13:53:46 +0000 Subject: [PATCH 19/24] [main] Update dependencies from dotnet/source-build (#54243) [main] Update dependencies from dotnet/source-build --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cb19c5392dbc..b42d8c8d6b619 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,9 +6,9 @@ 7e80445ee82adbf9a8e6ae601ac5e239d982afaa - + https://github.com/dotnet/source-build - 3fb25b8db3bec654e37e71a5b2b7fde14444bc2f + c35d744cbe24f85d2165a5edb1730355b8cb916f From 9193177d59a72a4cb4ecc402f3258fdf688673e1 Mon Sep 17 00:00:00 2001 From: Bernd Baumanns Date: Thu, 24 Jun 2021 20:02:16 +0200 Subject: [PATCH 20/24] Bugfix: GetAwaitExpressionInfo ignores BoundConversion (#54296) fixes #54298 Bugfix to handle "BoundConversion" --- .../Compilation/MemberSemanticModel.cs | 2 +- .../Semantics/AwaitExpressionTests.cs | 79 +++++++++++++++++++ 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.cs b/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.cs index 85c6f95ffd137..a106610962e31 100644 --- a/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.cs +++ b/src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.cs @@ -899,7 +899,7 @@ public override AwaitExpressionInfo GetAwaitExpressionInfo(AwaitExpressionSyntax throw new ArgumentException("node.Kind==" + node.Kind()); } - var bound = GetUpperBoundNode(node); + var bound = GetLowerBoundNode(node); BoundAwaitableInfo awaitableInfo = (((bound as BoundExpressionStatement)?.Expression ?? bound) as BoundAwaitExpression)?.AwaitableInfo; if (awaitableInfo == null) { diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/AwaitExpressionTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/AwaitExpressionTests.cs index ff547024e3d84..dd27e4aff990f 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/AwaitExpressionTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/AwaitExpressionTests.cs @@ -20,6 +20,85 @@ namespace Microsoft.CodeAnalysis.CSharp.UnitTests /// public class AwaitExpressionTests : CompilingTestBase { + [Fact] + public void TestAwaitInfoExtensionMethod() + { + var text = +@"using System; +using System.Runtime.CompilerServices; +using System.Threading.Tasks; + +static class App{ + public static async Task Main(){ + var x = new MyAwaitable(); + x.SetValue(42); + + Console.WriteLine(await x + ""!""); + } +} + +struct MyAwaitable +{ + private ValueTask task; + private TaskCompletionSource source; + + private TaskCompletionSource Source + { + get + { + if (source == null) + { + source = new TaskCompletionSource(); + task = new ValueTask(source.Task); + } + return source; + } + } + internal ValueTask Task + { + get + { + _ = Source; + return task; + } + } + + public void SetValue(int i) + { + Source.SetResult(i); + } +} + +static class MyAwaitableExtension +{ + public static System.Runtime.CompilerServices.ValueTaskAwaiter GetAwaiter(this MyAwaitable a) + { + return a.Task.GetAwaiter(); + } +}"; + + var csCompilation = CreateCompilation(text, targetFramework: TargetFramework.NetCoreAppAndCSharp); + var tree = csCompilation.SyntaxTrees.Single(); + + var model = csCompilation.GetSemanticModel(tree); + var awaitExpression = tree.GetRoot().DescendantNodes().OfType().First(); + Assert.Equal("await x", awaitExpression.ToString()); + + var info = model.GetAwaitExpressionInfo(awaitExpression); + Assert.Equal( + "System.Runtime.CompilerServices.ValueTaskAwaiter MyAwaitableExtension.GetAwaiter(this MyAwaitable a)", + info.GetAwaiterMethod.ToTestDisplayString() + ); + Assert.Equal( + "System.Int32 System.Runtime.CompilerServices.ValueTaskAwaiter.GetResult()", + info.GetResultMethod.ToTestDisplayString() + ); + Assert.Equal( + "System.Boolean System.Runtime.CompilerServices.ValueTaskAwaiter.IsCompleted { get; }", + info.IsCompletedProperty.ToTestDisplayString() + ); + } + [Fact] [WorkItem(711413, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/711413")] public void TestAwaitInfo() From 9e30164a1ea97f6f18d48743b05ec68f09fba301 Mon Sep 17 00:00:00 2001 From: Julien Couvreur Date: Thu, 24 Jun 2021 15:39:38 -0700 Subject: [PATCH 21/24] Add LanguageVersion 10 (#54359) --- docs/Language Feature Status.md | 19 +++-- .../CSharp/Portable/CSharpResources.resx | 3 + .../CSharp/Portable/Errors/ErrorCode.cs | 1 + .../CSharp/Portable/Errors/MessageID.cs | 13 +-- .../CSharp/Portable/LanguageVersion.cs | 40 ++++++++- .../CSharp/Portable/PublicAPI.Unshipped.txt | 1 + .../Portable/xlf/CSharpResources.cs.xlf | 5 ++ .../Portable/xlf/CSharpResources.de.xlf | 5 ++ .../Portable/xlf/CSharpResources.es.xlf | 5 ++ .../Portable/xlf/CSharpResources.fr.xlf | 5 ++ .../Portable/xlf/CSharpResources.it.xlf | 5 ++ .../Portable/xlf/CSharpResources.ja.xlf | 5 ++ .../Portable/xlf/CSharpResources.ko.xlf | 5 ++ .../Portable/xlf/CSharpResources.pl.xlf | 5 ++ .../Portable/xlf/CSharpResources.pt-BR.xlf | 5 ++ .../Portable/xlf/CSharpResources.ru.xlf | 5 ++ .../Portable/xlf/CSharpResources.tr.xlf | 5 ++ .../Portable/xlf/CSharpResources.zh-Hans.xlf | 5 ++ .../Portable/xlf/CSharpResources.zh-Hant.xlf | 5 ++ .../Test/CommandLine/CommandLineTests.cs | 17 ++-- .../Attributes/AttributeTests_Locations.cs | 4 +- .../CodeGenAsyncMethodBuilderOverrideTests.cs | 74 ++++++++-------- .../Emit/CodeGen/CodeGenDeconstructTests.cs | 40 ++++----- .../Emit/CodeGen/CodeGenTupleEqualityTests.cs | 47 ++++++----- .../Test/Semantic/Semantics/BindingTests.cs | 3 - .../Test/Semantic/Semantics/ConstantTests.cs | 68 +++++++-------- .../Semantic/Semantics/DelegateTypeTests.cs | 70 ++++++++-------- .../Semantics/GlobalUsingDirectiveTests.cs | 22 +++-- .../Semantics/InheritanceBindingTests.cs | 6 +- .../Semantics/LambdaDiscardParametersTests.cs | 10 +-- .../Test/Semantic/Semantics/LambdaTests.cs | 40 ++++----- .../Semantics/NullableReferenceTypesTests.cs | 10 +-- .../Semantics/PatternMatchingTests5.cs | 8 +- .../Semantic/Semantics/RecordStructTests.cs | 52 ++++++------ .../Test/Semantic/Semantics/RecordTests.cs | 84 +++++++++---------- .../SourceGeneration/GeneratorDriverTests.cs | 6 +- .../SourceGeneration/StateTableTests.cs | 2 +- .../Symbol/Compilation/CompilationAPITests.cs | 4 +- .../Symbol/Compilation/UsedAssembliesTests.cs | 2 +- .../Symbol/DocumentationComments/CrefTests.cs | 4 +- .../SymbolDisplay/SymbolDisplayTests.cs | 4 +- .../DefaultInterfaceImplementationTests.cs | 49 ++++++----- .../Symbol/Symbols/ExtensionMethodTests.cs | 6 +- .../Syntax/LexicalAndXml/PreprocessorTests.cs | 6 +- .../Syntax/Parsing/DeconstructionTests.cs | 12 +-- .../Syntax/Parsing/PatternParsingTests2.cs | 8 +- .../Test/Syntax/Parsing/RecordParsing.cs | 26 +++--- .../Test/Syntax/Syntax/SyntaxTreeTests.cs | 32 +++---- .../MSBuildTask/Microsoft.CSharp.Core.targets | 4 + .../Core/MSBuildTaskTests/TargetTests.cs | 6 +- .../Test/Utilities/CSharp/CSharpTestBase.cs | 4 +- .../Test/Utilities/CSharp/TestOptions.cs | 8 ++ .../UpgradeProject/UpgradeProjectTests.cs | 30 ++++++- .../CSharpUpgradeProjectCodeFixProvider.cs | 1 + .../Extensions/LanguageVersionExtensions.cs | 2 +- 55 files changed, 543 insertions(+), 370 deletions(-) diff --git a/docs/Language Feature Status.md b/docs/Language Feature Status.md index 9ceeaa6f364df..777022a51399b 100644 --- a/docs/Language Feature Status.md +++ b/docs/Language Feature Status.md @@ -10,27 +10,32 @@ efforts behind them. | Feature | Branch | State | Developer | Reviewer | LDM Champ | | ------- | ------ | ----- | --------- | -------- | --------- | -| [Record structs](https://github.com/dotnet/csharplang/issues/4334) | [record-structs](https://github.com/dotnet/roslyn/tree/features/record-structs) | [Merged into 16.11](https://github.com/dotnet/roslyn/issues/51199) | [jcouv](https://github.com/jcouv) | [AlekseyTs](https://github.com/AlekseyTs), [RikkiGibson](https://github.com/RikkiGibson) | [jcouv](https://github.com/jcouv) | -| [Global Using Directive](https://github.com/dotnet/csharplang/issues/3428) | [GlobalUsingDirective](https://github.com/dotnet/roslyn/tree/features/GlobalUsingDirective) | [Merged into 16.11](https://github.com/dotnet/roslyn/issues/51307) | [AlekseyTs](https://github.com/AlekseyTs) | [333fred](https://github.com/333fred), [cston](https://github.com/cston) | [AlekseyTs](https://github.com/AlekseyTs) | | [Static Abstract Members In Interfaces](https://github.com/dotnet/csharplang/issues/4436) | [StaticAbstractMembersInInterfaces](https://github.com/dotnet/roslyn/tree/features/StaticAbstractMembersInInterfaces) | [In Progress](https://github.com/dotnet/roslyn/issues/52221) | [AlekseyTs](https://github.com/AlekseyTs) | [333fred](https://github.com/333fred), [RikkiGibson](https://github.com/RikkiGibson) | [MadsTorgersen](https://github.com/MadsTorgersen) | | [File-scoped namespace](https://github.com/dotnet/csharplang/issues/137) | [FileScopedNamespaces](https://github.com/dotnet/roslyn/tree/features/FileScopedNamespaces) | [In Progress](https://github.com/dotnet/roslyn/issues/49000) | [RikkiGibson](https://github.com/RikkiGibson) | [jcouv](https://github.com/jcouv), [chsienki](https://github.com/chsienki) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | | [Interpolated string improvements](https://github.com/dotnet/csharplang/issues/4487) | [interpolated-string](https://github.com/dotnet/roslyn/tree/features/interpolated-string) | [In Progress](https://github.com/dotnet/roslyn/issues/51499) | [333fred](https://github.com/333fred) | [AlekseyTs](https://github.com/AlekseyTs), [chsienki](https://github.com/chsienki) | [jaredpar](https://github.com/jaredpar) | | [Parameterless struct constructors](https://github.com/dotnet/csharplang/issues/99) | [struct-ctors](https://github.com/dotnet/roslyn/tree/features/struct-ctors) | [In Progress](https://github.com/dotnet/roslyn/issues/51698) | [cston](https://github.com/cston) | [jcouv](https://github.com/jcouv), [333fred](https://github.com/333fred) | [jcouv](https://github.com/jouv) | | [Lambda improvements](https://github.com/dotnet/csharplang/blob/main/proposals/lambda-improvements.md) | [lambdas](https://github.com/dotnet/roslyn/tree/features/lambdas) | [In Progress](https://github.com/dotnet/roslyn/issues/52192) | [cston](https://github.com/cston) | [333fred](https://github.com/333fred), [jcouv](https://github.com/jcouv) | [jaredpar](https://github.com/jaredpar) | | [nameof(parameter)](https://github.com/dotnet/csharplang/issues/373) | main | [In Progress](https://github.com/dotnet/roslyn/issues/40524) | [jcouv](https://github.com/jcouv) | TBD | [jcouv](https://github.com/jcouv) | -| [Improved Definite Assignment](https://github.com/dotnet/csharplang/issues/4465) | [improved-definite-assignment](https://github.com/dotnet/roslyn/tree/features/improved-definite-assignment) | [Merged into 17.0](https://github.com/dotnet/roslyn/issues/51463) | [RikkiGibson](https://github.com/RikkiGibson) | [jcouv](https://github.com/jcouv) | [jaredpar](https://github.com/jaredpar) | | [Relax ordering of `ref` and `partial` modifiers](https://github.com/dotnet/csharplang/issues/946) | [ref-partial](https://github.com/dotnet/roslyn/tree/features/ref-partial) | In Progress | [alrz](https://github.com/alrz) | [gafter](https://github.com/gafter) | [jcouv](https://github.com/jcouv) | | [Parameter null-checking](https://github.com/dotnet/csharplang/issues/2145) | [param-nullchecking](https://github.com/dotnet/roslyn/tree/features/param-nullchecking) | [In Progress](https://github.com/dotnet/roslyn/issues/36024) | [fayrose](https://github.com/fayrose) | [agocke](https://github.com/agocke) | [jaredpar](https://github.com/jaredpar) | | [Caller expression attribute](https://github.com/dotnet/csharplang/issues/287) | [caller-argument-expression](https://github.com/dotnet/roslyn/tree/features/caller-argument-expression) | [In Progress](https://github.com/dotnet/roslyn/issues/52745) | [Youssef1313](https://github.com/Youssef1313) | [333fred](https://github.com/333fred),[AlekseyTs](https://github.com/AlekseyTs) | [jcouv](https://github.com/jcouv) | | [Generic attributes](https://github.com/dotnet/csharplang/issues/124) | [generic-attributes](https://github.com/dotnet/roslyn/tree/features/generic-attributes) | [In Progress](https://github.com/dotnet/roslyn/issues/36285) | [AviAvni](https://github.com/AviAvni) | [agocke](https://github.com/agocke) | [mattwar](https://github.com/mattwar) | | [Default in deconstruction](https://github.com/dotnet/roslyn/pull/25562) | [decon-default](https://github.com/dotnet/roslyn/tree/features/decon-default) | [Implemented](https://github.com/dotnet/roslyn/issues/25559) | [jcouv](https://github.com/jcouv) | [gafter](https://github.com/gafter) | [jcouv](https://github.com/jcouv) | -| [Constant Interpolated Strings](https://github.com/dotnet/csharplang/issues/2951) | main | [Merged into 16.9p3](https://github.com/dotnet/roslyn/pull/49676) | [kevinsun-dev](https://github.com/kevinsun-dev) | [333fred](https://github.com/333fred) | [jaredar](https://github.com/jaredpar), [agocke](https://github.com/agocke) | -| [Mix declarations and variables in deconstruction](https://github.com/dotnet/csharplang/issues/125) | main | [Merged into 16.10](https://github.com/dotnet/roslyn/issues/47746) | [YairHalberstadt ](https://github.com/YairHalberstadt) | [jcouv](https://github.com/jcouv) | [MadsTorgersen](https://github.com/MadsTorgersen) | | [List patterns](https://github.com/dotnet/csharplang/issues/3435) | [list-patterns](https://github.com/dotnet/roslyn/tree/features/list-patterns) | [In Progress](https://github.com/dotnet/roslyn/issues/51289) | [alrz](https://github.com/alrz) | [jcouv](https://github.com/jcouv), [333fred](https://github.com/333fred) | [333fred](https://github.com/333fred) | + +# C# 10.0 + +| Feature | Branch | State | Developer | Reviewer | LDM Champ | +| ------- | ------ | ----- | --------- | -------- | --------- | +| [Record structs](https://github.com/dotnet/csharplang/issues/4334) | [record-structs](https://github.com/dotnet/roslyn/tree/features/record-structs) | [Merged into 16.11](https://github.com/dotnet/roslyn/issues/51199) | [jcouv](https://github.com/jcouv) | [AlekseyTs](https://github.com/AlekseyTs), [RikkiGibson](https://github.com/RikkiGibson) | [jcouv](https://github.com/jcouv) | +| [Global Using Directive](https://github.com/dotnet/csharplang/issues/3428) | [GlobalUsingDirective](https://github.com/dotnet/roslyn/tree/features/GlobalUsingDirective) | [Merged into 16.11](https://github.com/dotnet/roslyn/issues/51307) | [AlekseyTs](https://github.com/AlekseyTs) | [333fred](https://github.com/333fred), [cston](https://github.com/cston) | [AlekseyTs](https://github.com/AlekseyTs) | +| [Improved Definite Assignment](https://github.com/dotnet/csharplang/issues/4465) | [improved-definite-assignment](https://github.com/dotnet/roslyn/tree/features/improved-definite-assignment) | [Merged into 17.0](https://github.com/dotnet/roslyn/issues/51463) | [RikkiGibson](https://github.com/RikkiGibson) | [jcouv](https://github.com/jcouv) | [jaredpar](https://github.com/jaredpar) | +| [Constant Interpolated Strings](https://github.com/dotnet/csharplang/issues/2951) | main | [Merged into 16.9p3](https://github.com/dotnet/roslyn/pull/49676) | [kevinsun-dev](https://github.com/kevinsun-dev) | [333fred](https://github.com/333fred) | [jaredar](https://github.com/jaredpar), [agocke](https://github.com/agocke) | | [Extended property patterns](https://github.com/dotnet/csharplang/issues/4394) | [extended-property-patterns](https://github.com/dotnet/roslyn/tree/features/extended-property-patterns) | [Merged into 17.0](https://github.com/dotnet/roslyn/issues/52468) | [alrz](https://github.com/alrz) | [jcouv](https://github.com/jcouv), [333fred](https://github.com/333fred) | [333fred](https://github.com/333fred) | | [Sealed record ToString](https://github.com/dotnet/csharplang/issues/4174) | main | [Merged](https://github.com/dotnet/roslyn/issues/52031) | [thomaslevesque](https://github.com/thomaslevesque/) | [jcouv](https://github.com/jcouv) | [333fred](https://github.com/333fred) | -| [Source Generator V2 APIs](https://github.com/dotnet/roslyn/issues/51257) | [features/source-generators](https://github.com/dotnet/roslyn/tree/features/source-generators) | [In Progress](https://github.com/dotnet/roslyn/issues/51257) | [chsienki](https://github.com/chsienki/) | [rikkigibson](https://github.com/rikkigibson), [jaredpar](https://github.com/jaredpar), [cston](https://github.com/cston) | N/A | -| [Async method builder override](https://github.com/dotnet/csharplang/issues/1407) | main | [In Progress](https://github.com/dotnet/roslyn/issues/51999) | [jcouv](https://github.com/jcouv) | TBD | [stephentoub](https://github.com/stephentoub) | +| [Source Generator V2 APIs](https://github.com/dotnet/roslyn/issues/51257) | [features/source-generators](https://github.com/dotnet/roslyn/tree/features/source-generators) | [Merged into 17.0p2](https://github.com/dotnet/roslyn/issues/51257) | [chsienki](https://github.com/chsienki/) | [rikkigibson](https://github.com/rikkigibson), [jaredpar](https://github.com/jaredpar), [cston](https://github.com/cston) | N/A | +| [Mix declarations and variables in deconstruction](https://github.com/dotnet/csharplang/issues/125) | main | [Merged into 16.10](https://github.com/dotnet/roslyn/issues/47746) | [YairHalberstadt ](https://github.com/YairHalberstadt) | [jcouv](https://github.com/jcouv) | [MadsTorgersen](https://github.com/MadsTorgersen) | +| [Async method builder override](https://github.com/dotnet/csharplang/issues/1407) | main | [Merged into 17.0p2](https://github.com/dotnet/roslyn/issues/51999) | [jcouv](https://github.com/jcouv) | [cston](https://github.com/cston), [RikkiGibson](https://github.com/RikkiGibson) | [stephentoub](https://github.com/stephentoub) | # VB 16.9 diff --git a/src/Compilers/CSharp/Portable/CSharpResources.resx b/src/Compilers/CSharp/Portable/CSharpResources.resx index 101de6a04cc5a..32905cab47ea7 100644 --- a/src/Compilers/CSharp/Portable/CSharpResources.resx +++ b/src/Compilers/CSharp/Portable/CSharpResources.resx @@ -6418,6 +6418,9 @@ To remove the warning, you can use /reference instead (set the Embed Interop Typ Feature '{0}' is not available in C# 9.0. Please use language version {1} or greater. + + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + Unexpected argument list. diff --git a/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs b/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs index 14dccabc41a11..cba2c6db59896 100644 --- a/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs +++ b/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs @@ -1958,6 +1958,7 @@ internal enum ErrorCode HDN_DuplicateWithGlobalUsing = 8933, ERR_CantConvAnonMethReturnType = 8934, ERR_BuilderAttributeDisallowed = 8935, + ERR_FeatureNotAvailableInVersion10 = 8936, #endregion diff --git a/src/Compilers/CSharp/Portable/Errors/MessageID.cs b/src/Compilers/CSharp/Portable/Errors/MessageID.cs index f546e04f67af6..6523f5d3323aa 100644 --- a/src/Compilers/CSharp/Portable/Errors/MessageID.cs +++ b/src/Compilers/CSharp/Portable/Errors/MessageID.cs @@ -335,6 +335,10 @@ internal static LanguageVersion RequiredVersion(this MessageID feature) switch (feature) { // C# preview features. + case MessageID.IDS_FeatureStaticAbstractMembersInInterfaces: // semantic check + return LanguageVersion.Preview; + + // C# 10.0 features. case MessageID.IDS_FeatureMixedDeclarationsAndExpressionsInDeconstruction: // semantic check case MessageID.IDS_FeatureSealedToStringInRecord: // semantic check case MessageID.IDS_FeatureRecordStructs: @@ -345,10 +349,10 @@ internal static LanguageVersion RequiredVersion(this MessageID feature) case MessageID.IDS_FeatureInferredDelegateType: // semantic check case MessageID.IDS_FeatureLambdaAttributes: // semantic check case MessageID.IDS_FeatureExtendedPropertyPatterns: - case MessageID.IDS_FeatureStaticAbstractMembersInInterfaces: // semantic check case MessageID.IDS_FeatureLambdaReturnType: // semantic check case MessageID.IDS_AsyncMethodBuilderOverride: // semantic check - return LanguageVersion.Preview; + case MessageID.IDS_FeatureConstantInterpolatedStrings: // semantic check + return LanguageVersion.CSharp10; // C# 9.0 features. case MessageID.IDS_FeatureLambdaDiscardParameters: // semantic check @@ -375,12 +379,9 @@ internal static LanguageVersion RequiredVersion(this MessageID feature) case MessageID.IDS_FeatureStaticAnonymousFunction: // syntax check case MessageID.IDS_FeatureModuleInitializers: // semantic check on method attribute case MessageID.IDS_FeatureDefaultTypeParameterConstraint: + case MessageID.IDS_FeatureVarianceSafetyForStaticInterfaceMembers: // semantic check return LanguageVersion.CSharp9; - case MessageID.IDS_FeatureVarianceSafetyForStaticInterfaceMembers: //semantic check - case MessageID.IDS_FeatureConstantInterpolatedStrings: //semantic check - return LanguageVersion.Preview; - // C# 8.0 features. case MessageID.IDS_FeatureAltInterpolatedVerbatimStrings: case MessageID.IDS_FeatureCoalesceAssignmentExpression: diff --git a/src/Compilers/CSharp/Portable/LanguageVersion.cs b/src/Compilers/CSharp/Portable/LanguageVersion.cs index 4b7aff7955dad..cc0d508de5d28 100644 --- a/src/Compilers/CSharp/Portable/LanguageVersion.cs +++ b/src/Compilers/CSharp/Portable/LanguageVersion.cs @@ -187,6 +187,26 @@ public enum LanguageVersion /// CSharp9 = 900, + /// + /// C# language version 10.0 + /// + /// + /// Features: + /// + /// Record structs + /// Global using directives + /// Lambda improvements + /// Improved definite assignment + /// Constant interpolated strings + /// Mix declarations and variables in deconstruction + /// Extended property patterns + /// Sealed record ToString + /// Source Generator v2 APIs + /// Method-level AsyncMethodBuilder + /// + /// + CSharp10 = 1000, + /// /// The latest major supported version. /// @@ -226,6 +246,7 @@ internal static bool IsValid(this LanguageVersion value) case LanguageVersion.CSharp7_3: case LanguageVersion.CSharp8: case LanguageVersion.CSharp9: + case LanguageVersion.CSharp10: case LanguageVersion.Preview: return true; } @@ -261,6 +282,8 @@ internal static ErrorCode GetErrorCode(this LanguageVersion version) return ErrorCode.ERR_FeatureNotAvailableInVersion8; case LanguageVersion.CSharp9: return ErrorCode.ERR_FeatureNotAvailableInVersion9; + case LanguageVersion.CSharp10: + return ErrorCode.ERR_FeatureNotAvailableInVersion10; default: throw ExceptionUtilities.UnexpectedValue(version); } @@ -281,6 +304,12 @@ internal CSharpRequiredLanguageVersion(LanguageVersion version) public static class LanguageVersionFacts { + /// + /// Usages of TestOptions.RegularNext and LanguageVersionFacts.CSharpNext + /// will be replaced with TestOptions.RegularN and LanguageVersion.CSharpN when language version N is introduced. + /// + internal const LanguageVersion CSharpNext = LanguageVersion.Preview; + /// /// Displays the version number in the format expected on the command-line (/langver flag). /// For instance, "6", "7.0", "7.1", "latest". @@ -313,6 +342,8 @@ public static string ToDisplayString(this LanguageVersion version) return "8.0"; case LanguageVersion.CSharp9: return "9.0"; + case LanguageVersion.CSharp10: + return "10.0"; case LanguageVersion.Default: return "default"; case LanguageVersion.Latest: @@ -414,6 +445,11 @@ public static bool TryParse(string? version, out LanguageVersion result) result = LanguageVersion.CSharp9; return true; + case "10": + case "10.0": + result = LanguageVersion.CSharp10; + return true; + default: result = LanguageVersion.Default; return false; @@ -430,13 +466,13 @@ public static LanguageVersion MapSpecifiedToEffectiveVersion(this LanguageVersio case LanguageVersion.Latest: case LanguageVersion.Default: case LanguageVersion.LatestMajor: - return LanguageVersion.CSharp9; + return LanguageVersion.CSharp10; default: return version; } } - internal static LanguageVersion CurrentVersion => LanguageVersion.CSharp9; + internal static LanguageVersion CurrentVersion => LanguageVersion.CSharp10; /// Inference of tuple element names was added in C# 7.1 internal static bool DisallowInferredTupleElementNames(this LanguageVersion self) diff --git a/src/Compilers/CSharp/Portable/PublicAPI.Unshipped.txt b/src/Compilers/CSharp/Portable/PublicAPI.Unshipped.txt index 12b95121ca21f..2f2973cf92b42 100644 --- a/src/Compilers/CSharp/Portable/PublicAPI.Unshipped.txt +++ b/src/Compilers/CSharp/Portable/PublicAPI.Unshipped.txt @@ -1,5 +1,6 @@ abstract Microsoft.CodeAnalysis.CSharp.Syntax.BaseExpressionColonSyntax.ColonToken.get -> Microsoft.CodeAnalysis.SyntaxToken abstract Microsoft.CodeAnalysis.CSharp.Syntax.BaseExpressionColonSyntax.Expression.get -> Microsoft.CodeAnalysis.CSharp.Syntax.ExpressionSyntax +Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp10 = 1000 -> Microsoft.CodeAnalysis.CSharp.LanguageVersion Microsoft.CodeAnalysis.CSharp.Syntax.BaseExpressionColonSyntax Microsoft.CodeAnalysis.CSharp.Syntax.BaseExpressionColonSyntax.WithColonToken(Microsoft.CodeAnalysis.SyntaxToken colonToken) -> Microsoft.CodeAnalysis.CSharp.Syntax.BaseExpressionColonSyntax Microsoft.CodeAnalysis.CSharp.Syntax.BaseExpressionColonSyntax.WithExpression(Microsoft.CodeAnalysis.CSharp.Syntax.ExpressionSyntax expression) -> Microsoft.CodeAnalysis.CSharp.Syntax.BaseExpressionColonSyntax diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf index 59d825d7da375..e148163377fb8 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf @@ -467,6 +467,11 @@ Funkce {0} je zkušební, a proto není podporovaná. K aktivaci použijte /features:{1}. + + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + + Feature '{0}' is not available in C# 8.0. Please use language version {1} or greater. Funkce {0} není v C# 8.0 dostupná. Použijte prosím jazykovou verzi {1} nebo větší. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf index e9f447119329a..fc7e5d90eef93 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf @@ -467,6 +467,11 @@ Das Feature "{0}" ist experimentell und wird nicht unterstützt. Verwenden Sie zur Aktivierung "/features:{1}". + + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + + Feature '{0}' is not available in C# 8.0. Please use language version {1} or greater. Das Feature "{0}" ist in C# 8.0 nicht verfügbar. Verwenden Sie Sprachversion {1} oder höher. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf index bb633c2ce8821..917ffcde8bc17 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf @@ -467,6 +467,11 @@ La característica "{0}" es experimental y no se admite. Use "/features:{1}" para habilitarla. + + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + + Feature '{0}' is not available in C# 8.0. Please use language version {1} or greater. La característica "{0}" no está disponible en C# 8.0. Use la versión {1} del lenguaje o una posterior. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf index 3b853ad18cdda..7e9a6b6778f73 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf @@ -467,6 +467,11 @@ La fonctionnalité '{0}' est expérimentale et non prise en charge. Utilisez '/features:{1}' pour l'activer. + + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + + Feature '{0}' is not available in C# 8.0. Please use language version {1} or greater. La fonctionnalité '{0}' n'est pas disponible en C# 8.0. Utilisez la version de langage {1} ou une version ultérieure. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf index 02d1eb287ffad..3d26f3c6693a0 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf @@ -467,6 +467,11 @@ La funzionalità '{0}' è sperimentale e non è supportata. Per abilitare, usare '/features:{1}'. + + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + + Feature '{0}' is not available in C# 8.0. Please use language version {1} or greater. La funzionalità '{0}' non è disponibile in C# 8.0. Usare la versione {1} o versioni successive del linguaggio. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf index a74e38ed2cc86..07fb5e6b6b0a4 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf @@ -467,6 +467,11 @@ 機能 '{0}' は試験段階であり、サポートされていません。有効にするには '/features:{1}' をご使用ください。 + + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + + Feature '{0}' is not available in C# 8.0. Please use language version {1} or greater. 機能 '{0}' は C# 8.0 では使用できません。言語バージョン {1} 以上を使用してください。 diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf index 70922f4ba8a6f..d3c3b9a9433af 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf @@ -467,6 +467,11 @@ 기능 '{0}'은(는) 실험적이며 지원되지 않습니다. 사용하도록 설정하려면 '/features:{1}'을(를) 사용하세요. + + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + + Feature '{0}' is not available in C# 8.0. Please use language version {1} or greater. '{0}' 기능은 C# 8.0에서 사용할 수 없습니다. 언어 버전 {1} 이상을 사용하세요. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf index dc03bb3294151..69501f3389fb0 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf @@ -467,6 +467,11 @@ Funkcja „{0}” jest eksperymentalna i nieobsługiwana. Aby ją włączyć, użyj parametru „/features:{1}”. + + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + + Feature '{0}' is not available in C# 8.0. Please use language version {1} or greater. Funkcja „{0}” nie jest dostępna w języku C# 8.0. Użyj języka w wersji {1} lub nowszej. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf index 4d2226d58d979..3745be4a141de 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf @@ -467,6 +467,11 @@ O recurso '{0}' é experimental e sem suporte; use '/features:{1}' para habilitar. + + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + + Feature '{0}' is not available in C# 8.0. Please use language version {1} or greater. O recurso '{0}' não está disponível em C# 8.0. Use a versão de linguagem {1} ou superior. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf index 1135d72b83a5e..72aeb7cb55729 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf @@ -467,6 +467,11 @@ Функция "{0}" является экспериментальной и не поддерживается; используйте "/features:{1}" для включения. + + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + + Feature '{0}' is not available in C# 8.0. Please use language version {1} or greater. Функция "{0}" недоступна в C# 8.0. Используйте версию языка {1} или более позднюю. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf index 4b5b79e20b7dd..305af8c797c2c 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf @@ -467,6 +467,11 @@ '{0}' özelliği deneyseldir ve desteklenmez; etkinleştirmek için '/features:{1}' kullanın. + + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + + Feature '{0}' is not available in C# 8.0. Please use language version {1} or greater. '{0}' özelliği C# 8.0'da kullanılamaz. Lütfen {1} veya daha yüksek bir dil sürümü kullanın. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf index bb6ccf4ed5f12..42bd67831bc92 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf @@ -467,6 +467,11 @@ 功能“{0}”是实验性的且不受支持；请使用“/features:{1}”来启用。 + + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + + Feature '{0}' is not available in C# 8.0. Please use language version {1} or greater. 功能“{0}”在 C# 8.0 中不可用。请使用语言版本 {1} 或更高版本。 diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf index d53c890a82f76..15683780f6906 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf @@ -467,6 +467,11 @@ 功能 '{0}' 仍在實驗階段且不具支援；請使用 '/features:{1}' 來啟用。 + + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + Feature '{0}' is not available in C# 10.0. Please use language version {1} or greater. + + Feature '{0}' is not available in C# 8.0. Please use language version {1} or greater. C# 8.0 中無法使用功能 '{0}'。請使用 {1} 或更新的語言版本。 diff --git a/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs b/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs index 2c59e7cc97d26..bc35ca5830830 100644 --- a/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs +++ b/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs @@ -1609,7 +1609,8 @@ public void LangVersion_NoValueSpecified() [InlineData("iso-3")] [InlineData("iso1")] [InlineData("8.1")] - [InlineData("10")] + [InlineData("10.1")] + [InlineData("11")] [InlineData("1000")] public void LangVersion_BadVersion(string value) { @@ -1663,7 +1664,9 @@ public void LanguageVersionAdded_Canary() // When a new version is added, this test will break. This list must be checked: // - update the "UpgradeProject" codefixer // - update all the tests that call this canary - AssertEx.SetEqual(new[] { "default", "1", "2", "3", "4", "5", "6", "7.0", "7.1", "7.2", "7.3", "8.0", "9.0", "latest", "latestmajor", "preview" }, + // - update MaxSupportedLangVersion (a relevant test should break when new version is introduced) + // - email release management to add to the release notes (see old example: https://github.com/dotnet/core/pull/1454) + AssertEx.SetEqual(new[] { "default", "1", "2", "3", "4", "5", "6", "7.0", "7.1", "7.2", "7.3", "8.0", "9.0", "10.0", "latest", "latestmajor", "preview" }, Enum.GetValues(typeof(LanguageVersion)).Cast().Select(v => v.ToDisplayString())); // For minor versions and new major versions, the format should be "x.y", such as "7.1" } @@ -1695,6 +1698,7 @@ public void LanguageVersion_GetErrorCode() ErrorCode.ERR_FeatureNotAvailableInVersion7_3, ErrorCode.ERR_FeatureNotAvailableInVersion8, ErrorCode.ERR_FeatureNotAvailableInVersion9, + ErrorCode.ERR_FeatureNotAvailableInVersion10, }; AssertEx.SetEqual(versions, errorCodes); @@ -1716,9 +1720,10 @@ public void LanguageVersion_GetErrorCode() InlineData(LanguageVersion.CSharp7_3, LanguageVersion.CSharp7_3), InlineData(LanguageVersion.CSharp8, LanguageVersion.CSharp8), InlineData(LanguageVersion.CSharp9, LanguageVersion.CSharp9), - InlineData(LanguageVersion.CSharp9, LanguageVersion.LatestMajor), - InlineData(LanguageVersion.CSharp9, LanguageVersion.Latest), - InlineData(LanguageVersion.CSharp9, LanguageVersion.Default), + InlineData(LanguageVersion.CSharp10, LanguageVersion.CSharp10), + InlineData(LanguageVersion.CSharp10, LanguageVersion.LatestMajor), + InlineData(LanguageVersion.CSharp10, LanguageVersion.Latest), + InlineData(LanguageVersion.CSharp10, LanguageVersion.Default), InlineData(LanguageVersion.Preview, LanguageVersion.Preview), ] public void LanguageVersion_MapSpecifiedToEffectiveVersion(LanguageVersion expectedMappedVersion, LanguageVersion input) @@ -1757,6 +1762,8 @@ public void LanguageVersion_MapSpecifiedToEffectiveVersion(LanguageVersion expec InlineData("8.0", true, LanguageVersion.CSharp8), InlineData("9", true, LanguageVersion.CSharp9), InlineData("9.0", true, LanguageVersion.CSharp9), + InlineData("10", true, LanguageVersion.CSharp10), + InlineData("10.0", true, LanguageVersion.CSharp10), InlineData("08", false, LanguageVersion.Default), InlineData("07.1", false, LanguageVersion.Default), InlineData("default", true, LanguageVersion.Default), diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Locations.cs b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Locations.cs index 18fc9ecd2f117..5ce3b07416ccc 100644 --- a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Locations.cs +++ b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Locations.cs @@ -195,7 +195,7 @@ record struct S { } "; - CreateCompilation(source, parseOptions: TestOptions.RegularPreview).VerifyDiagnostics( + CreateCompilation(source, parseOptions: TestOptions.Regular10).VerifyDiagnostics( // (8,2): warning CS0657: 'assembly' is not a valid attribute location for this declaration. Valid attribute locations for this declaration are 'type'. All attributes in this block will be ignored. Diagnostic(ErrorCode.WRN_AttributeLocationOnBadDeclaration, "assembly").WithArguments("assembly", "type"), // (9,2): warning CS0657: 'module' is not a valid attribute location for this declaration. Valid attribute locations for this declaration are 'type'. All attributes in this block will be ignored. @@ -243,7 +243,7 @@ record class S { } "; - CreateCompilation(source, parseOptions: TestOptions.RegularPreview).VerifyDiagnostics( + CreateCompilation(source, parseOptions: TestOptions.Regular10).VerifyDiagnostics( // (8,2): warning CS0657: 'assembly' is not a valid attribute location for this declaration. Valid attribute locations for this declaration are 'type'. All attributes in this block will be ignored. Diagnostic(ErrorCode.WRN_AttributeLocationOnBadDeclaration, "assembly").WithArguments("assembly", "type"), // (9,2): warning CS0657: 'module' is not a valid attribute location for this declaration. Valid attribute locations for this declaration are 'type'. All attributes in this block will be ignored. diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncMethodBuilderOverrideTests.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncMethodBuilderOverrideTests.cs index 05c335b270a69..a220a78b9be9a 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncMethodBuilderOverrideTests.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncMethodBuilderOverrideTests.cs @@ -115,18 +115,18 @@ class C "; var compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.Regular9); compilation.VerifyDiagnostics( - // (11,25): error CS8652: The feature 'async method builder override' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (11,25): error CS8773: Feature 'async method builder override' is not available in C# 9.0. Please use language version 10.0 or greater. // static async MyTask F() { System.Console.Write("F "); await Task.Delay(0); } - Diagnostic(ErrorCode.ERR_FeatureInPreview, "F").WithArguments("async method builder override").WithLocation(11, 25), - // (14,28): error CS8652: The feature 'async method builder override' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "F").WithArguments("async method builder override", "10.0").WithLocation(11, 25), + // (14,28): error CS8773: Feature 'async method builder override' is not available in C# 9.0. Please use language version 10.0 or greater. // static async MyTask G(T t) { System.Console.Write("G "); await Task.Delay(0); return t; } - Diagnostic(ErrorCode.ERR_FeatureInPreview, "G").WithArguments("async method builder override").WithLocation(14, 28), - // (17,37): error CS8652: The feature 'async method builder override' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "G").WithArguments("async method builder override", "10.0").WithLocation(14, 28), + // (17,37): error CS8773: Feature 'async method builder override' is not available in C# 9.0. Please use language version 10.0 or greater. // public static async MyTask M() { System.Console.Write("M "); await F(); return await G(3); } - Diagnostic(ErrorCode.ERR_FeatureInPreview, "M").WithArguments("async method builder override").WithLocation(17, 37) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "M").WithArguments("async method builder override", "10.0").WithLocation(17, 37) ); - compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.RegularPreview); + compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.Regular10); var verifier = CompileAndVerify(compilation, expectedOutput: "M F G 3"); verifier.VerifyDiagnostics(); var testData = verifier.TestData; @@ -223,7 +223,7 @@ public static async MyTask M() {AsyncMethodBuilderAttribute} "; - var compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.RegularPreview); + var compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.Regular10); compilation.VerifyDiagnostics( // (14,16): warning CS8603: Possible null reference return. // return default(T); // 1 @@ -521,18 +521,18 @@ public void BuilderOnMethod_DummyBuilderOnType_OnLocalFunction(string dummyBuild "; var compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.Regular9); compilation.VerifyDiagnostics( - // (9,21): error CS8652: The feature 'async method builder override' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (9,21): error CS8773: Feature 'async method builder override' is not available in C# 9.0. Please use language version 10.0 or greater. // static async MyTask F() { System.Console.Write("F "); await Task.Delay(0); } - Diagnostic(ErrorCode.ERR_FeatureInPreview, "F").WithArguments("async method builder override").WithLocation(9, 21), - // (12,24): error CS8652: The feature 'async method builder override' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "F").WithArguments("async method builder override", "10.0").WithLocation(9, 21), + // (12,24): error CS8773: Feature 'async method builder override' is not available in C# 9.0. Please use language version 10.0 or greater. // static async MyTask G(T t) { System.Console.Write("G "); await Task.Delay(0); return t; } - Diagnostic(ErrorCode.ERR_FeatureInPreview, "G").WithArguments("async method builder override").WithLocation(12, 24), - // (15,26): error CS8652: The feature 'async method builder override' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "G").WithArguments("async method builder override", "10.0").WithLocation(12, 24), + // (15,26): error CS8773: Feature 'async method builder override' is not available in C# 9.0. Please use language version 10.0 or greater. // static async MyTask M() { System.Console.Write("M "); await F(); return await G(3); } - Diagnostic(ErrorCode.ERR_FeatureInPreview, "M").WithArguments("async method builder override").WithLocation(15, 26) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "M").WithArguments("async method builder override", "10.0").WithLocation(15, 26) ); - compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.RegularPreview); + compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.Regular10); var verifier = CompileAndVerify(compilation, expectedOutput: "M F G 3"); verifier.VerifyDiagnostics(); } @@ -765,26 +765,26 @@ public void BuilderOnMethod_OnLambda() "; var compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.Regular9); compilation.VerifyEmitDiagnostics( - // (6,18): error CS8652: The feature 'lambda attributes' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (6,18): error CS8773: Feature 'lambda attributes' is not available in C# 9.0. Please use language version 10.0 or greater. // Func f = [AsyncMethodBuilder(typeof(MyTaskMethodBuilder))] static async () => { System.Console.Write("F "); await Task.Delay(0); }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "[AsyncMethodBuilder(typeof(MyTaskMethodBuilder))]").WithArguments("lambda attributes").WithLocation(6, 18), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "[AsyncMethodBuilder(typeof(MyTaskMethodBuilder))]").WithArguments("lambda attributes", "10.0").WithLocation(6, 18), // (6,84): error CS8935: The AsyncMethodBuilder attribute is disallowed on anonymous methods without an explicit return type. // Func f = [AsyncMethodBuilder(typeof(MyTaskMethodBuilder))] static async () => { System.Console.Write("F "); await Task.Delay(0); }; Diagnostic(ErrorCode.ERR_BuilderAttributeDisallowed, "=>").WithLocation(6, 84), - // (6,84): error CS8652: The feature 'async method builder override' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (6,84): error CS8773: Feature 'async method builder override' is not available in C# 9.0. Please use language version 10.0 or greater. // Func f = [AsyncMethodBuilder(typeof(MyTaskMethodBuilder))] static async () => { System.Console.Write("F "); await Task.Delay(0); }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "=>").WithArguments("async method builder override").WithLocation(6, 84), - // (8,23): error CS8652: The feature 'lambda attributes' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "=>").WithArguments("async method builder override", "10.0").WithLocation(6, 84), + // (8,23): error CS8773: Feature 'lambda attributes' is not available in C# 9.0. Please use language version 10.0 or greater. // Func> m = [AsyncMethodBuilder(typeof(MyTaskMethodBuilder<>))] async () => { System.Console.Write("M "); await f(); return 3; }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "[AsyncMethodBuilder(typeof(MyTaskMethodBuilder<>))]").WithArguments("lambda attributes").WithLocation(8, 23), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "[AsyncMethodBuilder(typeof(MyTaskMethodBuilder<>))]").WithArguments("lambda attributes", "10.0").WithLocation(8, 23), // (8,84): error CS8935: The AsyncMethodBuilder attribute is disallowed on anonymous methods without an explicit return type. // Func> m = [AsyncMethodBuilder(typeof(MyTaskMethodBuilder<>))] async () => { System.Console.Write("M "); await f(); return 3; }; Diagnostic(ErrorCode.ERR_BuilderAttributeDisallowed, "=>").WithLocation(8, 84), - // (8,84): error CS8652: The feature 'async method builder override' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (8,84): error CS8773: Feature 'async method builder override' is not available in C# 9.0. Please use language version 10.0 or greater. // Func> m = [AsyncMethodBuilder(typeof(MyTaskMethodBuilder<>))] async () => { System.Console.Write("M "); await f(); return 3; }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "=>").WithArguments("async method builder override").WithLocation(8, 84) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "=>").WithArguments("async method builder override", "10.0").WithLocation(8, 84) ); - compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.RegularPreview); + compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.Regular10); compilation.VerifyEmitDiagnostics( // (6,84): error CS8933: The AsyncMethodBuilder attribute is disallowed on anonymous methods without an explicit return type. // Func f = [AsyncMethodBuilder(typeof(MyTaskMethodBuilder))] static async () => { System.Console.Write("F "); await Task.Delay(0); }; @@ -819,27 +819,27 @@ public void BuilderOnMethod_OnLambda_WithExplicitType() "; var compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.Regular9); compilation.VerifyEmitDiagnostics( - // (6,18): error CS8652: The feature 'lambda attributes' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (6,18): error CS8773: Feature 'lambda attributes' is not available in C# 9.0. Please use language version 10.0 or greater. // Func f = [AsyncMethodBuilder(typeof(MyTaskMethodBuilder))] static async MyTask () => { System.Console.Write("F "); await Task.Delay(0); }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "[AsyncMethodBuilder(typeof(MyTaskMethodBuilder))]").WithArguments("lambda attributes").WithLocation(6, 18), - // (6,81): error CS8652: The feature 'lambda return type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "[AsyncMethodBuilder(typeof(MyTaskMethodBuilder))]").WithArguments("lambda attributes", "10.0").WithLocation(6, 18), + // (6,81): error CS8773: Feature 'lambda return type' is not available in C# 9.0. Please use language version 10.0 or greater. // Func f = [AsyncMethodBuilder(typeof(MyTaskMethodBuilder))] static async MyTask () => { System.Console.Write("F "); await Task.Delay(0); }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "MyTask").WithArguments("lambda return type").WithLocation(6, 81), - // (6,91): error CS8652: The feature 'async method builder override' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "MyTask").WithArguments("lambda return type", "10.0").WithLocation(6, 81), + // (6,91): error CS8773: Feature 'async method builder override' is not available in C# 9.0. Please use language version 10.0 or greater. // Func f = [AsyncMethodBuilder(typeof(MyTaskMethodBuilder))] static async MyTask () => { System.Console.Write("F "); await Task.Delay(0); }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "=>").WithArguments("async method builder override").WithLocation(6, 91), - // (8,23): error CS8652: The feature 'lambda attributes' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "=>").WithArguments("async method builder override", "10.0").WithLocation(6, 91), + // (8,23): error CS8773: Feature 'lambda attributes' is not available in C# 9.0. Please use language version 10.0 or greater. // Func> m = [AsyncMethodBuilder(typeof(MyTaskMethodBuilder<>))] async MyTask () => { System.Console.Write("M "); await f(); return 3; }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "[AsyncMethodBuilder(typeof(MyTaskMethodBuilder<>))]").WithArguments("lambda attributes").WithLocation(8, 23), - // (8,81): error CS8652: The feature 'lambda return type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "[AsyncMethodBuilder(typeof(MyTaskMethodBuilder<>))]").WithArguments("lambda attributes", "10.0").WithLocation(8, 23), + // (8,81): error CS8773: Feature 'lambda return type' is not available in C# 9.0. Please use language version 10.0 or greater. // Func> m = [AsyncMethodBuilder(typeof(MyTaskMethodBuilder<>))] async MyTask () => { System.Console.Write("M "); await f(); return 3; }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "MyTask").WithArguments("lambda return type").WithLocation(8, 81), - // (8,96): error CS8652: The feature 'async method builder override' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "MyTask").WithArguments("lambda return type", "10.0").WithLocation(8, 81), + // (8,96): error CS8773: Feature 'async method builder override' is not available in C# 9.0. Please use language version 10.0 or greater. // Func> m = [AsyncMethodBuilder(typeof(MyTaskMethodBuilder<>))] async MyTask () => { System.Console.Write("M "); await f(); return 3; }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "=>").WithArguments("async method builder override").WithLocation(8, 96) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "=>").WithArguments("async method builder override", "10.0").WithLocation(8, 96) ); - compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.RegularPreview); + compilation = CreateCompilationWithMscorlib45(source, parseOptions: TestOptions.Regular10); var verifier = CompileAndVerify(compilation, expectedOutput: "M F 3"); verifier.VerifyDiagnostics(); } diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenDeconstructTests.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenDeconstructTests.cs index d47cd7fb86dc5..144ab5ebf7656 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenDeconstructTests.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenDeconstructTests.cs @@ -6168,12 +6168,12 @@ static void Main() var comp = CreateCompilation(source, options: TestOptions.DebugExe, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( - // (6,9): error CS8652: The feature 'Mixed declarations and expressions in deconstruction' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (6,9): error CS8773: Feature 'Mixed declarations and expressions in deconstruction' is not available in C# 9.0. Please use language version 10.0 or greater. // (@_, var x) = (1, 2); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "(@_, var x) = (1, 2)", isSuppressed: false).WithArguments("Mixed declarations and expressions in deconstruction").WithLocation(6, 9), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "(@_, var x) = (1, 2)").WithArguments("Mixed declarations and expressions in deconstruction", "10.0").WithLocation(6, 9), // (6,10): error CS0103: The name '_' does not exist in the current context // (@_, var x) = (1, 2); - Diagnostic(ErrorCode.ERR_NameNotInContext, "@_", isSuppressed: false).WithArguments("_").WithLocation(6, 10) + Diagnostic(ErrorCode.ERR_NameNotInContext, "@_").WithArguments("_").WithLocation(6, 10) ); var tree = comp.SyntaxTrees.First(); @@ -6716,21 +6716,21 @@ static void Main() "; var compCSharp9 = CreateCompilation(source, options: TestOptions.DebugExe, parseOptions: TestOptions.Regular9); compCSharp9.VerifyDiagnostics( - // (6,9): error CS8652: The feature 'Mixed declarations and expressions in deconstruction' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (6,9): error CS8773: Feature 'Mixed declarations and expressions in deconstruction' is not available in C# 9.0. Please use language version 10.0 or greater. // (var x, x) = (1, 2); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "(var x, x) = (1, 2)", isSuppressed: false).WithArguments("Mixed declarations and expressions in deconstruction").WithLocation(6, 9), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "(var x, x) = (1, 2)").WithArguments("Mixed declarations and expressions in deconstruction", "10.0").WithLocation(6, 9), // (6,17): error CS0841: Cannot use local variable 'x' before it is declared // (var x, x) = (1, 2); - Diagnostic(ErrorCode.ERR_VariableUsedBeforeDeclaration, "x", isSuppressed: false).WithArguments("x").WithLocation(6, 17), - // (7,9): error CS8652: The feature 'Mixed declarations and expressions in deconstruction' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_VariableUsedBeforeDeclaration, "x").WithArguments("x").WithLocation(6, 17), + // (7,9): error CS8773: Feature 'Mixed declarations and expressions in deconstruction' is not available in C# 9.0. Please use language version 10.0 or greater. // (y, var y) = (1, 2); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "(y, var y) = (1, 2)", isSuppressed: false).WithArguments("Mixed declarations and expressions in deconstruction").WithLocation(7, 9), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "(y, var y) = (1, 2)").WithArguments("Mixed declarations and expressions in deconstruction", "10.0").WithLocation(7, 9), // (7,10): error CS0841: Cannot use local variable 'y' before it is declared // (y, var y) = (1, 2); - Diagnostic(ErrorCode.ERR_VariableUsedBeforeDeclaration, "y", isSuppressed: false).WithArguments("y").WithLocation(7, 10) + Diagnostic(ErrorCode.ERR_VariableUsedBeforeDeclaration, "y").WithArguments("y").WithLocation(7, 10) ); - var comp = CreateCompilation(source, options: TestOptions.DebugExe, parseOptions: TestOptions.RegularPreview); + var comp = CreateCompilation(source, options: TestOptions.DebugExe, parseOptions: TestOptions.Regular10); comp.VerifyDiagnostics( // (6,17): error CS0841: Cannot use local variable 'x' before it is declared // (var x, x) = (1, 2); @@ -7231,9 +7231,9 @@ static void Main(string[] args) }"; var compilation = CreateCompilation(source, options: TestOptions.DebugExe, parseOptions: TestOptions.Regular9); compilation.VerifyDiagnostics( - // (8,14): error CS8652: The feature 'Mixed declarations and expressions in deconstruction' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (8,14): error CS8773: Feature 'Mixed declarations and expressions in deconstruction' is not available in C# 9.0. Please use language version 10.0 or greater. // for ((int x1, z) = t; ; ) - Diagnostic(ErrorCode.ERR_FeatureInPreview, "(int x1, z) = t", isSuppressed: false).WithArguments("Mixed declarations and expressions in deconstruction").WithLocation(8, 14)); + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "(int x1, z) = t").WithArguments("Mixed declarations and expressions in deconstruction", "10.0").WithLocation(8, 14)); var tree = compilation.SyntaxTrees.First(); var model = compilation.GetSemanticModel(tree); @@ -9933,18 +9933,18 @@ public void Deconstruct(out int a, out (string b, bool c) tuple) } "; CreateCompilation(source, parseOptions: TestOptions.Regular9).VerifyDiagnostics( - // (7,9): error CS8652: The feature 'Mixed declarations and expressions in deconstruction' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (7,9): error CS8773: Feature 'Mixed declarations and expressions in deconstruction' is not available in C# 9.0. Please use language version 10.0 or greater. // (x1, string y1) = new A(); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "(x1, string y1) = new A()", isSuppressed: false).WithArguments("Mixed declarations and expressions in deconstruction").WithLocation(7, 9), - // (9,9): error CS8652: The feature 'Mixed declarations and expressions in deconstruction' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "(x1, string y1) = new A()").WithArguments("Mixed declarations and expressions in deconstruction", "10.0").WithLocation(7, 9), + // (9,9): error CS8773: Feature 'Mixed declarations and expressions in deconstruction' is not available in C# 9.0. Please use language version 10.0 or greater. // (int x2, y2) = new A(); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "(int x2, y2) = new A()", isSuppressed: false).WithArguments("Mixed declarations and expressions in deconstruction").WithLocation(9, 9), - // (11,9): error CS8652: The feature 'Mixed declarations and expressions in deconstruction' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "(int x2, y2) = new A()").WithArguments("Mixed declarations and expressions in deconstruction", "10.0").WithLocation(9, 9), + // (11,9): error CS8773: Feature 'Mixed declarations and expressions in deconstruction' is not available in C# 9.0. Please use language version 10.0 or greater. // (int x3, (string y3, z3)) = new B(); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "(int x3, (string y3, z3)) = new B()", isSuppressed: false).WithArguments("Mixed declarations and expressions in deconstruction").WithLocation(11, 9), - // (13,9): error CS8652: The feature 'Mixed declarations and expressions in deconstruction' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "(int x3, (string y3, z3)) = new B()").WithArguments("Mixed declarations and expressions in deconstruction", "10.0").WithLocation(11, 9), + // (13,9): error CS8773: Feature 'Mixed declarations and expressions in deconstruction' is not available in C# 9.0. Please use language version 10.0 or greater. // (x4, var (y4, z4)) = new B(); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "(x4, var (y4, z4)) = new B()", isSuppressed: false).WithArguments("Mixed declarations and expressions in deconstruction").WithLocation(13, 9)); + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "(x4, var (y4, z4)) = new B()").WithArguments("Mixed declarations and expressions in deconstruction", "10.0").WithLocation(13, 9)); } [Fact] diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleEqualityTests.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleEqualityTests.cs index 5c099ac55b72b..89ee7957084a1 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleEqualityTests.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleEqualityTests.cs @@ -1353,17 +1353,27 @@ static void Main() System.Console.Write((null, () => 2) == default); } }"; - var comp = CreateCompilation(source); + var comp = CreateCompilation(source, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( // (6,30): error CS0034: Operator '==' is ambiguous on operands of type '' and 'default' // System.Console.Write((null, () => 1) == (default, default)); Diagnostic(ErrorCode.ERR_AmbigBinaryOps, "(null, () => 1) == (default, default)").WithArguments("==", "", "default").WithLocation(6, 30), - // (6,37): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (6,37): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // System.Console.Write((null, () => 1) == (default, default)); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "() => 1").WithArguments("inferred delegate type").WithLocation(6, 37), - // (6,37): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "() => 1").WithArguments("inferred delegate type", "10.0").WithLocation(6, 37), + // (6,37): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // System.Console.Write((null, () => 1) == (default, default)); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "() => 1").WithArguments("inferred delegate type").WithLocation(6, 37), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "() => 1").WithArguments("inferred delegate type", "10.0").WithLocation(6, 37), + // (7,30): error CS0034: Operator '==' is ambiguous on operands of type '(, lambda expression)' and 'default' + // System.Console.Write((null, () => 2) == default); + Diagnostic(ErrorCode.ERR_AmbigBinaryOps, "(null, () => 2) == default").WithArguments("==", "(, lambda expression)", "default").WithLocation(7, 30) + ); + + comp = CreateCompilation(source); + comp.VerifyDiagnostics( + // (6,30): error CS0034: Operator '==' is ambiguous on operands of type '' and 'default' + // System.Console.Write((null, () => 1) == (default, default)); + Diagnostic(ErrorCode.ERR_AmbigBinaryOps, "(null, () => 1) == (default, default)").WithArguments("==", "", "default").WithLocation(6, 30), // (7,30): error CS0034: Operator '==' is ambiguous on operands of type '(, lambda expression)' and 'default' // System.Console.Write((null, () => 2) == default); Diagnostic(ErrorCode.ERR_AmbigBinaryOps, "(null, () => 2) == default").WithArguments("==", "(, lambda expression)", "default").WithLocation(7, 30) @@ -1662,30 +1672,30 @@ static void Main() }"; var comp = CreateCompilation(source, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( - // (6,65): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (6,65): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // System.Console.Write((null, null, null, null) == (null, x => x, Main, (int i) => { int j = 0; return i + j; })); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "x => x").WithArguments("inferred delegate type").WithLocation(6, 65), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "x => x").WithArguments("inferred delegate type", "10.0").WithLocation(6, 65), // (6,65): error CS8917: The delegate type could not be inferred. // System.Console.Write((null, null, null, null) == (null, x => x, Main, (int i) => { int j = 0; return i + j; })); Diagnostic(ErrorCode.ERR_CannotInferDelegateType, "x => x").WithLocation(6, 65), - // (6,65): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (6,65): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // System.Console.Write((null, null, null, null) == (null, x => x, Main, (int i) => { int j = 0; return i + j; })); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "x => x").WithArguments("inferred delegate type").WithLocation(6, 65), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "x => x").WithArguments("inferred delegate type", "10.0").WithLocation(6, 65), // (6,65): error CS8917: The delegate type could not be inferred. // System.Console.Write((null, null, null, null) == (null, x => x, Main, (int i) => { int j = 0; return i + j; })); Diagnostic(ErrorCode.ERR_CannotInferDelegateType, "x => x").WithLocation(6, 65), - // (6,73): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (6,73): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // System.Console.Write((null, null, null, null) == (null, x => x, Main, (int i) => { int j = 0; return i + j; })); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "Main").WithArguments("inferred delegate type").WithLocation(6, 73), - // (6,73): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "Main").WithArguments("inferred delegate type", "10.0").WithLocation(6, 73), + // (6,73): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // System.Console.Write((null, null, null, null) == (null, x => x, Main, (int i) => { int j = 0; return i + j; })); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "Main").WithArguments("inferred delegate type").WithLocation(6, 73), - // (6,79): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "Main").WithArguments("inferred delegate type", "10.0").WithLocation(6, 73), + // (6,79): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // System.Console.Write((null, null, null, null) == (null, x => x, Main, (int i) => { int j = 0; return i + j; })); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "(int i) => { int j = 0; return i + j; }").WithArguments("inferred delegate type").WithLocation(6, 79), - // (6,79): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "(int i) => { int j = 0; return i + j; }").WithArguments("inferred delegate type", "10.0").WithLocation(6, 79), + // (6,79): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // System.Console.Write((null, null, null, null) == (null, x => x, Main, (int i) => { int j = 0; return i + j; })); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "(int i) => { int j = 0; return i + j; }").WithArguments("inferred delegate type").WithLocation(6, 79)); + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "(int i) => { int j = 0; return i + j; }").WithArguments("inferred delegate type", "10.0").WithLocation(6, 79)); verify(comp); comp = CreateCompilation(source, parseOptions: TestOptions.RegularPreview); @@ -2017,9 +2027,6 @@ public void M() // (6,13): error CS0815: Cannot assign (, ) to an implicitly-typed variable // var t = (null, null); Diagnostic(ErrorCode.ERR_ImplicitlyTypedVariableAssignedBadValue, "t = (null, null)").WithArguments("(, )").WithLocation(6, 13), - // (7,22): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. - // if (null == (() => {}) ) {} - Diagnostic(ErrorCode.ERR_FeatureInPreview, "() => {}").WithArguments("inferred delegate type").WithLocation(7, 22), // (8,13): error CS0019: Operator '==' cannot be applied to operands of type 'string' and 'int' // if ("" == 1) {} Diagnostic(ErrorCode.ERR_BadBinaryOps, @""""" == 1").WithArguments("==", "string", "int").WithLocation(8, 13) diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/BindingTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/BindingTests.cs index 8249170b71bb9..1574892347516 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/BindingTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/BindingTests.cs @@ -246,9 +246,6 @@ static void M(A a) // (11,9): error CS1656: Cannot assign to 'E' because it is a 'method group' // a.E += a.E; Diagnostic(ErrorCode.ERR_AssgReadonlyLocalCause, "a.E").WithArguments("E", "method group").WithLocation(11, 9), - // (12,13): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. - // if (a.E != null) - Diagnostic(ErrorCode.ERR_FeatureInPreview, "a.E").WithArguments("inferred delegate type").WithLocation(12, 13), // (14,15): error CS1503: Argument 1: cannot convert from 'method group' to 'A' // M(a.E); Diagnostic(ErrorCode.ERR_BadArgType, "a.E").WithArguments("1", "method group", "A").WithLocation(14, 15), diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/ConstantTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/ConstantTests.cs index e33614276b71e..a963782c19e28 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/ConstantTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/ConstantTests.cs @@ -3727,65 +3727,65 @@ void M2(string S1 = $""Testing"", object O = null, Namae N = null) } } }"; - var comp = CreateCompilation(source, parseOptions: TestOptions.RegularPreview); + var comp = CreateCompilation(source, parseOptions: TestOptions.Regular10); comp.VerifyDiagnostics( // (32,27): error CS0133: The expression being assigned to 'S6' must be constant // const string S6 = $"Failed to {VS}"; Diagnostic(ErrorCode.ERR_NotConstantExpression, @"$""Failed to {VS}""").WithArguments("S6").WithLocation(34, 27)); - comp = CreateCompilation(source, parseOptions: TestOptions.Regular8); + comp = CreateCompilation(source, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( - // (12,4): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (12,4): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // [A($"ITEM")] - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$""ITEM""").WithArguments("constant interpolated strings").WithLocation(12, 4), - // (15,23): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$""ITEM""").WithArguments("constant interpolated strings", "10.0").WithLocation(12, 4), + // (15,23): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // const string S0 = $"Post"; - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$""Post""").WithArguments("constant interpolated strings").WithLocation(15, 23), - // (25,27): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$""Post""").WithArguments("constant interpolated strings", "10.0").WithLocation(15, 23), + // (25,27): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // const string S1 = $"Testing"; - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$""Testing""").WithArguments("constant interpolated strings").WithLocation(25, 27), - // (26,27): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$""Testing""").WithArguments("constant interpolated strings", "10.0").WithLocation(25, 27), + // (26,27): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // const string S2 = $"{"Level 5"} {"Number 3"}"; - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$""{""Level 5""} {""Number 3""}""").WithArguments("constant interpolated strings").WithLocation(26, 27), - // (27,27): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$""{""Level 5""} {""Number 3""}""").WithArguments("constant interpolated strings", "10.0").WithLocation(26, 27), + // (27,27): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // const string S3 = $"{$"{"Spinning Top"}"}"; - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$""{$""{""Spinning Top""}""}""").WithArguments("constant interpolated strings").WithLocation(27, 27), - // (28,27): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$""{$""{""Spinning Top""}""}""").WithArguments("constant interpolated strings", "10.0").WithLocation(27, 27), + // (28,27): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // const string S4 = $"Hybrid" + "Testing" + "123"; - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$""Hybrid""").WithArguments("constant interpolated strings").WithLocation(28, 27), - // (29,50): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$""Hybrid""").WithArguments("constant interpolated strings", "10.0").WithLocation(28, 27), + // (29,50): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // const string S5 = "Hybrid" + "Testing" + $"321"; - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$""321""").WithArguments("constant interpolated strings").WithLocation(29, 50), - // (30,27): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$""321""").WithArguments("constant interpolated strings", "10.0").WithLocation(29, 50), + // (30,27): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // const string F1 = $"{S1}"; - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$""{S1}""").WithArguments("constant interpolated strings").WithLocation(30, 27), - // (31,32): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$""{S1}""").WithArguments("constant interpolated strings", "10.0").WithLocation(30, 27), + // (31,32): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // const string F2 = F1 + $" the {S2}"; - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$"" the {S2}""").WithArguments("constant interpolated strings").WithLocation(31, 32), - // (34,27): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$"" the {S2}""").WithArguments("constant interpolated strings", "10.0").WithLocation(31, 32), + // (34,27): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // const string S6 = $"Failed to {VS}"; - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$""Failed to {VS}""").WithArguments("constant interpolated strings").WithLocation(34, 27), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$""Failed to {VS}""").WithArguments("constant interpolated strings", "10.0").WithLocation(34, 27), // (34,27): error CS0133: The expression being assigned to 'S6' must be constant // const string S6 = $"Failed to {VS}"; Diagnostic(ErrorCode.ERR_NotConstantExpression, @"$""Failed to {VS}""").WithArguments("S6").WithLocation(34, 27), - // (37,25): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (37,25): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // void M2(string S1 = $"Testing", object O = null, Namae N = null) - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$""Testing""").WithArguments("constant interpolated strings").WithLocation(37, 25), - // (40,18): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$""Testing""").WithArguments("constant interpolated strings", "10.0").WithLocation(37, 25), + // (40,18): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // case $"Level 5": - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$""Level 5""").WithArguments("constant interpolated strings").WithLocation(40, 18), - // (44,30): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$""Level 5""").WithArguments("constant interpolated strings", "10.0").WithLocation(40, 18), + // (44,30): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // if (N is Namae { X : $"ConstantInterpolatedString"}){ - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$""ConstantInterpolatedString""").WithArguments("constant interpolated strings").WithLocation(44, 30), - // (46,22): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$""ConstantInterpolatedString""").WithArguments("constant interpolated strings", "10.0").WithLocation(44, 30), + // (46,22): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // case $"Number 3": - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$""Number 3""").WithArguments("constant interpolated strings").WithLocation(46, 22), - // (48,22): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$""Number 3""").WithArguments("constant interpolated strings", "10.0").WithLocation(46, 22), + // (48,22): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // case $"Radio Noise": - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$""Radio Noise""").WithArguments("constant interpolated strings").WithLocation(48, 22), - // (49,31): error CS8652: The feature 'constant interpolated strings' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$""Radio Noise""").WithArguments("constant interpolated strings", "10.0").WithLocation(48, 22), + // (49,31): error CS8773: Feature 'constant interpolated strings' is not available in C# 9.0. Please use language version 10.0 or greater. // goto case $"Number 3"; - Diagnostic(ErrorCode.ERR_FeatureInPreview, @"$""Number 3""").WithArguments("constant interpolated strings").WithLocation(49, 31)); + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, @"$""Number 3""").WithArguments("constant interpolated strings", "10.0").WithLocation(49, 31)); } [Fact] diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/DelegateTypeTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/DelegateTypeTests.cs index 02010ef5ab222..f911fc9fe74fe 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/DelegateTypeTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/DelegateTypeTests.cs @@ -73,20 +73,20 @@ static void Main() var comp = CreateCompilation(source, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( - // (6,13): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (6,13): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // d = Main; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "Main").WithArguments("inferred delegate type").WithLocation(6, 13), - // (7,13): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "Main").WithArguments("inferred delegate type", "10.0").WithLocation(6, 13), + // (7,13): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // d = () => { }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "() => { }").WithArguments("inferred delegate type").WithLocation(7, 13), - // (8,13): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "() => { }").WithArguments("inferred delegate type", "10.0").WithLocation(7, 13), + // (8,13): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // d = delegate () { }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "delegate () { }").WithArguments("inferred delegate type").WithLocation(8, 13), - // (9,48): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "delegate () { }").WithArguments("inferred delegate type", "10.0").WithLocation(8, 13), + // (9,48): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // System.Linq.Expressions.Expression e = () => 1; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "() => 1").WithArguments("inferred delegate type").WithLocation(9, 48)); + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "() => 1").WithArguments("inferred delegate type", "10.0").WithLocation(9, 48)); - comp = CreateCompilation(source, parseOptions: TestOptions.RegularPreview); + comp = CreateCompilation(source, parseOptions: TestOptions.Regular10); comp.VerifyDiagnostics(); } @@ -1818,15 +1818,15 @@ static class E var comp = CreateCompilation(source, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( - // (7,13): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. - // c.M(Main); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "Main").WithArguments("inferred delegate type").WithLocation(7, 13), - // (8,13): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. - // c.M(() => { }); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "() => { }").WithArguments("inferred delegate type").WithLocation(8, 13)); + // (7,13): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. + // c.M(Main); // C#9: E.M(object x, Action y) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "Main").WithArguments("inferred delegate type", "10.0").WithLocation(7, 13), + // (8,13): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. + // c.M(() => { }); // C#9: E.M(object x, Action y) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "() => { }").WithArguments("inferred delegate type", "10.0").WithLocation(8, 13)); // Breaking change from C#9 which binds to E.M. - CompileAndVerify(source, parseOptions: TestOptions.RegularPreview, expectedOutput: + CompileAndVerify(source, parseOptions: TestOptions.Regular10, expectedOutput: @"C.M C.M "); @@ -1858,12 +1858,12 @@ static class E var comp = CreateCompilation(source, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( - // (8,13): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (8,13): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // c.M(() => 1); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "() => 1").WithArguments("inferred delegate type").WithLocation(8, 13)); + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "() => 1").WithArguments("inferred delegate type", "10.0").WithLocation(8, 13)); // Breaking change from C#9 which binds to E.M. - CompileAndVerify(source, parseOptions: TestOptions.RegularPreview, expectedOutput: @"C.M"); + CompileAndVerify(source, parseOptions: TestOptions.Regular10, expectedOutput: @"C.M"); } [Fact] @@ -1899,26 +1899,26 @@ static void Main() var comp = CreateCompilation(source, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( - // (14,12): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (14,12): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // FA(F2); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "F2").WithArguments("inferred delegate type").WithLocation(14, 12), - // (15,12): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "F2").WithArguments("inferred delegate type", "10.0").WithLocation(14, 12), + // (15,12): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // FB(F1); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "F1").WithArguments("inferred delegate type").WithLocation(15, 12), - // (18,12): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "F1").WithArguments("inferred delegate type", "10.0").WithLocation(15, 12), + // (18,12): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // FA(() => 0); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "() => 0").WithArguments("inferred delegate type").WithLocation(18, 12), - // (19,12): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "() => 0").WithArguments("inferred delegate type", "10.0").WithLocation(18, 12), + // (19,12): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // FB(() => { }); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "() => { }").WithArguments("inferred delegate type").WithLocation(19, 12), - // (22,12): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "() => { }").WithArguments("inferred delegate type", "10.0").WithLocation(19, 12), + // (22,12): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // FA(delegate () { return 0; }); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "delegate () { return 0; }").WithArguments("inferred delegate type").WithLocation(22, 12), - // (23,12): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "delegate () { return 0; }").WithArguments("inferred delegate type", "10.0").WithLocation(22, 12), + // (23,12): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // FB(delegate () { }); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "delegate () { }").WithArguments("inferred delegate type").WithLocation(23, 12)); + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "delegate () { }").WithArguments("inferred delegate type", "10.0").WithLocation(23, 12)); - CompileAndVerify(source, parseOptions: TestOptions.RegularPreview, expectedOutput: + CompileAndVerify(source, parseOptions: TestOptions.Regular10, expectedOutput: @"FA(Action) FA(Delegate) FB(Delegate) @@ -1954,11 +1954,11 @@ static void Main() var comp = CreateCompilation(source, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( - // (11,11): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (11,11): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // F(() => string.Empty); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "() => string.Empty").WithArguments("inferred delegate type").WithLocation(11, 11)); + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "() => string.Empty").WithArguments("inferred delegate type", "10.0").WithLocation(11, 11)); - CompileAndVerify(source, parseOptions: TestOptions.RegularPreview, expectedOutput: + CompileAndVerify(source, parseOptions: TestOptions.Regular10, expectedOutput: @"F(Expression>): () => 0 F(Expression): () => String.Empty "); diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/GlobalUsingDirectiveTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/GlobalUsingDirectiveTests.cs index b798bd8003748..35eb4bc5d2573 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/GlobalUsingDirectiveTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/GlobalUsingDirectiveTests.cs @@ -33,7 +33,19 @@ namespace ns2 {} namespace ns3 {} namespace ns4 {} "; - CreateCompilation(source, parseOptions: TestOptions.RegularPreview).VerifyDiagnostics( + CreateCompilation(source, parseOptions: TestOptions.Regular9).VerifyDiagnostics( + // (4,1): error CS8773: Feature 'global using directive' is not available in C# 9.0. Please use language version 10.0 or greater. + // global using ns1; + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "global using ns1;").WithArguments("global using directive", "10.0").WithLocation(4, 1), + // (6,1): error CS8773: Feature 'global using directive' is not available in C# 9.0. Please use language version 10.0 or greater. + // global using ns3; + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "global using ns3;").WithArguments("global using directive", "10.0").WithLocation(6, 1), + // (6,1): error CS8915: A global using directive must precede all non-global using directives. + // global using ns3; + Diagnostic(ErrorCode.ERR_GlobalUsingOutOfOrder, "global").WithLocation(6, 1) + ); + + CreateCompilation(source, parseOptions: TestOptions.Regular10).VerifyDiagnostics( // (6,1): error CS9002: A global using directive must precede all non-global using directives. // global using ns3; Diagnostic(ErrorCode.ERR_GlobalUsingOutOfOrder, "global").WithLocation(6, 1) @@ -52,7 +64,7 @@ public void MixingUsings_02() namespace ns1 {} namespace ns3 {} "; - CreateCompilation(source, parseOptions: TestOptions.RegularPreview).VerifyDiagnostics(); + CreateCompilation(source, parseOptions: TestOptions.Regular10).VerifyDiagnostics(); } [Fact] @@ -177,7 +189,7 @@ static void Main() } } "; - var comp2 = CreateCompilation(source2, parseOptions: TestOptions.RegularPreview, options: TestOptions.DebugExe, references: new[] { comp1Ref }); + var comp2 = CreateCompilation(source2, parseOptions: TestOptions.Regular10, options: TestOptions.DebugExe, references: new[] { comp1Ref }); CompileAndVerify(comp2, expectedOutput: @" C1 @@ -220,7 +232,7 @@ static void Main() } } "; - var comp3 = CreateCompilation(source3, parseOptions: TestOptions.RegularPreview, options: TestOptions.DebugExe, references: new[] { comp1Ref }); + var comp3 = CreateCompilation(source3, parseOptions: TestOptions.Regular10, options: TestOptions.DebugExe, references: new[] { comp1Ref }); CompileAndVerify(comp3, expectedOutput: @" C1 @@ -290,7 +302,7 @@ public static void Test() } } "; - var comp2 = CreateCompilation(source2, parseOptions: TestOptions.RegularPreview, options: TestOptions.DebugExe, references: new[] { comp1Ref }); + var comp2 = CreateCompilation(source2, parseOptions: TestOptions.Regular10, options: TestOptions.DebugExe, references: new[] { comp1Ref }); CompileAndVerify(comp2, expectedOutput: @" C1 diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/InheritanceBindingTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/InheritanceBindingTests.cs index 475be24bb3db1..a303513dcc29e 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/InheritanceBindingTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/InheritanceBindingTests.cs @@ -68,7 +68,7 @@ static void IGoo.Method12() { } private protected void IGoo.Method14() { } }"; - CreateCompilation(text).VerifyDiagnostics( + CreateCompilation(text, parseOptions: TestOptions.Regular9).VerifyDiagnostics( // (22,24): error CS0106: The modifier 'abstract' is not valid for this item // abstract void IGoo.Method1() { } Diagnostic(ErrorCode.ERR_BadMemberFlag, "Method1").WithArguments("abstract").WithLocation(22, 24), @@ -160,7 +160,7 @@ private int IGoo.Property10 { set { } } static int IGoo.Property12 { set { } } }"; - CreateCompilation(text).VerifyDiagnostics( + CreateCompilation(text, parseOptions: TestOptions.Regular9).VerifyDiagnostics( // (20,23): error CS0106: The modifier 'abstract' is not valid for this item Diagnostic(ErrorCode.ERR_BadMemberFlag, "Property1").WithArguments("abstract"), // (21,22): error CS0106: The modifier 'virtual' is not valid for this item @@ -305,7 +305,7 @@ static event System.Action IGoo.Event12 { add { } remove { } } // If the other errors are fixed ERR_ExternHasBody is reported. // We report all errors at once since they are unrelated, not cascading. - CreateCompilation(text).VerifyDiagnostics( + CreateCompilation(text, parseOptions: TestOptions.Regular9).VerifyDiagnostics( // (20,39): error CS0106: The modifier 'abstract' is not valid for this item // abstract event System.Action IGoo.Event1 { add { } remove { } } Diagnostic(ErrorCode.ERR_BadMemberFlag, "Event1").WithArguments("abstract"), diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/LambdaDiscardParametersTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/LambdaDiscardParametersTests.cs index 76a4850e08ab8..5fc1d4f4ef61c 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/LambdaDiscardParametersTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/LambdaDiscardParametersTests.cs @@ -368,15 +368,15 @@ static void Main() var comp = CreateCompilation(source, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( - // (8,14): error CS8652: The feature 'lambda attributes' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (8,14): error CS8773: Feature 'lambda attributes' is not available in C# 9.0. Please use language version 10.0 or greater. // a = ([A] _, y) => { }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "[A]").WithArguments("lambda attributes").WithLocation(8, 14), - // (9,24): error CS8652: The feature 'lambda attributes' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "[A]").WithArguments("lambda attributes", "10.0").WithLocation(8, 14), + // (9,24): error CS8773: Feature 'lambda attributes' is not available in C# 9.0. Please use language version 10.0 or greater. // a = (object x, [A] object _) => { }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "[A]").WithArguments("lambda attributes").WithLocation(9, 24)); + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "[A]").WithArguments("lambda attributes", "10.0").WithLocation(9, 24)); verifyAttributes(comp); - comp = CreateCompilation(source, parseOptions: TestOptions.RegularPreview); + comp = CreateCompilation(source, parseOptions: TestOptions.Regular10); comp.VerifyDiagnostics(); verifyAttributes(comp); diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/LambdaTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/LambdaTests.cs index 08fd8d7217ae5..19801f4bafc0b 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/LambdaTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/LambdaTests.cs @@ -3537,7 +3537,7 @@ static void Main() } }"; - var comp = CreateCompilation(new[] { sourceA, sourceB }, parseOptions: TestOptions.RegularPreview, options: TestOptions.ReleaseExe); + var comp = CreateCompilation(new[] { sourceA, sourceB }, parseOptions: TestOptions.Regular10, options: TestOptions.ReleaseExe); var tree = comp.SyntaxTrees[0]; var model = comp.GetSemanticModel(tree); var exprs = tree.GetRoot().DescendantNodes().OfType(); @@ -3607,23 +3607,23 @@ static void Main() var comp = CreateCompilation(source, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( - // (9,13): error CS8652: The feature 'lambda attributes' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (9,13): error CS8773: Feature 'lambda attributes' is not available in C# 9.0. Please use language version 10.0 or greater. // a = [A, B] (x, y) => { }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "[A, B]").WithArguments("lambda attributes").WithLocation(9, 13), - // (10,14): error CS8652: The feature 'lambda attributes' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "[A, B]").WithArguments("lambda attributes", "10.0").WithLocation(9, 13), + // (10,14): error CS8773: Feature 'lambda attributes' is not available in C# 9.0. Please use language version 10.0 or greater. // a = ([A] x, [B] y) => { }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "[A]").WithArguments("lambda attributes").WithLocation(10, 14), - // (10,21): error CS8652: The feature 'lambda attributes' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "[A]").WithArguments("lambda attributes", "10.0").WithLocation(10, 14), + // (10,21): error CS8773: Feature 'lambda attributes' is not available in C# 9.0. Please use language version 10.0 or greater. // a = ([A] x, [B] y) => { }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "[B]").WithArguments("lambda attributes").WithLocation(10, 21), - // (11,24): error CS8652: The feature 'lambda attributes' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "[B]").WithArguments("lambda attributes", "10.0").WithLocation(10, 21), + // (11,24): error CS8773: Feature 'lambda attributes' is not available in C# 9.0. Please use language version 10.0 or greater. // a = (object x, [A][B] object y) => { }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "[A]").WithArguments("lambda attributes").WithLocation(11, 24), - // (11,27): error CS8652: The feature 'lambda attributes' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "[A]").WithArguments("lambda attributes", "10.0").WithLocation(11, 24), + // (11,27): error CS8773: Feature 'lambda attributes' is not available in C# 9.0. Please use language version 10.0 or greater. // a = (object x, [A][B] object y) => { }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "[B]").WithArguments("lambda attributes").WithLocation(11, 27)); + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "[B]").WithArguments("lambda attributes", "10.0").WithLocation(11, 27)); - comp = CreateCompilation(source, parseOptions: TestOptions.RegularPreview); + comp = CreateCompilation(source, parseOptions: TestOptions.Regular10); comp.VerifyDiagnostics(); } @@ -3662,7 +3662,7 @@ static void Main() var comp = CreateCompilation(source, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics(expectedDiagnostics); - comp = CreateCompilation(source, parseOptions: TestOptions.RegularPreview); + comp = CreateCompilation(source, parseOptions: TestOptions.Regular10); comp.VerifyDiagnostics(expectedDiagnostics); } @@ -4346,17 +4346,17 @@ static void F() var comp = CreateCompilation(source, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( - // (6,22): error CS8652: The feature 'lambda return type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (6,22): error CS8773: Feature 'lambda return type' is not available in C# 9.0. Please use language version 10.0 or greater. // Func f1 = T () => default; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "T").WithArguments("lambda return type").WithLocation(6, 22), - // (7,25): error CS8652: The feature 'lambda return type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "T").WithArguments("lambda return type", "10.0").WithLocation(6, 22), + // (7,25): error CS8773: Feature 'lambda return type' is not available in C# 9.0. Please use language version 10.0 or greater. // Func f2 = T (x) => { return x; }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "T").WithArguments("lambda return type").WithLocation(7, 25), - // (8,25): error CS8652: The feature 'lambda return type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "T").WithArguments("lambda return type", "10.0").WithLocation(7, 25), + // (8,25): error CS8773: Feature 'lambda return type' is not available in C# 9.0. Please use language version 10.0 or greater. // Func f3 = T (T x) => x; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "T").WithArguments("lambda return type").WithLocation(8, 25)); + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "T").WithArguments("lambda return type", "10.0").WithLocation(8, 25)); - comp = CreateCompilation(source, parseOptions: TestOptions.RegularPreview); + comp = CreateCompilation(source, parseOptions: TestOptions.Regular10); comp.VerifyDiagnostics(); } diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/NullableReferenceTypesTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/NullableReferenceTypesTests.cs index 7524584f6fda9..fa06937b150cd 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/NullableReferenceTypesTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/NullableReferenceTypesTests.cs @@ -1945,13 +1945,13 @@ static void M(A a) } } }"; - CreateCompilation(source).VerifyDiagnostics( + CreateCompilation(source, parseOptions: TestOptions.Regular9).VerifyDiagnostics( // (8,9): error CS1656: Cannot assign to 'E' because it is a 'method group' // a.E! += a.E!; // 1 Diagnostic(ErrorCode.ERR_AssgReadonlyLocalCause, "a.E").WithArguments("E", "method group").WithLocation(8, 9), - // (9,13): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (9,13): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // if (a.E! != null) // 2 - Diagnostic(ErrorCode.ERR_FeatureInPreview, "a.E").WithArguments("inferred delegate type").WithLocation(9, 13), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "a.E").WithArguments("inferred delegate type", "10.0").WithLocation(9, 13), // (11,15): error CS1503: Argument 1: cannot convert from 'method group' to 'A' // M(a.E!); // 3 Diagnostic(ErrorCode.ERR_BadArgType, "a.E").WithArguments("1", "method group", "A").WithLocation(11, 15), @@ -1970,9 +1970,9 @@ static void M(A a) // (17,9): error CS1656: Cannot assign to 'F' because it is a 'method group' // a.F! += a.F!; // 8 Diagnostic(ErrorCode.ERR_AssgReadonlyLocalCause, "a.F").WithArguments("F", "method group").WithLocation(17, 9), - // (18,13): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (18,13): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // if (a.F! != null) // 9 - Diagnostic(ErrorCode.ERR_FeatureInPreview, "a.F").WithArguments("inferred delegate type").WithLocation(18, 13), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "a.F").WithArguments("inferred delegate type", "10.0").WithLocation(18, 13), // (20,15): error CS1503: Argument 1: cannot convert from 'method group' to 'A' // M(a.F!); // 10 Diagnostic(ErrorCode.ERR_BadArgType, "a.F").WithArguments("1", "method group", "A").WithLocation(20, 15), diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTests5.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTests5.cs index f336211da27bb..2fb1dd4436933 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTests5.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTests5.cs @@ -522,7 +522,7 @@ class C { public object Prop3 => null; } Statements (0) "; - VerifyFlowGraphAndDiagnosticsForTest(src, expectedFlowGraph, DiagnosticDescription.None, parseOptions: TestOptions.RegularPreview); + VerifyFlowGraphAndDiagnosticsForTest(src, expectedFlowGraph, DiagnosticDescription.None, parseOptions: TestOptions.Regular10); } [Fact] @@ -684,7 +684,7 @@ struct C { public object Field3; } Statements (0) "; - VerifyFlowGraphAndDiagnosticsForTest(src, expectedFlowGraph, expectedDiagnostics, parseOptions: TestOptions.RegularPreview); + VerifyFlowGraphAndDiagnosticsForTest(src, expectedFlowGraph, expectedDiagnostics, parseOptions: TestOptions.Regular10); } [Fact] @@ -1503,9 +1503,9 @@ public void Deconstruct(out C c1, out C c2) "; var compilation = CreateCompilation(source, parseOptions: TestOptions.Regular9); compilation.VerifyEmitDiagnostics( - // (8,22): error CS8652: The feature 'extended property patterns' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (8,22): error CS8773: Feature 'extended property patterns' is not available in C# 9.0. Please use language version 10.0 or greater. // _ = this is (Property.Property: null, Property: null); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "Property.Property").WithArguments("extended property patterns").WithLocation(8, 22), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "Property.Property").WithArguments("extended property patterns", "10.0").WithLocation(8, 22), // (8,22): error CS1001: Identifier expected // _ = this is (Property.Property: null, Property: null); Diagnostic(ErrorCode.ERR_IdentifierExpected, "Property.Property").WithLocation(8, 22), diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/RecordStructTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/RecordStructTests.cs index 226260166b8ab..75948efc9befc 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/RecordStructTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/RecordStructTests.cs @@ -281,19 +281,19 @@ record struct Point(int x, int y); comp = CreateCompilation(new[] { src2, IsExternalInitTypeDefinition }, parseOptions: TestOptions.Regular9, options: TestOptions.ReleaseDll); comp.VerifyDiagnostics( - // (2,8): error CS8652: The feature 'record structs' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (2,8): error CS8773: Feature 'record structs' is not available in C# 9.0. Please use language version 10.0 or greater. // record struct Point { } - Diagnostic(ErrorCode.ERR_FeatureInPreview, "struct").WithArguments("record structs").WithLocation(2, 8) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "struct").WithArguments("record structs", "10.0").WithLocation(2, 8) ); comp = CreateCompilation(new[] { src3, IsExternalInitTypeDefinition }, parseOptions: TestOptions.Regular9, options: TestOptions.ReleaseDll); comp.VerifyDiagnostics( - // (2,8): error CS8652: The feature 'record structs' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. - // record struct Point(int x, int y); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "struct").WithArguments("record structs").WithLocation(2, 8) + // (2,8): error CS8773: Feature 'record structs' is not available in C# 9.0. Please use language version 10.0 or greater. + // record struct Point { } + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "struct").WithArguments("record structs", "10.0").WithLocation(2, 8) ); - comp = CreateCompilation(new[] { src1, IsExternalInitTypeDefinition }, parseOptions: TestOptions.RegularPreview, options: TestOptions.ReleaseDll); + comp = CreateCompilation(new[] { src1, IsExternalInitTypeDefinition }, parseOptions: TestOptions.Regular10, options: TestOptions.ReleaseDll); comp.VerifyDiagnostics( // (2,13): error CS1514: { expected // struct Point(int x, int y); @@ -324,10 +324,10 @@ record struct Point(int x, int y); Diagnostic(ErrorCode.ERR_UseDefViolation, "int y").WithArguments("y").WithLocation(2, 21) ); - comp = CreateCompilation(new[] { src2, IsExternalInitTypeDefinition }, parseOptions: TestOptions.RegularPreview, options: TestOptions.ReleaseDll); + comp = CreateCompilation(new[] { src2, IsExternalInitTypeDefinition }, parseOptions: TestOptions.Regular10, options: TestOptions.ReleaseDll); comp.VerifyDiagnostics(); - comp = CreateCompilation(new[] { src3, IsExternalInitTypeDefinition }, parseOptions: TestOptions.RegularPreview, options: TestOptions.ReleaseDll); + comp = CreateCompilation(new[] { src3, IsExternalInitTypeDefinition }, parseOptions: TestOptions.Regular10, options: TestOptions.ReleaseDll); comp.VerifyDiagnostics(); } @@ -376,23 +376,23 @@ record struct Point { } comp = CreateCompilation(new[] { src2, IsExternalInitTypeDefinition }, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( - // (4,12): error CS8652: The feature 'record structs' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (4,12): error CS8773: Feature 'record structs' is not available in C# 9.0. Please use language version 10.0 or greater. // record struct Point { } - Diagnostic(ErrorCode.ERR_FeatureInPreview, "struct").WithArguments("record structs").WithLocation(4, 12) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "struct").WithArguments("record structs", "10.0").WithLocation(4, 12) ); comp = CreateCompilation(new[] { src3, IsExternalInitTypeDefinition }, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( - // (4,12): error CS8652: The feature 'record structs' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (4,12): error CS8773: Feature 'record structs' is not available in C# 9.0. Please use language version 10.0 or greater. // record struct Point(int x, int y); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "struct").WithArguments("record structs").WithLocation(4, 12) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "struct").WithArguments("record structs", "10.0").WithLocation(4, 12) ); comp = CreateCompilation(src4, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( - // (4,12): error CS8652: The feature 'record structs' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (4,12): error CS8773: Feature 'record structs' is not available in C# 9.0. Please use language version 10.0 or greater. // record struct Point { } - Diagnostic(ErrorCode.ERR_FeatureInPreview, "struct").WithArguments("record structs").WithLocation(4, 12) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "struct").WithArguments("record structs", "10.0").WithLocation(4, 12) ); comp = CreateCompilation(src1); @@ -2959,7 +2959,7 @@ public static class IsExternalInit } "; - var comp = CreateCompilation(src, parseOptions: TestOptions.RegularWithDocumentationComments.WithLanguageVersion(LanguageVersion.Preview)); + var comp = CreateCompilation(src, parseOptions: TestOptions.RegularWithDocumentationComments); comp.VerifyDiagnostics(); var cMember = comp.GetMember("C"); @@ -3005,7 +3005,7 @@ public static class IsExternalInit } "; - var comp = CreateCompilation(src, parseOptions: TestOptions.RegularWithDocumentationComments.WithLanguageVersion(LanguageVersion.Preview)); + var comp = CreateCompilation(src, parseOptions: TestOptions.RegularWithDocumentationComments); comp.VerifyDiagnostics( // (7,52): warning CS1574: XML comment has cref attribute 'x' that could not be resolved // /// Description for @@ -6449,9 +6449,9 @@ public B M() }"; var comp = CreateCompilation(src, parseOptions: TestOptions.Regular9); comp.VerifyEmitDiagnostics( - // (13,16): error CS8652: The feature 'with on structs' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (13,16): error CS8773: Feature 'with on structs' is not available in C# 9.0. Please use language version 10.0 or greater. // return this with { X = 42 }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "this with { X = 42 }").WithArguments("with on structs").WithLocation(13, 16) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "this with { X = 42 }").WithArguments("with on structs", "10.0").WithLocation(13, 16) ); comp = CreateCompilation(src); @@ -7775,12 +7775,12 @@ static T Identity(T t) }"; var comp = CreateCompilation(src, parseOptions: TestOptions.Regular9); comp.VerifyEmitDiagnostics( - // (9,17): error CS8652: The feature 'with on anonymous types' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (9,17): error CS8773: Feature 'with on anonymous types' is not available in C# 9.0. Please use language version 10.0 or greater. // var b = Identity(a) with { A = Identity(30), B = Identity(40) }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "Identity(a) with { A = Identity(30), B = Identity(40) }").WithArguments("with on anonymous types").WithLocation(9, 17) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "Identity(a) with { A = Identity(30), B = Identity(40) }").WithArguments("with on anonymous types", "10.0").WithLocation(9, 17) ); - comp = CreateCompilation(src, parseOptions: TestOptions.RegularPreview); + comp = CreateCompilation(src, parseOptions: TestOptions.Regular10); comp.VerifyEmitDiagnostics(); var verifier = CompileAndVerify(comp, expectedOutput: "Identity({ A = 10, B = 20 }) Identity(30) Identity(40) { A = 30, B = 40 }"); verifier.VerifyIL("C.M", @" @@ -10098,15 +10098,15 @@ record struct A(int X) "; var comp = CreateCompilation(source, parseOptions: TestOptions.Regular9); comp.VerifyEmitDiagnostics( - // (8,8): error CS8652: The feature 'record structs' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (8,8): error CS8773: Feature 'record structs' is not available in C# 9.0. Please use language version 10.0 or greater. // record struct A(int X) - Diagnostic(ErrorCode.ERR_FeatureInPreview, "struct").WithArguments("record structs").WithLocation(8, 8), - // (8,17): error CS8652: The feature 'positional fields in records' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "struct").WithArguments("record structs", "10.0").WithLocation(8, 8), + // (8,17): error CS8773: Feature 'positional fields in records' is not available in C# 9.0. Please use language version 10.0 or greater. // record struct A(int X) - Diagnostic(ErrorCode.ERR_FeatureInPreview, "int X").WithArguments("positional fields in records").WithLocation(8, 17) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "int X").WithArguments("positional fields in records", "10.0").WithLocation(8, 17) ); - comp = CreateCompilation(source, parseOptions: TestOptions.RegularPreview); + comp = CreateCompilation(source, parseOptions: TestOptions.Regular10); comp.VerifyDiagnostics(); var verifier = CompileAndVerify(comp, expectedOutput: "42 - 42"); verifier.VerifyIL("A.Deconstruct", @" diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs index f63456641bf32..b8cb91b2b0b9a 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs @@ -282,12 +282,12 @@ record class Point(int x, int y); comp = CreateCompilation(new[] { src, IsExternalInitTypeDefinition }, parseOptions: TestOptions.Regular9, options: TestOptions.ReleaseDll); comp.VerifyDiagnostics( - // (2,8): error CS8652: The feature 'record structs' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (2,8): error CS8773: Feature 'record structs' is not available in C# 9.0. Please use language version 10.0 or greater. // record class Point(int x, int y); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "class").WithArguments("record structs").WithLocation(2, 8) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "class").WithArguments("record structs", "10.0").WithLocation(2, 8) ); - comp = CreateCompilation(new[] { src, IsExternalInitTypeDefinition }, parseOptions: TestOptions.RegularPreview, options: TestOptions.ReleaseDll); + comp = CreateCompilation(new[] { src, IsExternalInitTypeDefinition }, parseOptions: TestOptions.Regular10, options: TestOptions.ReleaseDll); comp.VerifyDiagnostics(); } @@ -852,7 +852,7 @@ public partial record class C public int P2 { get; set; } = X; } "; - var comp = CreateCompilation(new[] { src, IsExternalInitTypeDefinition }, options: TestOptions.DebugExe, parseOptions: TestOptions.RegularPreview); + var comp = CreateCompilation(new[] { src, IsExternalInitTypeDefinition }, options: TestOptions.DebugExe, parseOptions: TestOptions.Regular10); CompileAndVerify(comp, expectedOutput: "(2, 2)", verify: Verification.Skipped /* init-only */).VerifyDiagnostics(); } @@ -1106,7 +1106,7 @@ public void RecordProperties_05_RecordClass() record class C(int X, int X) { }"; - var comp = CreateCompilation(new[] { src, IsExternalInitTypeDefinition }, parseOptions: TestOptions.RegularPreview); + var comp = CreateCompilation(new[] { src, IsExternalInitTypeDefinition }, parseOptions: TestOptions.Regular10); comp.VerifyDiagnostics( // (2,27): error CS0100: The parameter name 'X' is a duplicate // record class C(int X, int X) @@ -1247,9 +1247,9 @@ class P1 { } // (1,17): error CS0102: The type 'C' already contains a definition for 'P1' // record C(object P1, object P2, object P3, object P4) Diagnostic(ErrorCode.ERR_DuplicateNameInClass, "P1").WithArguments("C", "P1").WithLocation(1, 17), - // (1,21): error CS8652: The feature 'positional fields in records' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (1,21): error CS8773: Feature 'positional fields in records' is not available in C# 9.0. Please use language version 10.0 or greater. // record C(object P1, object P2, object P3, object P4) - Diagnostic(ErrorCode.ERR_FeatureInPreview, "object P2").WithArguments("positional fields in records").WithLocation(1, 21), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "object P2").WithArguments("positional fields in records", "10.0").WithLocation(1, 21), // (1,28): warning CS8907: Parameter 'P2' is unread. Did you forget to use it to initialize the property with that name? // record C(object P1, object P2, object P3, object P4) Diagnostic(ErrorCode.WRN_UnreadRecordParameter, "P2").WithArguments("P2").WithLocation(1, 28), @@ -1261,7 +1261,7 @@ class P1 { } Diagnostic(ErrorCode.ERR_DuplicateNameInClass, "P4").WithArguments("C", "P4").WithLocation(6, 9) ); - comp = CreateCompilation(new[] { src, IsExternalInitTypeDefinition }, parseOptions: TestOptions.RegularPreview); + comp = CreateCompilation(new[] { src, IsExternalInitTypeDefinition }, parseOptions: TestOptions.Regular10); comp.VerifyDiagnostics( // (1,17): error CS0102: The type 'C' already contains a definition for 'P1' // record C(object P1, object P2, object P3, object P4) @@ -1667,7 +1667,7 @@ static void Main() } "; - var verifier = CompileAndVerify(src, expectedOutput: "True", parseOptions: TestOptions.RegularPreview); + var verifier = CompileAndVerify(src, expectedOutput: "True", parseOptions: TestOptions.Regular10); verifier.VerifyDiagnostics(); verifier.VerifyIL("C..ctor()", @" @@ -2765,9 +2765,9 @@ public override void M(U t) }"; var comp = CreateCompilationWithIL(new[] { src, IsExternalInitTypeDefinition }, ilSource: ilSource, parseOptions: TestOptions.Regular9); comp.VerifyDiagnostics( - // (11,13): error CS8652: The feature 'with on structs' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (11,13): error CS8773: Feature 'with on structs' is not available in C# 9.0. Please use language version 10.0 or greater. // _ = t with { X = 2, Property = 3 }; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "t with { X = 2, Property = 3 }").WithArguments("with on structs").WithLocation(11, 13), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "t with { X = 2, Property = 3 }").WithArguments("with on structs", "10.0").WithLocation(11, 13), // (11,22): error CS0117: 'U' does not contain a definition for 'X' // _ = t with { X = 2, Property = 3 }; Diagnostic(ErrorCode.ERR_NoSuchMember, "X").WithArguments("U", "X").WithLocation(11, 22), @@ -2776,7 +2776,7 @@ public override void M(U t) Diagnostic(ErrorCode.ERR_NoSuchMember, "Property").WithArguments("U", "Property").WithLocation(11, 29) ); - comp = CreateCompilationWithIL(new[] { src, IsExternalInitTypeDefinition }, ilSource: ilSource, parseOptions: TestOptions.RegularPreview); + comp = CreateCompilationWithIL(new[] { src, IsExternalInitTypeDefinition }, ilSource: ilSource, parseOptions: TestOptions.Regular10); comp.VerifyDiagnostics( // (11,22): error CS0117: 'U' does not contain a definition for 'X' // _ = t with { X = 2, Property = 3 }; @@ -5988,7 +5988,7 @@ record C1 record C2 : C1; "; - var comp = CreateCompilation(src, parseOptions: usePreview ? TestOptions.RegularPreview : TestOptions.Regular9, options: TestOptions.DebugExe); + var comp = CreateCompilation(src, parseOptions: usePreview ? TestOptions.Regular10 : TestOptions.Regular9, options: TestOptions.DebugExe); if (usePreview) { comp.VerifyEmitDiagnostics(); @@ -5997,9 +5997,9 @@ record C2 : C1; else { comp.VerifyEmitDiagnostics( - // (4,35): error CS8652: The feature 'sealed ToString in record' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. - // public sealed override string ToString() => throw null; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "ToString").WithArguments("sealed ToString in record").WithLocation(7, 35) + // (7,35): error CS8773: Feature 'sealed ToString in record' is not available in C# 9.0. Please use language version 10.0 or greater. + // public sealed override string ToString() => "C1"; + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "ToString").WithArguments("sealed ToString in record", "10.0").WithLocation(7, 35) ); } } @@ -7376,7 +7376,7 @@ public record B : A { var comp = CreateCompilationWithIL( new[] { source, IsExternalInitTypeDefinition }, ilSource: ilSource, - parseOptions: usePreview ? TestOptions.RegularPreview : TestOptions.Regular9); + parseOptions: usePreview ? TestOptions.Regular10 : TestOptions.Regular9); if (usePreview) { comp.VerifyEmitDiagnostics(); @@ -7385,9 +7385,9 @@ public record B : A { else { comp.VerifyEmitDiagnostics( - // (2,1): error CS8912: Inheriting from a record with a sealed 'Object.ToString' is not supported in C# 9.0. Please use language version 'preview' or greater. - // record B : A - Diagnostic(ErrorCode.ERR_InheritingFromRecordWithSealedToString, "B").WithArguments("9.0", "preview").WithLocation(5, 15) + // (5,15): error CS8912: Inheriting from a record with a sealed 'Object.ToString' is not supported in C# 9.0. Please use language version '10.0' or greater. + // public record B : A { + Diagnostic(ErrorCode.ERR_InheritingFromRecordWithSealedToString, "B").WithArguments("9.0", "10.0").WithLocation(5, 15) ); } } @@ -7425,7 +7425,7 @@ record C1 } "; - var comp = CreateCompilation(src, parseOptions: usePreview ? TestOptions.RegularPreview : TestOptions.Regular9); + var comp = CreateCompilation(src, parseOptions: usePreview ? TestOptions.Regular10 : TestOptions.Regular9); if (usePreview) { comp.VerifyEmitDiagnostics(); @@ -7433,9 +7433,9 @@ record C1 else { comp.VerifyEmitDiagnostics( - // (4,35): error CS8652: The feature 'sealed ToString in record' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (4,35): error CS8773: Feature 'sealed ToString in record' is not available in C# 9.0. Please use language version 10.0 or greater. // public sealed override string ToString() => throw null; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "ToString").WithArguments("sealed ToString in record").WithLocation(4, 35) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "ToString").WithArguments("sealed ToString in record", "10.0").WithLocation(4, 35) ); } } @@ -10044,9 +10044,9 @@ static void Main() // (7,21): warning CS8907: Parameter 'Y' is unread. Did you forget to use it to initialize the property with that name? // record B(int X, int Y, int Z) : A Diagnostic(ErrorCode.WRN_UnreadRecordParameter, "Y").WithArguments("Y").WithLocation(7, 21), - // (7,24): error CS8652: The feature 'positional fields in records' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (7,24): error CS8773: Feature 'positional fields in records' is not available in C# 9.0. Please use language version 10.0 or greater. // record B(int X, int Y, int Z) : A - Diagnostic(ErrorCode.ERR_FeatureInPreview, "int Z").WithArguments("positional fields in records").WithLocation(7, 24), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "int Z").WithArguments("positional fields in records", "10.0").WithLocation(7, 24), // (7,28): warning CS8907: Parameter 'Z' is unread. Did you forget to use it to initialize the property with that name? // record B(int X, int Y, int Z) : A Diagnostic(ErrorCode.WRN_UnreadRecordParameter, "Z").WithArguments("Z").WithLocation(7, 28)); @@ -10905,9 +10905,9 @@ public class P1 { } // (1,17): warning CS8907: Parameter 'P1' is unread. Did you forget to use it to initialize the property with that name? // record B(object P1, object P2, object P3, object P4) : A Diagnostic(ErrorCode.WRN_UnreadRecordParameter, "P1").WithArguments("P1").WithLocation(1, 17), - // (1,21): error CS8652: The feature 'positional fields in records' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (1,21): error CS8773: Feature 'positional fields in records' is not available in C# 9.0. Please use language version 10.0 or greater. // record B(object P1, object P2, object P3, object P4) : A - Diagnostic(ErrorCode.ERR_FeatureInPreview, "object P2").WithArguments("positional fields in records").WithLocation(1, 21), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "object P2").WithArguments("positional fields in records", "10.0").WithLocation(1, 21), // (1,28): warning CS8907: Parameter 'P2' is unread. Did you forget to use it to initialize the property with that name? // record B(object P1, object P2, object P3, object P4) : A Diagnostic(ErrorCode.WRN_UnreadRecordParameter, "P2").WithArguments("P2").WithLocation(1, 28), @@ -14556,9 +14556,9 @@ static void Main() "; var comp = CreateCompilation(source, parseOptions: TestOptions.Regular9); comp.VerifyEmitDiagnostics( - // (4,10): error CS8652: The feature 'positional fields in records' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (4,10): error CS8773: Feature 'positional fields in records' is not available in C# 9.0. Please use language version 10.0 or greater. // record C(int X) - Diagnostic(ErrorCode.ERR_FeatureInPreview, "int X").WithArguments("positional fields in records").WithLocation(4, 10), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "int X").WithArguments("positional fields in records", "10.0").WithLocation(4, 10), // (4,14): warning CS8907: Parameter 'X' is unread. Did you forget to use it to initialize the property with that name? // record C(int X) Diagnostic(ErrorCode.WRN_UnreadRecordParameter, "X").WithArguments("X").WithLocation(4, 14), @@ -14567,7 +14567,7 @@ static void Main() Diagnostic(ErrorCode.WRN_UnreferencedField, "X").WithArguments("C.X").WithLocation(6, 9) ); - comp = CreateCompilation(source, parseOptions: TestOptions.RegularPreview); + comp = CreateCompilation(source, parseOptions: TestOptions.Regular10); comp.VerifyDiagnostics( // (4,14): warning CS8907: Parameter 'X' is unread. Did you forget to use it to initialize the property with that name? // record C(int X) @@ -15827,7 +15827,7 @@ public void Overrides_01(bool usePreview) record B(int X, int Y) : A { }"; - var comp = CreateCompilation(new[] { source, IsExternalInitTypeDefinition }, parseOptions: usePreview ? TestOptions.RegularPreview : TestOptions.Regular9); + var comp = CreateCompilation(new[] { source, IsExternalInitTypeDefinition }, parseOptions: usePreview ? TestOptions.Regular10 : TestOptions.Regular9); if (usePreview) { comp.VerifyDiagnostics( @@ -15845,15 +15845,15 @@ record B(int X, int Y) : A else { comp.VerifyDiagnostics( - // (3,33): error CS0111: Type 'A' already defines a member called 'Equals' with the same parameter types - // public sealed override bool Equals(object other) => false; - Diagnostic(ErrorCode.ERR_MemberAlreadyExists, "Equals").WithArguments("Equals", "A").WithLocation(3, 33), - // (5,35): error CS8652: The feature 'sealed ToString in record' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. - // public sealed override string ToString() => null; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "ToString").WithArguments("sealed ToString in record").WithLocation(5, 35), // (4,32): error CS8870: 'A.GetHashCode()' cannot be sealed because containing record is not sealed. // public sealed override int GetHashCode() => 0; Diagnostic(ErrorCode.ERR_SealedAPIInRecord, "GetHashCode").WithArguments("A.GetHashCode()").WithLocation(4, 32), + // (5,35): error CS8773: Feature 'sealed ToString in record' is not available in C# 9.0. Please use language version 10.0 or greater. + // public sealed override string ToString() => null; + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "ToString").WithArguments("sealed ToString in record", "10.0").WithLocation(5, 35), + // (3,33): error CS0111: Type 'A' already defines a member called 'Equals' with the same parameter types + // public sealed override bool Equals(object other) => false; + Diagnostic(ErrorCode.ERR_MemberAlreadyExists, "Equals").WithArguments("Equals", "A").WithLocation(3, 33), // (7,8): error CS0239: 'B.GetHashCode()': cannot override inherited member 'A.GetHashCode()' because it is sealed // record B(int X, int Y) : A Diagnostic(ErrorCode.ERR_CantOverrideSealed, "B").WithArguments("B.GetHashCode()", "A.GetHashCode()").WithLocation(7, 8) @@ -28054,7 +28054,7 @@ public static class IsExternalInit } "; - var comp = CreateCompilation(src, parseOptions: TestOptions.RegularWithDocumentationComments.WithLanguageVersion(LanguageVersion.Preview)); + var comp = CreateCompilation(src, parseOptions: TestOptions.RegularWithDocumentationComments); comp.VerifyDiagnostics(); var cMember = comp.GetMember("C"); @@ -28972,12 +28972,12 @@ record A(int X) "; var comp = CreateCompilation(source, parseOptions: TestOptions.Regular9); comp.VerifyEmitDiagnostics( - // (8,10): error CS8652: The feature 'positional fields in records' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. - // record A(int X) - Diagnostic(ErrorCode.ERR_FeatureInPreview, "int X").WithArguments("positional fields in records").WithLocation(8, 10) + // (8,10): error CS8773: Feature 'positional fields in records' is not available in C# 9.0. Please use language version 10.0 or greater. + // record A(int X) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "int X").WithArguments("positional fields in records", "10.0").WithLocation(8, 10) ); - comp = CreateCompilation(source, parseOptions: TestOptions.RegularPreview); + comp = CreateCompilation(source, parseOptions: TestOptions.Regular10); comp.VerifyDiagnostics(); var verifier = CompileAndVerify(comp, expectedOutput: "42 - 42"); verifier.VerifyIL("A.Deconstruct", @" diff --git a/src/Compilers/CSharp/Test/Semantic/SourceGeneration/GeneratorDriverTests.cs b/src/Compilers/CSharp/Test/Semantic/SourceGeneration/GeneratorDriverTests.cs index bfb72a21c30bb..80d65639594e1 100644 --- a/src/Compilers/CSharp/Test/Semantic/SourceGeneration/GeneratorDriverTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/SourceGeneration/GeneratorDriverTests.cs @@ -1244,6 +1244,7 @@ void verifyDiagnosticsWithSource(string source, (Diagnostic, TextSpan)[] reportD [Theory] [InlineData(LanguageVersion.CSharp9)] + [InlineData(LanguageVersion.CSharp10)] [InlineData(LanguageVersion.Preview)] public void GeneratorDriver_Prefers_Incremental_Generators(LanguageVersion langVer) { @@ -1284,6 +1285,7 @@ class C { } [Theory] [InlineData(LanguageVersion.CSharp9)] + [InlineData(LanguageVersion.CSharp10)] [InlineData(LanguageVersion.Preview)] public void GeneratorDriver_Initializes_Incremental_Generators(LanguageVersion langVer) { @@ -1337,7 +1339,7 @@ public void Incremental_Generators_Exception_During_Execution() var source = @" class C { } "; - var parseOptions = TestOptions.Regular.WithLanguageVersion(LanguageVersion.Preview); + var parseOptions = TestOptions.RegularPreview; Compilation compilation = CreateCompilation(source, options: TestOptions.DebugDll, parseOptions: parseOptions); compilation.VerifyDiagnostics(); @@ -1362,7 +1364,7 @@ public void Incremental_Generators_Exception_During_Execution_Doesnt_Produce_Any var source = @" class C { } "; - var parseOptions = TestOptions.Regular.WithLanguageVersion(LanguageVersion.Preview); + var parseOptions = TestOptions.RegularPreview; Compilation compilation = CreateCompilation(source, options: TestOptions.DebugDll, parseOptions: parseOptions); compilation.VerifyDiagnostics(); diff --git a/src/Compilers/CSharp/Test/Semantic/SourceGeneration/StateTableTests.cs b/src/Compilers/CSharp/Test/Semantic/SourceGeneration/StateTableTests.cs index 31ac16e6a4ebc..d5a8c60275cae 100644 --- a/src/Compilers/CSharp/Test/Semantic/SourceGeneration/StateTableTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/SourceGeneration/StateTableTests.cs @@ -257,7 +257,7 @@ private void AssertTableEntries(NodeStateTable table, IList<(T item, Entry private DriverStateTable.Builder GetBuilder(DriverStateTable previous) { - var options = CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.Preview); + var options = CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp10); var c = CSharpCompilation.Create("empty"); var state = new GeneratorDriverState(options, CompilerAnalyzerConfigOptionsProvider.Empty, diff --git a/src/Compilers/CSharp/Test/Symbol/Compilation/CompilationAPITests.cs b/src/Compilers/CSharp/Test/Symbol/Compilation/CompilationAPITests.cs index 188a65c7fe99f..00d944065650d 100644 --- a/src/Compilers/CSharp/Test/Symbol/Compilation/CompilationAPITests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Compilation/CompilationAPITests.cs @@ -2060,14 +2060,14 @@ public void ReferenceManagerReuse_WithReferences() [Fact] public void ReferenceManagerReuse_WithSyntaxTrees() { - var ta = Parse("class C { }"); + var ta = Parse("class C { }", options: TestOptions.Regular10); var tb = Parse(@" class C { }", options: TestOptions.Script); var tc = Parse(@" #r ""bar"" // error: #r in regular code -class D { }"); +class D { }", options: TestOptions.Regular10); var tr = Parse(@" #r ""goo"" diff --git a/src/Compilers/CSharp/Test/Symbol/Compilation/UsedAssembliesTests.cs b/src/Compilers/CSharp/Test/Symbol/Compilation/UsedAssembliesTests.cs index 3e291c27d2dac..896a66f247db4 100644 --- a/src/Compilers/CSharp/Test/Symbol/Compilation/UsedAssembliesTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Compilation/UsedAssembliesTests.cs @@ -186,7 +186,7 @@ void assertUsedAssemblyReferences(Compilation comp, MetadataReference[] expected "); builder.Append(afterUsings); - var parseOptions = ((CSharpParseOptions)tree.Options).WithLanguageVersion(LanguageVersion.Preview); + var parseOptions = ((CSharpParseOptions)tree.Options).WithLanguageVersion(LanguageVersion.CSharp10); yield return (comp.ReplaceSyntaxTree(tree, CSharpTestBase.Parse(builder.ToString(), tree.FilePath, parseOptions)), before, after); // With global usings in a separate unit diff --git a/src/Compilers/CSharp/Test/Symbol/DocumentationComments/CrefTests.cs b/src/Compilers/CSharp/Test/Symbol/DocumentationComments/CrefTests.cs index 19bf6cfcede32..8b4c6f0b30c14 100644 --- a/src/Compilers/CSharp/Test/Symbol/DocumentationComments/CrefTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/DocumentationComments/CrefTests.cs @@ -6769,7 +6769,7 @@ public void OnRecordStruct(string terminator) /// record struct CacheContext(string RelativePathBase)" + terminator; - var comp = CreateCompilation(source, parseOptions: TestOptions.RegularWithDocumentationComments.WithLanguageVersion(LanguageVersion.Preview), targetFramework: TargetFramework.NetCoreApp); + var comp = CreateCompilation(source, parseOptions: TestOptions.RegularWithDocumentationComments.WithLanguageVersion(LanguageVersion.CSharp10), targetFramework: TargetFramework.NetCoreApp); comp.VerifyDiagnostics( // (6,25): warning CS1574: XML comment has cref attribute 'InvalidCref' that could not be resolved // /// See also . @@ -6814,7 +6814,7 @@ public void OnRecordStruct_WithoutPrimaryCtor(string terminator) /// record struct CacheContext" + terminator; - var comp = CreateCompilation(source, parseOptions: TestOptions.RegularWithDocumentationComments.WithLanguageVersion(LanguageVersion.Preview), targetFramework: TargetFramework.NetCoreApp); + var comp = CreateCompilation(source, parseOptions: TestOptions.RegularWithDocumentationComments.WithLanguageVersion(LanguageVersion.CSharp10), targetFramework: TargetFramework.NetCoreApp); comp.VerifyDiagnostics( // (5,25): warning CS1574: XML comment has cref attribute 'InvalidCref' that could not be resolved // /// See also . diff --git a/src/Compilers/CSharp/Test/Symbol/SymbolDisplay/SymbolDisplayTests.cs b/src/Compilers/CSharp/Test/Symbol/SymbolDisplay/SymbolDisplayTests.cs index 2fb52eb889c1c..7f142995debb0 100644 --- a/src/Compilers/CSharp/Test/Symbol/SymbolDisplay/SymbolDisplayTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/SymbolDisplay/SymbolDisplayTests.cs @@ -7688,7 +7688,7 @@ record struct Person(string First, string Last); text, findSymbol, format, - TestOptions.Regular.WithLanguageVersion(LanguageVersion.Preview), + TestOptions.Regular10, "record struct Person", SymbolDisplayPartKind.Keyword, SymbolDisplayPartKind.Space, @@ -7711,7 +7711,7 @@ public void ReadOnlyRecordStructDeclaration() text, findSymbol, format, - TestOptions.Regular.WithLanguageVersion(LanguageVersion.Preview), + TestOptions.Regular10, "readonly record struct Person", SymbolDisplayPartKind.Keyword, SymbolDisplayPartKind.Space, diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs index de8c324c6e1b2..9323bd7bc7aaf 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs @@ -7002,7 +7002,7 @@ class Test2 : I1 {} "; var compilation1 = CreateCompilation(source1, options: TestOptions.DebugDll, - parseOptions: TestOptions.Regular, + parseOptions: TestOptions.Regular9, targetFramework: TargetFramework.NetCoreApp); compilation1.VerifyDiagnostics( @@ -8588,7 +8588,7 @@ void I1.M5() {} } "; var compilation1 = CreateCompilation(source1, options: TestOptions.DebugDll, - parseOptions: TestOptions.Regular, + parseOptions: TestOptions.Regular9, targetFramework: TargetFramework.NetCoreApp); Assert.True(compilation1.Assembly.RuntimeSupportsDefaultInterfaceImplementation); compilation1.VerifyDiagnostics( @@ -12066,7 +12066,7 @@ class Test2 : I1 {} "; var compilation1 = CreateCompilation(source1, options: TestOptions.DebugDll, - parseOptions: TestOptions.Regular, + parseOptions: TestOptions.Regular9, targetFramework: TargetFramework.NetCoreApp); compilation1.VerifyDiagnostics( @@ -14775,7 +14775,7 @@ class Test2 : I1, I2, I3, I4, I5 private void ValidatePropertyModifiers_18(string source1, params DiagnosticDescription[] expected) { var compilation1 = CreateCompilation(source1, options: TestOptions.DebugDll, - parseOptions: TestOptions.Regular, + parseOptions: TestOptions.Regular9, targetFramework: TargetFramework.NetCoreApp); Assert.True(compilation1.Assembly.RuntimeSupportsDefaultInterfaceImplementation); compilation1.VerifyDiagnostics(expected); @@ -24906,7 +24906,7 @@ class Test2 : I1 {} "; var compilation1 = CreateCompilation(source1, options: TestOptions.DebugDll, - parseOptions: TestOptions.Regular, + parseOptions: TestOptions.Regular9, targetFramework: TargetFramework.NetCoreApp); compilation1.VerifyDiagnostics( @@ -27439,7 +27439,7 @@ class Test2 : I1, I2, I3, I4, I5 private void ValidateEventModifiers_18(string source1, params DiagnosticDescription[] expected) { var compilation1 = CreateCompilation(source1, options: TestOptions.DebugDll, - parseOptions: TestOptions.Regular, + parseOptions: TestOptions.Regular9, targetFramework: TargetFramework.NetCoreApp); Assert.True(compilation1.Assembly.RuntimeSupportsDefaultInterfaceImplementation); compilation1.VerifyDiagnostics(expected); @@ -59581,18 +59581,17 @@ interface I2 parseOptions: TestOptions.Regular8, targetFramework: TargetFramework.NetCoreApp); compilation1.VerifyDiagnostics( - // (15,12): error CS8904: Invalid variance: The type parameter 'T1' must be invariantly valid on 'I2.P1' unless language version 'preview' or greater is used. 'T1' is covariant. + // (15,12): error CS8904: Invalid variance: The type parameter 'T1' must be invariantly valid on 'I2.P1' unless language version '9.0' or greater is used. 'T1' is covariant. // static T1 P1 { get; set; } - Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "T1").WithArguments("I2.P1", "T1", "covariant", "invariantly", "preview").WithLocation(15, 12), - // (16,12): error CS8904: Invalid variance: The type parameter 'T2' must be invariantly valid on 'I2.P2' unless language version 'preview' or greater is used. 'T2' is contravariant. + Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "T1").WithArguments("I2.P1", "T1", "covariant", "invariantly", "9.0").WithLocation(15, 12), + // (16,12): error CS8904: Invalid variance: The type parameter 'T2' must be invariantly valid on 'I2.P2' unless language version '9.0' or greater is used. 'T2' is contravariant. // static T2 P2 { get; set; } - Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "T2").WithArguments("I2.P2", "T2", "contravariant", "invariantly", "preview").WithLocation(16, 12) + Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "T2").WithArguments("I2.P2", "T2", "contravariant", "invariantly", "9.0").WithLocation(16, 12) ); compilation1 = CreateCompilation(source1, options: TestOptions.DebugExe, - parseOptions: TestOptions.RegularPreview, - targetFramework: TargetFramework.NetCoreApp); - + parseOptions: TestOptions.Regular9, + targetFramework: TargetFramework.NetCoreApp); CompileAndVerify(compilation1, verify: VerifyOnMonoOrCoreClr, expectedOutput: !ExecutionConditionUtil.IsMonoOrCoreClr ? null : @"a b").VerifyDiagnostics(); @@ -59623,17 +59622,17 @@ interface I2 parseOptions: TestOptions.Regular8, targetFramework: TargetFramework.NetCoreApp); compilation1.VerifyDiagnostics( - // (13,18): error CS8904: Invalid variance: The type parameter 'T1' must be contravariantly valid on 'I2.M1(T1)' unless language version 'preview' or greater is used. 'T1' is covariant. + // (13,18): error CS8904: Invalid variance: The type parameter 'T1' must be contravariantly valid on 'I2.M1(T1)' unless language version '9.0' or greater is used. 'T1' is covariant. // static T1 M1(T1 x) => x; - Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "T1").WithArguments("I2.M1(T1)", "T1", "covariant", "contravariantly", "preview").WithLocation(13, 18), - // (14,12): error CS8904: Invalid variance: The type parameter 'T2' must be covariantly valid on 'I2.M2(T2)' unless language version 'preview' or greater is used. 'T2' is contravariant. + Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "T1").WithArguments("I2.M1(T1)", "T1", "covariant", "contravariantly", "9.0").WithLocation(13, 18), + // (14,12): error CS8904: Invalid variance: The type parameter 'T2' must be covariantly valid on 'I2.M2(T2)' unless language version '9.0' or greater is used. 'T2' is contravariant. // static T2 M2(T2 x) => x; - Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "T2").WithArguments("I2.M2(T2)", "T2", "contravariant", "covariantly", "preview").WithLocation(14, 12) + Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "T2").WithArguments("I2.M2(T2)", "T2", "contravariant", "covariantly", "9.0").WithLocation(14, 12) ); compilation1 = CreateCompilation(source1, options: TestOptions.DebugExe, - parseOptions: TestOptions.RegularPreview, - targetFramework: TargetFramework.NetCoreApp); + parseOptions: TestOptions.Regular9, + targetFramework: TargetFramework.NetCoreApp); CompileAndVerify(compilation1, verify: VerifyOnMonoOrCoreClr, expectedOutput: !ExecutionConditionUtil.IsMonoOrCoreClr ? null : @"a @@ -59687,17 +59686,17 @@ static T3 Print(T3 x) parseOptions: TestOptions.Regular8, targetFramework: TargetFramework.NetCoreApp); compilation1.VerifyDiagnostics( - // (24,53): error CS8904: Invalid variance: The type parameter 'T1' must be contravariantly valid on 'I2.E1' unless language version 'preview' or greater is used. 'T1' is covariant. + // (24,53): error CS8904: Invalid variance: The type parameter 'T1' must be contravariantly valid on 'I2.E1' unless language version '9.0' or greater is used. 'T1' is covariant. // static event System.Action> E1; - Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "E1").WithArguments("I2.E1", "T1", "covariant", "contravariantly", "preview").WithLocation(24, 53), - // (25,53): error CS8904: Invalid variance: The type parameter 'T2' must be covariantly valid on 'I2.E2' unless language version 'preview' or greater is used. 'T2' is contravariant. + Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "E1").WithArguments("I2.E1", "T1", "covariant", "contravariantly", "9.0").WithLocation(24, 53), + // (25,53): error CS8904: Invalid variance: The type parameter 'T2' must be covariantly valid on 'I2.E2' unless language version '9.0' or greater is used. 'T2' is contravariant. // static event System.Action> E2; - Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "E2").WithArguments("I2.E2", "T2", "contravariant", "covariantly", "preview").WithLocation(25, 53) + Diagnostic(ErrorCode.ERR_UnexpectedVarianceStaticMember, "E2").WithArguments("I2.E2", "T2", "contravariant", "covariantly", "9.0").WithLocation(25, 53) ); compilation1 = CreateCompilation(source1, options: TestOptions.DebugExe, - parseOptions: TestOptions.RegularPreview, - targetFramework: TargetFramework.NetCoreApp); + parseOptions: TestOptions.Regular9, + targetFramework: TargetFramework.NetCoreApp); CompileAndVerify(compilation1, verify: VerifyOnMonoOrCoreClr, expectedOutput: !ExecutionConditionUtil.IsMonoOrCoreClr ? null : @"a diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/ExtensionMethodTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/ExtensionMethodTests.cs index d6377beb3b457..14146f5916534 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/ExtensionMethodTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/ExtensionMethodTests.cs @@ -1135,14 +1135,14 @@ static class S internal static object E(this object o) { return null; } private static object F(this object o) { return null; } }"; - var compilation = CreateCompilation(source); + var compilation = CreateCompilation(source, parseOptions: TestOptions.Regular9); compilation.VerifyDiagnostics( // (5,9): error CS1656: Cannot assign to 'E' because it is a 'method group' // o.E += o.E; Diagnostic(ErrorCode.ERR_AssgReadonlyLocalCause, "o.E").WithArguments("E", "method group").WithLocation(5, 9), - // (6,13): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (6,13): error CS8773: Feature 'inferred delegate type' is not available in C# 9.0. Please use language version 10.0 or greater. // if (o.E != null) - Diagnostic(ErrorCode.ERR_FeatureInPreview, "o.E").WithArguments("inferred delegate type").WithLocation(6, 13), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "o.E").WithArguments("inferred delegate type", "10.0").WithLocation(6, 13), // (8,15): error CS1503: Argument 1: cannot convert from 'method group' to 'object' // M(o.E); Diagnostic(ErrorCode.ERR_BadArgType, "o.E").WithArguments("1", "method group", "object").WithLocation(8, 15), diff --git a/src/Compilers/CSharp/Test/Syntax/LexicalAndXml/PreprocessorTests.cs b/src/Compilers/CSharp/Test/Syntax/LexicalAndXml/PreprocessorTests.cs index d49b5b3e3c398..559aef0d9e5d7 100644 --- a/src/Compilers/CSharp/Test/Syntax/LexicalAndXml/PreprocessorTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/LexicalAndXml/PreprocessorTests.cs @@ -3037,9 +3037,9 @@ private void CheckDiagnosticStringFileName(string compilationFileName, string li [Theory] [InlineData(LanguageVersion.CSharp4, "4")] [InlineData(LanguageVersion.CSharp9, "9.0")] - [InlineData(LanguageVersion.Latest, "latest (9.0)")] - [InlineData(LanguageVersion.LatestMajor, "latestmajor (9.0)")] - [InlineData(LanguageVersion.Default, "default (9.0)")] + [InlineData(LanguageVersion.Latest, "latest (10.0)")] + [InlineData(LanguageVersion.LatestMajor, "latestmajor (10.0)")] + [InlineData(LanguageVersion.Default, "default (10.0)")] [InlineData(LanguageVersion.Preview, "preview")] public void TestErrorWithVersion(LanguageVersion version, string expectedLanguageVersion) { diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/DeconstructionTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/DeconstructionTests.cs index 5abc85ef9d624..c167d2bc46bc0 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/DeconstructionTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/DeconstructionTests.cs @@ -2128,12 +2128,12 @@ struct ValueTuple } }"; CreateCompilation(source, parseOptions: TestOptions.Regular9).VerifyDiagnostics( - // (7,9): error CS8652: The feature 'Mixed declarations and expressions in deconstruction' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. - // (int x1, x2) = (1, 2); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "(int x1, x2) = (1, 2)", isSuppressed: false).WithArguments("Mixed declarations and expressions in deconstruction").WithLocation(7, 9), - // (8,9): error CS8652: The feature 'Mixed declarations and expressions in deconstruction' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. - // (x3, int x4) = (1, 2); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "(x3, int x4) = (1, 2)", isSuppressed: false).WithArguments("Mixed declarations and expressions in deconstruction").WithLocation(8, 9)); + // (7,9): error CS8773: Feature 'Mixed declarations and expressions in deconstruction' is not available in C# 9.0. Please use language version 10.0 or greater. + // (int x1, x2) = (1, 2); + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "(int x1, x2) = (1, 2)").WithArguments("Mixed declarations and expressions in deconstruction", "10.0").WithLocation(7, 9), + // (8,9): error CS8773: Feature 'Mixed declarations and expressions in deconstruction' is not available in C# 9.0. Please use language version 10.0 or greater. + // (x3, int x4) = (1, 2); + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "(x3, int x4) = (1, 2)").WithArguments("Mixed declarations and expressions in deconstruction", "10.0").WithLocation(8, 9)); } [Fact, WorkItem(12803, "https://github.com/dotnet/roslyn/issues/12803")] diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/PatternParsingTests2.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/PatternParsingTests2.cs index c5ad3311d7edb..646d55b54b899 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/PatternParsingTests2.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/PatternParsingTests2.cs @@ -24,13 +24,13 @@ public PatternParsingTests2(ITestOutputHelper output) : base(output) [Fact] public void ExtendedPropertySubpattern_01() { - UsingExpression(@"e is { a.b.c: p }"); + UsingExpression(@"e is { a.b.c: p }", TestOptions.Regular10); verify(); UsingExpression(@"e is { a.b.c: p }", TestOptions.Regular9, - // (1,8): error CS8652: The feature 'extended property patterns' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. - // e is { a.b.c: p } - Diagnostic(ErrorCode.ERR_FeatureInPreview, "a.b.c").WithArguments("extended property patterns").WithLocation(1, 8)); + // (1,8): error CS8773: Feature 'extended property patterns' is not available in C# 9.0. Please use language version 10.0 or greater. + // e is { a.b.c: p } + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "a.b.c").WithArguments("extended property patterns", "10.0").WithLocation(1, 8)); verify(); void verify() diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/RecordParsing.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/RecordParsing.cs index 8a41b481ea4bf..112b273c84e92 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/RecordParsing.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/RecordParsing.cs @@ -2600,16 +2600,16 @@ public void RecordStructParsing_RecordNamedStruct() { var text = "record struct(int X, int Y);"; UsingTree(text, options: TestOptions.Regular9, - // (1,8): error CS8652: The feature 'record structs' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (1,8): error CS8773: Feature 'record structs' is not available in C# 9.0. Please use language version 10.0 or greater. // record struct(int X, int Y); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "struct").WithArguments("record structs").WithLocation(1, 8), + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "struct").WithArguments("record structs", "10.0").WithLocation(1, 8), // (1,14): error CS1001: Identifier expected // record struct(int X, int Y); Diagnostic(ErrorCode.ERR_IdentifierExpected, "(").WithLocation(1, 14) ); verify(); - UsingTree(text, options: TestOptions.RegularPreview, + UsingTree(text, options: TestOptions.Regular10, // (1,14): error CS1001: Identifier expected // record struct(int X, int Y); Diagnostic(ErrorCode.ERR_IdentifierExpected, "(").WithLocation(1, 14) @@ -2659,14 +2659,14 @@ void verify() public void RecordStructParsing() { var text = "record struct C(int X, int Y);"; - UsingTree(text, options: TestOptions.RegularPreview); + UsingTree(text, options: TestOptions.Regular10); verifyParsedAsRecord(); UsingTree(text, options: TestOptions.Regular9, - // (1,8): error CS8652: The feature 'record structs' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. - // record struct C(int X, int Y); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "struct").WithArguments("record structs").WithLocation(1, 8) + // (1,8): error CS8773: Feature 'record structs' is not available in C# 9.0. Please use language version 10.0 or greater. + // record struct C(int X, int Y); + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "struct").WithArguments("record structs", "10.0").WithLocation(1, 8) ); verifyParsedAsRecord(); @@ -2793,7 +2793,7 @@ void verifyParsedAsRecord() public void RecordStructParsing_WithBody() { var text = "record struct C(int X, int Y) { }"; - UsingTree(text, options: TestOptions.RegularPreview); + UsingTree(text, options: TestOptions.Regular10); N(SyntaxKind.CompilationUnit); { @@ -2836,14 +2836,14 @@ public void RecordStructParsing_WithBody() public void RecordClassParsing() { var text = "record class C(int X, int Y);"; - UsingTree(text, options: TestOptions.RegularPreview); + UsingTree(text, options: TestOptions.Regular10); verifyParsedAsRecord(); UsingTree(text, options: TestOptions.Regular9, - // (1,8): error CS8652: The feature 'record structs' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (1,8): error CS8773: Feature 'record structs' is not available in C# 9.0. Please use language version 10.0 or greater. // record class C(int X, int Y); - Diagnostic(ErrorCode.ERR_FeatureInPreview, "class").WithArguments("record structs").WithLocation(1, 8) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "class").WithArguments("record structs", "10.0").WithLocation(1, 8) ); verifyParsedAsRecord(); @@ -3727,9 +3727,9 @@ public void RecordStructParsing_Ref() EOF(); UsingTree(text, options: TestOptions.Regular9, - // (1,12): error CS8652: The feature 'record structs' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (1,12): error CS8773: Feature 'record structs' is not available in C# 9.0. Please use language version 10.0 or greater. // ref record struct S; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "struct").WithArguments("record structs").WithLocation(1, 12) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "struct").WithArguments("record structs", "10.0").WithLocation(1, 12) ); verifyParsedAsRecord(); diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTreeTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTreeTests.cs index 806ada148b529..0b84004d50a4e 100644 --- a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTreeTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxTreeTests.cs @@ -248,7 +248,7 @@ public void GlobalUsingDirective_01() { var test = "global using ns1;"; - UsingTree(test, TestOptions.RegularPreview); + UsingTree(test, TestOptions.Regular10); N(SyntaxKind.CompilationUnit); { @@ -273,9 +273,9 @@ public void GlobalUsingDirective_02() var test = "global using ns1;"; UsingTree(test, TestOptions.Regular9, - // (1,1): error CS8652: The feature 'global using directive' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (1,1): error CS8773: Feature 'global using directive' is not available in C# 9.0. Please use language version 10.0 or greater. // global using ns1; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "global using ns1;").WithArguments("global using directive").WithLocation(1, 1) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "global using ns1;").WithArguments("global using directive", "10.0").WithLocation(1, 1) ); N(SyntaxKind.CompilationUnit); @@ -300,7 +300,7 @@ public void GlobalUsingDirective_03() { var test = "namespace ns { global using ns1; }"; - UsingTree(test, TestOptions.RegularPreview); + UsingTree(test, TestOptions.Regular10); N(SyntaxKind.CompilationUnit); { @@ -335,9 +335,9 @@ public void GlobalUsingDirective_04() var test = "namespace ns { global using ns1; }"; UsingTree(test, TestOptions.Regular9, - // (1,16): error CS8652: The feature 'global using directive' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (1,16): error CS8773: Feature 'global using directive' is not available in C# 9.0. Please use language version 10.0 or greater. // namespace ns { global using ns1; } - Diagnostic(ErrorCode.ERR_FeatureInPreview, "global using ns1;").WithArguments("global using directive").WithLocation(1, 16) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "global using ns1;").WithArguments("global using directive", "10.0").WithLocation(1, 16) ); N(SyntaxKind.CompilationUnit); @@ -372,7 +372,7 @@ public void GlobalUsingDirective_05() { var test = "global using static ns1;"; - UsingTree(test, TestOptions.RegularPreview); + UsingTree(test, TestOptions.Regular10); N(SyntaxKind.CompilationUnit); { @@ -398,9 +398,9 @@ public void GlobalUsingDirective_06() var test = "global using static ns1;"; UsingTree(test, TestOptions.Regular9, - // (1,1): error CS8652: The feature 'global using directive' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (1,1): error CS8773: Feature 'global using directive' is not available in C# 9.0. Please use language version 10.0 or greater. // global using static ns1; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "global using static ns1;").WithArguments("global using directive").WithLocation(1, 1) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "global using static ns1;").WithArguments("global using directive", "10.0").WithLocation(1, 1) ); N(SyntaxKind.CompilationUnit); @@ -426,7 +426,7 @@ public void GlobalUsingDirective_07() { var test = "namespace ns { global using static ns1; }"; - UsingTree(test, TestOptions.RegularPreview); + UsingTree(test, TestOptions.Regular10); N(SyntaxKind.CompilationUnit); { @@ -462,9 +462,9 @@ public void GlobalUsingDirective_08() var test = "namespace ns { global using static ns1; }"; UsingTree(test, TestOptions.Regular9, - // (1,16): error CS8652: The feature 'global using directive' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (1,16): error CS8773: Feature 'global using directive' is not available in C# 9.0. Please use language version 10.0 or greater. // namespace ns { global using static ns1; } - Diagnostic(ErrorCode.ERR_FeatureInPreview, "global using static ns1;").WithArguments("global using directive").WithLocation(1, 16) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "global using static ns1;").WithArguments("global using directive", "10.0").WithLocation(1, 16) ); N(SyntaxKind.CompilationUnit); @@ -533,9 +533,9 @@ public void GlobalUsingDirective_10() var test = "global using alias = ns1;"; UsingTree(test, TestOptions.Regular9, - // (1,1): error CS8652: The feature 'global using directive' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (1,1): error CS8773: Feature 'global using directive' is not available in C# 9.0. Please use language version 10.0 or greater. // global using alias = ns1; - Diagnostic(ErrorCode.ERR_FeatureInPreview, "global using alias = ns1;").WithArguments("global using directive").WithLocation(1, 1) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "global using alias = ns1;").WithArguments("global using directive", "10.0").WithLocation(1, 1) ); N(SyntaxKind.CompilationUnit); @@ -611,9 +611,9 @@ public void GlobalUsingDirective_12() var test = "namespace ns { global using alias = ns1; }"; UsingTree(test, TestOptions.Regular9, - // (1,16): error CS8652: The feature 'global using directive' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + // (1,16): error CS8773: Feature 'global using directive' is not available in C# 9.0. Please use language version 10.0 or greater. // namespace ns { global using alias = ns1; } - Diagnostic(ErrorCode.ERR_FeatureInPreview, "global using alias = ns1;").WithArguments("global using directive").WithLocation(1, 16) + Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "global using alias = ns1;").WithArguments("global using directive", "10.0").WithLocation(1, 16) ); N(SyntaxKind.CompilationUnit); diff --git a/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets b/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets index 395b63a7c7d41..674e383d829b2 100644 --- a/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets +++ b/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets @@ -17,6 +17,10 @@ <_MaxSupportedLangVersion Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' == '5.0' AND '$(_MaxSupportedLangVersion)' == ''">9.0 + + <_MaxSupportedLangVersion Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' == '6.0' AND + '$(_MaxSupportedLangVersion)' == ''">10.0 + $(_MaxSupportedLangVersion) $(_MaxSupportedLangVersion) diff --git a/src/Compilers/Core/MSBuildTaskTests/TargetTests.cs b/src/Compilers/Core/MSBuildTaskTests/TargetTests.cs index 228d0b3c3c3b6..8cabe33d65fc8 100644 --- a/src/Compilers/Core/MSBuildTaskTests/TargetTests.cs +++ b/src/Compilers/Core/MSBuildTaskTests/TargetTests.cs @@ -399,7 +399,8 @@ public void GenerateEditorConfigCoreHandlesMalformedCompilerVisibleItemMetadata( [InlineData(".NETCoreApp", "3.0", "8.0")] [InlineData(".NETCoreApp", "3.1", "8.0")] [InlineData(".NETCoreApp", "5.0", "9.0")] - [InlineData(".NETCoreApp", "6.0", "")] + [InlineData(".NETCoreApp", "6.0", "10.0")] + [InlineData(".NETCoreApp", "7.0", "")] [InlineData(".NETStandard", "1.0", "7.3")] [InlineData(".NETStandard", "1.5", "7.3")] @@ -408,6 +409,7 @@ public void GenerateEditorConfigCoreHandlesMalformedCompilerVisibleItemMetadata( [InlineData("UnknownTFM", "0.0", "7.3")] [InlineData("UnknownTFM", "5.0", "7.3")] + [InlineData("UnknownTFM", "6.0", "7.3")] public void LanguageVersionGivenTargetFramework(string tfi, string tfv, string expectedVersion) { XmlReader xmlReader = XmlReader.Create(new StringReader($@" @@ -432,7 +434,7 @@ public void LanguageVersionGivenTargetFramework(string tfi, string tfv, string e // This will fail whenever the current language version is updated. // Ensure you update the target files to select the correct CSharp version for the newest target framework // and add to the theory data above to cover it, before changing this version to make the test pass again. - Assert.Equal(CSharp.LanguageVersion.CSharp9, CSharp.LanguageVersionFacts.CurrentVersion); + Assert.Equal(CSharp.LanguageVersion.CSharp10, CSharp.LanguageVersionFacts.CurrentVersion); } [Fact] diff --git a/src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs b/src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs index 1c115f3ff7428..00de9e50f7780 100644 --- a/src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs +++ b/src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs @@ -876,7 +876,7 @@ public static SyntaxTree Parse(string text, string filename = "", CSharpParseOpt { if ((object)options == null) { - options = TestOptions.Regular; + options = TestOptions.RegularPreview; } var stringText = StringText.From(text, encoding ?? Encoding.UTF8); @@ -1121,7 +1121,7 @@ private static CSharpCompilation CreateCompilationCore( if (experimentalFeature.HasValue) { - parseOptions = (parseOptions ?? TestOptions.Regular).WithExperimental(experimentalFeature.Value); + parseOptions = (parseOptions ?? TestOptions.RegularPreview).WithExperimental(experimentalFeature.Value); } Func createCompilationLambda = () => CSharpCompilation.Create( diff --git a/src/Compilers/Test/Utilities/CSharp/TestOptions.cs b/src/Compilers/Test/Utilities/CSharp/TestOptions.cs index e5bba5b842d74..9dcee21970d7c 100644 --- a/src/Compilers/Test/Utilities/CSharp/TestOptions.cs +++ b/src/Compilers/Test/Utilities/CSharp/TestOptions.cs @@ -23,9 +23,17 @@ public static class TestOptions public static readonly CSharpParseOptions Regular7_2 = Regular.WithLanguageVersion(LanguageVersion.CSharp7_2); public static readonly CSharpParseOptions Regular7_3 = Regular.WithLanguageVersion(LanguageVersion.CSharp7_3); public static readonly CSharpParseOptions RegularDefault = Regular.WithLanguageVersion(LanguageVersion.Default); + + /// + /// Usages of and + /// will be replaced with TestOptions.RegularN and LanguageVersion.CSharpN when language version N is introduced. + /// + public static readonly CSharpParseOptions RegularNext = Regular.WithLanguageVersion(LanguageVersion.Preview); + public static readonly CSharpParseOptions RegularPreview = Regular.WithLanguageVersion(LanguageVersion.Preview); public static readonly CSharpParseOptions Regular8 = Regular.WithLanguageVersion(LanguageVersion.CSharp8); public static readonly CSharpParseOptions Regular9 = Regular.WithLanguageVersion(LanguageVersion.CSharp9); + public static readonly CSharpParseOptions Regular10 = Regular.WithLanguageVersion(LanguageVersion.CSharp10); public static readonly CSharpParseOptions RegularWithDocumentationComments = Regular.WithDocumentationMode(DocumentationMode.Diagnose); public static readonly CSharpParseOptions RegularWithLegacyStrongName = Regular.WithFeature("UseLegacyStrongNameProvider"); public static readonly CSharpParseOptions WithoutImprovedOverloadCandidates = Regular.WithLanguageVersion(MessageID.IDS_FeatureImprovedOverloadCandidates.RequiredVersion() - 1); diff --git a/src/EditorFeatures/CSharpTest/Diagnostics/UpgradeProject/UpgradeProjectTests.cs b/src/EditorFeatures/CSharpTest/Diagnostics/UpgradeProject/UpgradeProjectTests.cs index 53caa05b1a1f1..5064e21e7967d 100644 --- a/src/EditorFeatures/CSharpTest/Diagnostics/UpgradeProject/UpgradeProjectTests.cs +++ b/src/EditorFeatures/CSharpTest/Diagnostics/UpgradeProject/UpgradeProjectTests.cs @@ -1001,7 +1001,7 @@ interface I2 static T1 M1([|T1|] x) => x; } ", - expected: LanguageVersion.Preview, + expected: LanguageVersion.CSharp9, new CSharpParseOptions(LanguageVersion.CSharp8)); } @@ -1011,13 +1011,13 @@ public async Task UpgradeProjectForSealedToStringInRecords_CS8912() await TestLanguageVersionUpgradedAsync( @" - + Assembly2 record [|Derived|] : Base; - + public record Base { @@ -1027,7 +1027,29 @@ public record Base ", - expected: LanguageVersion.Preview, + expected: LanguageVersion.CSharp10, + new CSharpParseOptions(LanguageVersion.CSharp9)); + } + + [Fact] + public async Task UpgradeProjectForTargetTypedNew() + { + await TestLanguageVersionUpgradedAsync(@" +class Test +{ + Test t = [|new()|]; +}", + LanguageVersion.CSharp9, + new CSharpParseOptions(LanguageVersion.CSharp8)); + } + + [Fact] + public async Task UpgradeProjectForGlobalUsing() + { + await TestLanguageVersionUpgradedAsync(@" +[|global using System;|] +", + LanguageVersion.CSharp10, new CSharpParseOptions(LanguageVersion.CSharp9)); } } diff --git a/src/Features/CSharp/Portable/UpgradeProject/CSharpUpgradeProjectCodeFixProvider.cs b/src/Features/CSharp/Portable/UpgradeProject/CSharpUpgradeProjectCodeFixProvider.cs index b79e74ef15c73..beea4f23e74d8 100644 --- a/src/Features/CSharp/Portable/UpgradeProject/CSharpUpgradeProjectCodeFixProvider.cs +++ b/src/Features/CSharp/Portable/UpgradeProject/CSharpUpgradeProjectCodeFixProvider.cs @@ -43,6 +43,7 @@ public CSharpUpgradeProjectCodeFixProvider() "CS8511", // error CS8511: An expression of type 'T' cannot be handled by a pattern of type ''. Please use language version 'preview' or greater to match an open type with a constant pattern. "CS8627", // error CS8627: A nullable type parameter must be known to be a value type or non-nullable reference type unless language version '{0}' or greater is used. Consider changing the language version or adding a 'class', 'struct', or type constraint. "CS8652", // error CS8652: The feature '' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. + "CS8773", // error CS8773: Feature is not available in C# 9.0. Please use language version X or greater. "CS8703", // error CS8703: The modifier '{0}' is not valid for this item in C# {1}. Please use language version '{2}' or greater. "CS8706", // error CS8706: '{0}' cannot implement interface member '{1}' in type '{2}' because feature '{3}' is not available in C# {4}. Please use language version '{5}' or greater. "CS8904", // error CS8904: Invalid variance: The type parameter 'T1' must be contravariantly valid on 'I2.M1(T1)' unless language version 'preview' or greater is used. 'T1' is covariant. diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/LanguageVersionExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/LanguageVersionExtensions.cs index 7c1df6fa80aa5..65ca1c846c9ce 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/LanguageVersionExtensions.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/LanguageVersionExtensions.cs @@ -10,7 +10,7 @@ public static bool IsCSharp9OrAbove(this LanguageVersion languageVersion) => languageVersion >= LanguageVersion.CSharp9; public static bool IsCSharp10OrAbove(this LanguageVersion languageVersion) - => languageVersion >= LanguageVersion.Preview; + => languageVersion >= LanguageVersion.CSharp10; public static bool HasConstantInterpolatedStrings(this LanguageVersion languageVersion) => languageVersion.IsCSharp10OrAbove(); From e1042fd4386f4348313203a9e37d2e37ad6964c8 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 24 Jun 2021 13:34:14 -0700 Subject: [PATCH 22/24] Avoid thread dependency in VirtualMemoryNotificationListener constructor --- .../VisualStudioWorkspaceImpl.cs | 10 ++++++ .../VirtualMemoryNotificationListener.cs | 32 ++++++++++--------- src/VisualStudio/Core/Def/RoslynPackage.cs | 1 - 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs index 93cc436b09872..5c8b43b3f2553 100644 --- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs +++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs @@ -101,6 +101,8 @@ internal abstract partial class VisualStudioWorkspaceImpl : VisualStudioWorkspac [Obsolete("This is a compatibility shim for TypeScript; please do not use it.")] internal VisualStudioProjectTracker? _projectTracker; + private VirtualMemoryNotificationListener? _memoryListener; + private OpenFileTracker? _openFileTracker; internal FileChangeWatcher FileChangeWatcher { get; } internal FileWatchedPortableExecutableReferenceFactory FileWatchedReferenceFactory { get; } @@ -204,6 +206,14 @@ public async Task InitializeUIAffinitizedServicesAsync(IAsyncServiceProvider asy _openFileTracker = openFileTracker; } + var memoryListener = await VirtualMemoryNotificationListener.CreateAsync(this, _threadingContext, asyncServiceProvider, _threadingContext.DisposalToken).ConfigureAwait(true); + + // Update our fields first, so any asynchronous work that needs to use these is able to see the service. + lock (_gate) + { + _memoryListener = memoryListener; + } + openFileTracker.ProcessQueuedWorkOnUIThread(); } diff --git a/src/VisualStudio/Core/Def/Implementation/VirtualMemoryNotificationListener.cs b/src/VisualStudio/Core/Def/Implementation/VirtualMemoryNotificationListener.cs index 198cc448de094..9113ca6b9c011 100644 --- a/src/VisualStudio/Core/Def/Implementation/VirtualMemoryNotificationListener.cs +++ b/src/VisualStudio/Core/Def/Implementation/VirtualMemoryNotificationListener.cs @@ -2,26 +2,22 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#nullable disable - using System; -using System.Composition; using System.Runtime; +using System.Threading; +using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Editor.Shared.Options; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Extensions; using Microsoft.CodeAnalysis.Host; -using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Internal.Log; -using Microsoft.CodeAnalysis.Remote; using Microsoft.CodeAnalysis.Shared.Options; using Microsoft.CodeAnalysis.SolutionCrawler; using Microsoft.VisualStudio.LanguageServices.Implementation; using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities; -using Microsoft.VisualStudio.LanguageServices.Remote; -using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; +using IAsyncServiceProvider = Microsoft.VisualStudio.Shell.IAsyncServiceProvider; namespace Microsoft.VisualStudio.LanguageServices { @@ -29,7 +25,6 @@ namespace Microsoft.VisualStudio.LanguageServices /// Listens to broadcast notifications from the Visual Studio Shell indicating that the application is running /// low on available virtual memory. /// - [Export, Shared] internal sealed class VirtualMemoryNotificationListener : ForegroundThreadAffinitizedObject, IVsBroadcastMessageEvents { // memory threshold to turn off full solution analysis - 200MB @@ -39,15 +34,13 @@ internal sealed class VirtualMemoryNotificationListener : ForegroundThreadAffini private const string LowVMMoreInfoLink = "https://go.microsoft.com/fwlink/?LinkID=799402&clcid=0x409"; private readonly VisualStudioWorkspace _workspace; - private readonly WorkspaceCacheService _workspaceCacheService; + private readonly WorkspaceCacheService? _workspaceCacheService; private bool _alreadyLogged; - [ImportingConstructor] - [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)] - public VirtualMemoryNotificationListener( + private VirtualMemoryNotificationListener( IThreadingContext threadingContext, - SVsServiceProvider serviceProvider, + IVsShell shell, VisualStudioWorkspace workspace) : base(threadingContext, assertIsForeground: true) { @@ -63,11 +56,20 @@ public VirtualMemoryNotificationListener( _workspace.WorkspaceChanged += OnWorkspaceChanged; - var shell = (IVsShell)serviceProvider.GetService(typeof(SVsShell)); // Note: We never unhook this event sink. It lives for the lifetime of the host. ErrorHandler.ThrowOnFailure(shell.AdviseBroadcastMessages(this, out var cookie)); } + public static async Task CreateAsync(VisualStudioWorkspace workspace, IThreadingContext threadingContext, IAsyncServiceProvider serviceProvider, CancellationToken cancellationToken) + { + await threadingContext.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken); + + var shell = (IVsShell?)await serviceProvider.GetServiceAsync(typeof(SVsShell)).ConfigureAwait(true); + Assumes.Present(shell); + + return new VirtualMemoryNotificationListener(threadingContext, shell, workspace); + } + /// /// Called by the Visual Studio Shell to notify components of a broadcast message. /// @@ -149,7 +151,7 @@ private void ShowInfoBarIfRequired() } // Show info bar. - _workspace.Services.GetService() + _workspace.Services.GetRequiredService() .ShowGlobalErrorInfo(ServicesVSResources.Visual_Studio_has_suspended_some_advanced_features_to_improve_performance, new InfoBarUI(ServicesVSResources.Re_enable, InfoBarUI.UIKind.Button, RenableBackgroundAnalysis), new InfoBarUI(ServicesVSResources.Learn_more, InfoBarUI.UIKind.HyperLink, diff --git a/src/VisualStudio/Core/Def/RoslynPackage.cs b/src/VisualStudio/Core/Def/RoslynPackage.cs index d2a635800c20f..c28ba4669a1bb 100644 --- a/src/VisualStudio/Core/Def/RoslynPackage.cs +++ b/src/VisualStudio/Core/Def/RoslynPackage.cs @@ -184,7 +184,6 @@ protected override async Task LoadComponentsAsync(CancellationToken cancellation this.ComponentModel.GetService().Initialize(this); this.ComponentModel.GetService(); - this.ComponentModel.GetService(); // The misc files workspace needs to be loaded on the UI thread. This way it will have // the appropriate task scheduler to report events on. From 013033974d6de61b1853e962bf18249f6fd5d68a Mon Sep 17 00:00:00 2001 From: Mykola Balakin Date: Fri, 25 Jun 2021 19:16:52 +0300 Subject: [PATCH 23/24] Calculate TypeParameterKind based on the container type (#54200) Fixes #54104. --- .../SynthesizedSubstitutedTypeParameterSymbol.cs | 7 +++++++ .../SynthesizedClonedTypeParameterSymbol.vb | 5 +++++ .../Symbols/Wrapped/WrappedTypeParameterSymbol.vb | 5 +++++ .../Symbols/SimpleTypeParameterSymbol.cs | 8 +++++++- .../Symbols/SimpleTypeParameterSymbol.vb | 7 ++++++- 5 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedSubstitutedTypeParameterSymbol.cs b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedSubstitutedTypeParameterSymbol.cs index fc8221d9ad1f4..56979139e7487 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedSubstitutedTypeParameterSymbol.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedSubstitutedTypeParameterSymbol.cs @@ -5,6 +5,7 @@ #nullable disable using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.CodeAnalysis.CSharp.Emit; using Microsoft.CodeAnalysis.PooledObjects; @@ -18,6 +19,10 @@ internal sealed class SynthesizedSubstitutedTypeParameterSymbol : SubstitutedTyp public SynthesizedSubstitutedTypeParameterSymbol(Symbol owner, TypeMap map, TypeParameterSymbol substitutedFrom, int ordinal) : base(owner, map, substitutedFrom, ordinal) { + Debug.Assert(this.TypeParameterKind == (ContainingSymbol is MethodSymbol ? TypeParameterKind.Method : + (ContainingSymbol is NamedTypeSymbol ? TypeParameterKind.Type : + TypeParameterKind.Cref)), + $"Container is {ContainingSymbol?.Kind}, TypeParameterKind is {this.TypeParameterKind}"); } public override bool IsImplicitlyDeclared @@ -25,6 +30,8 @@ public override bool IsImplicitlyDeclared get { return true; } } + public override TypeParameterKind TypeParameterKind => ContainingSymbol is MethodSymbol ? TypeParameterKind.Method : TypeParameterKind.Type; + internal override void AddSynthesizedAttributes(PEModuleBuilder moduleBuilder, ref ArrayBuilder attributes) { base.AddSynthesizedAttributes(moduleBuilder, ref attributes); diff --git a/src/Compilers/VisualBasic/Portable/Symbols/SynthesizedSymbols/SynthesizedClonedTypeParameterSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/SynthesizedSymbols/SynthesizedClonedTypeParameterSymbol.vb index 85122d83b1244..d7a9a545059da 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/SynthesizedSymbols/SynthesizedClonedTypeParameterSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/SynthesizedSymbols/SynthesizedClonedTypeParameterSymbol.vb @@ -45,6 +45,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols _correspondingMethodTypeParameter = correspondingMethodTypeParameter _name = name _typeMapFactory = typeMapFactory + + Debug.Assert(Me.TypeParameterKind = If(TypeOf Me.ContainingSymbol Is MethodSymbol, TypeParameterKind.Method, + If(TypeOf Me.ContainingSymbol Is NamedTypeSymbol, TypeParameterKind.Type, + TypeParameterKind.Cref)), + $"Container is {Me.ContainingSymbol?.Kind}, TypeParameterKind is {Me.TypeParameterKind}") End Sub Public Overrides ReadOnly Property TypeParameterKind As TypeParameterKind diff --git a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedTypeParameterSymbol.vb b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedTypeParameterSymbol.vb index c9cc775bfcd3d..a98e82937f542 100644 --- a/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedTypeParameterSymbol.vb +++ b/src/Compilers/VisualBasic/Portable/Symbols/Wrapped/WrappedTypeParameterSymbol.vb @@ -88,6 +88,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols Public Sub New(underlyingTypeParameter As TypeParameterSymbol) Debug.Assert(underlyingTypeParameter IsNot Nothing) Me._underlyingTypeParameter = underlyingTypeParameter + + Debug.Assert(Me.TypeParameterKind = If(TypeOf Me.ContainingSymbol Is MethodSymbol, TypeParameterKind.Method, + If(TypeOf Me.ContainingSymbol Is NamedTypeSymbol, TypeParameterKind.Type, + TypeParameterKind.Cref)), + $"Container is {Me.ContainingSymbol?.Kind}, TypeParameterKind is {Me.TypeParameterKind}") End Sub Public Overrides Function GetDocumentationCommentXml(Optional preferredCulture As CultureInfo = Nothing, Optional expandIncludes As Boolean = False, Optional cancellationToken As CancellationToken = Nothing) As String diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.cs b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.cs index de45ef9551757..604bfbce2c7b8 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.cs +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.cs @@ -8,6 +8,7 @@ using Roslyn.Utilities; using System; using System.Collections.Immutable; +using System.Diagnostics; namespace Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator { @@ -25,6 +26,11 @@ public SimpleTypeParameterSymbol(Symbol container, int ordinal, string name) _container = container; _ordinal = ordinal; _name = name; + + Debug.Assert(this.TypeParameterKind == (ContainingSymbol is MethodSymbol ? TypeParameterKind.Method : + (ContainingSymbol is NamedTypeSymbol ? TypeParameterKind.Type : + TypeParameterKind.Cref)), + $"Container is {ContainingSymbol?.Kind}, TypeParameterKind is {this.TypeParameterKind}"); } public override string Name @@ -39,7 +45,7 @@ public override int Ordinal public override TypeParameterKind TypeParameterKind { - get { return TypeParameterKind.Type; } + get { return ContainingSymbol is MethodSymbol ? TypeParameterKind.Method : TypeParameterKind.Type; } } public override bool HasConstructorConstraint diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.vb b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.vb index 6ac0b20075f3a..19b822a4c7a74 100644 --- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.vb +++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.vb @@ -21,6 +21,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator _container = container _ordinal = ordinal _name = name + + Debug.Assert(Me.TypeParameterKind = If(TypeOf Me.ContainingSymbol Is MethodSymbol, TypeParameterKind.Method, + If(TypeOf Me.ContainingSymbol Is NamedTypeSymbol, TypeParameterKind.Type, + TypeParameterKind.Cref)), + $"Container is {Me.ContainingSymbol?.Kind}, TypeParameterKind is {Me.TypeParameterKind}") End Sub Public Overrides ReadOnly Property Name As String @@ -37,7 +42,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator Public Overrides ReadOnly Property TypeParameterKind As TypeParameterKind Get - Return TypeParameterKind.Type + Return If(TypeOf Me.ContainingSymbol Is MethodSymbol, TypeParameterKind.Method, TypeParameterKind.Type) End Get End Property From 2941ae10eae00a6c844c574a5b42457390c85a1e Mon Sep 17 00:00:00 2001 From: AlekseyTs Date: Fri, 25 Jun 2021 10:40:41 -0700 Subject: [PATCH 24/24] Report all-empty top level statements. (#54385) Fixes #53472. --- .../CSharp/Portable/CSharpResources.resx | 3 + .../Declarations/DeclarationTreeBuilder.cs | 21 ++++- .../CSharp/Portable/Errors/ErrorCode.cs | 1 + .../Portable/xlf/CSharpResources.cs.xlf | 5 + .../Portable/xlf/CSharpResources.de.xlf | 5 + .../Portable/xlf/CSharpResources.es.xlf | 5 + .../Portable/xlf/CSharpResources.fr.xlf | 5 + .../Portable/xlf/CSharpResources.it.xlf | 5 + .../Portable/xlf/CSharpResources.ja.xlf | 5 + .../Portable/xlf/CSharpResources.ko.xlf | 5 + .../Portable/xlf/CSharpResources.pl.xlf | 5 + .../Portable/xlf/CSharpResources.pt-BR.xlf | 5 + .../Portable/xlf/CSharpResources.ru.xlf | 5 + .../Portable/xlf/CSharpResources.tr.xlf | 5 + .../Portable/xlf/CSharpResources.zh-Hans.xlf | 5 + .../Portable/xlf/CSharpResources.zh-Hant.xlf | 5 + .../Semantics/FunctionPointerTests.cs | 7 +- .../Semantics/TopLevelStatementsTests.cs | 93 +++++++++++++++++++ .../Parsing/TopLevelStatementsParsingTests.cs | 65 +++++++++++++ 19 files changed, 251 insertions(+), 4 deletions(-) diff --git a/src/Compilers/CSharp/Portable/CSharpResources.resx b/src/Compilers/CSharp/Portable/CSharpResources.resx index 32905cab47ea7..777b59a102b24 100644 --- a/src/Compilers/CSharp/Portable/CSharpResources.resx +++ b/src/Compilers/CSharp/Portable/CSharpResources.resx @@ -6722,4 +6722,7 @@ To remove the warning, you can use /reference instead (set the Embed Interop Typ The AsyncMethodBuilder attribute is disallowed on anonymous methods without an explicit return type. + + At least one top-level statement must be non-empty. + diff --git a/src/Compilers/CSharp/Portable/Declarations/DeclarationTreeBuilder.cs b/src/Compilers/CSharp/Portable/Declarations/DeclarationTreeBuilder.cs index 92b021f45a175..4164baf567b67 100644 --- a/src/Compilers/CSharp/Portable/Declarations/DeclarationTreeBuilder.cs +++ b/src/Compilers/CSharp/Portable/Declarations/DeclarationTreeBuilder.cs @@ -59,6 +59,7 @@ private ImmutableArray VisitNamespaceChildren( bool isIterator = false; bool hasReturnWithExpression = false; GlobalStatementSyntax firstGlobalStatement = null; + bool hasNonEmptyGlobalSatement = false; var childrenBuilder = ArrayBuilder.GetInstance(); foreach (var member in members) @@ -74,6 +75,11 @@ private ImmutableArray VisitNamespaceChildren( firstGlobalStatement ??= global; var topLevelStatement = global.Statement; + if (!topLevelStatement.IsKind(SyntaxKind.EmptyStatement)) + { + hasNonEmptyGlobalSatement = true; + } + if (!hasAwaitExpressions) { hasAwaitExpressions = SyntaxFacts.HasAwaitOperations(topLevelStatement); @@ -98,7 +104,16 @@ private ImmutableArray VisitNamespaceChildren( // wrap all global statements in a compilation unit into a simple program type: if (firstGlobalStatement is object) { - childrenBuilder.Add(CreateSimpleProgram(firstGlobalStatement, hasAwaitExpressions, isIterator, hasReturnWithExpression)); + var diagnostics = ImmutableArray.Empty; + + if (!hasNonEmptyGlobalSatement) + { + var bag = DiagnosticBag.GetInstance(); + bag.Add(ErrorCode.ERR_SimpleProgramIsEmpty, ((EmptyStatementSyntax)firstGlobalStatement.Statement).SemicolonToken.GetLocation()); + diagnostics = bag.ToReadOnlyAndFree(); + } + + childrenBuilder.Add(CreateSimpleProgram(firstGlobalStatement, hasAwaitExpressions, isIterator, hasReturnWithExpression, diagnostics)); } // wrap all members that are defined in a namespace or compilation unit into an implicit type: @@ -130,7 +145,7 @@ private static SingleNamespaceOrTypeDeclaration CreateImplicitClass(ImmutableSeg diagnostics: ImmutableArray.Empty); } - private static SingleNamespaceOrTypeDeclaration CreateSimpleProgram(GlobalStatementSyntax firstGlobalStatement, bool hasAwaitExpressions, bool isIterator, bool hasReturnWithExpression) + private static SingleNamespaceOrTypeDeclaration CreateSimpleProgram(GlobalStatementSyntax firstGlobalStatement, bool hasAwaitExpressions, bool isIterator, bool hasReturnWithExpression, ImmutableArray diagnostics) { return new SingleTypeDeclaration( kind: DeclarationKind.SimpleProgram, @@ -144,7 +159,7 @@ private static SingleNamespaceOrTypeDeclaration CreateSimpleProgram(GlobalStatem nameLocation: new SourceLocation(firstGlobalStatement.GetFirstToken()), memberNames: ImmutableSegmentedDictionary.Empty, children: ImmutableArray.Empty, - diagnostics: ImmutableArray.Empty); + diagnostics: diagnostics); } /// diff --git a/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs b/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs index cba2c6db59896..16f5d833134d0 100644 --- a/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs +++ b/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs @@ -1959,6 +1959,7 @@ internal enum ErrorCode ERR_CantConvAnonMethReturnType = 8934, ERR_BuilderAttributeDisallowed = 8935, ERR_FeatureNotAvailableInVersion10 = 8936, + ERR_SimpleProgramIsEmpty = 8937, #endregion diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf index e148163377fb8..b464baee27688 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf @@ -962,6 +962,11 @@ Pokud existuje jednotka kompilace s příkazy nejvyšší úrovně, nedá se zadat /main. + + At least one top-level statement must be non-empty. + At least one top-level statement must be non-empty. + + Cannot use local variable or local function '{0}' declared in a top-level statement in this context. Místní proměnná nebo místní funkce {0} deklarovaná v příkazu nejvyšší úrovně v tomto kontextu se nedá použít. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf index fc7e5d90eef93..6f7c0a1c45e0f 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf @@ -962,6 +962,11 @@ "/main" kann nicht angegeben werden, wenn eine Kompilierungseinheit mit Anweisungen der obersten Ebene vorhanden ist. + + At least one top-level statement must be non-empty. + At least one top-level statement must be non-empty. + + Cannot use local variable or local function '{0}' declared in a top-level statement in this context. Die lokale Variable oder die lokale Funktion "{0}", die in einer Anweisung der obersten Ebene in diesem Kontext deklariert wurde, kann nicht verwendet werden. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf index 917ffcde8bc17..44cc8b70093a8 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf @@ -962,6 +962,11 @@ No se puede especificar /main si hay una unidad de compilación con instrucciones de nivel superior. + + At least one top-level statement must be non-empty. + At least one top-level statement must be non-empty. + + Cannot use local variable or local function '{0}' declared in a top-level statement in this context. No se puede usar la variable local ni la función local "{0}" declarada en una instrucción de nivel superior en este contexto. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf index 7e9a6b6778f73..c9cbc48f58e5b 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf @@ -962,6 +962,11 @@ Impossible de spécifier /main s'il existe une unité de compilation avec des instructions de niveau supérieur. + + At least one top-level statement must be non-empty. + At least one top-level statement must be non-empty. + + Cannot use local variable or local function '{0}' declared in a top-level statement in this context. Impossible d'utiliser une variable locale ou une fonction locale '{0}' déclarée dans une instruction de niveau supérieur dans ce contexte. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf index 3d26f3c6693a0..78c7df1ee1a3d 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf @@ -962,6 +962,11 @@ Non è possibile specificare /main se è presente un'unità di compilazione con istruzioni di primo livello. + + At least one top-level statement must be non-empty. + At least one top-level statement must be non-empty. + + Cannot use local variable or local function '{0}' declared in a top-level statement in this context. In questo contesto non è possibile usare la variabile locale o la funzione locale '{0}' dichiarata in un'istruzione di primo livello. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf index 07fb5e6b6b0a4..14bbcae70195e 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf @@ -962,6 +962,11 @@ トップレベルのステートメントを含むコンパイル ユニットがある場合、/main を指定することはできません。 + + At least one top-level statement must be non-empty. + At least one top-level statement must be non-empty. + + Cannot use local variable or local function '{0}' declared in a top-level statement in this context. このコンテキストでは、トップレベルのステートメントで宣言されたローカル変数またはローカル関数 '{0}' を使用することはできません。 diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf index d3c3b9a9433af..7b54417afb4dc 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf @@ -962,6 +962,11 @@ 최상위 문이 포함된 컴파일 단위가 있으면 /main을 지정할 수 없습니다. + + At least one top-level statement must be non-empty. + At least one top-level statement must be non-empty. + + Cannot use local variable or local function '{0}' declared in a top-level statement in this context. 이 컨텍스트에서는 최상위 문에 선언된 지역 변수 또는 로컬 함수 '{0}'을(를) 사용할 수 없습니다. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf index 69501f3389fb0..df05dbcd42da7 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf @@ -962,6 +962,11 @@ Nie można określić opcji /main, jeśli istnieje jednostka kompilacji z instrukcjami najwyższego poziomu. + + At least one top-level statement must be non-empty. + At least one top-level statement must be non-empty. + + Cannot use local variable or local function '{0}' declared in a top-level statement in this context. W tym kontekście nie można użyć zmiennej lokalnej ani funkcji lokalnej „{0}” zadeklarowanej w instrukcji najwyższego poziomu. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf index 3745be4a141de..a14ed0dd3608e 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf @@ -962,6 +962,11 @@ Não é possível especificar /main quando há uma unidade de compilação com instruções de nível superior. + + At least one top-level statement must be non-empty. + At least one top-level statement must be non-empty. + + Cannot use local variable or local function '{0}' declared in a top-level statement in this context. Não é possível usar a variável local ou a função local '{0}' declarada em uma instrução de nível superior neste contexto. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf index 72aeb7cb55729..164006d058d72 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf @@ -962,6 +962,11 @@ Невозможно указать параметр /main, если существует единица компиляции с инструкциями верхнего уровня. + + At least one top-level statement must be non-empty. + At least one top-level statement must be non-empty. + + Cannot use local variable or local function '{0}' declared in a top-level statement in this context. Невозможно использовать локальную переменную или локальную функцию "{0}", объявленную в инструкции верхнего уровня в этом контексте. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf index 305af8c797c2c..4d4c6d42436d2 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf @@ -962,6 +962,11 @@ Üst düzey deyimleri olan bir derleme birimi varsa /main belirtilemez. + + At least one top-level statement must be non-empty. + At least one top-level statement must be non-empty. + + Cannot use local variable or local function '{0}' declared in a top-level statement in this context. Bu bağlamda, üst düzey bir ifadede bildirilen '{0}' yerel değişkeni veya yerel işlevi kullanılamaz. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf index 42bd67831bc92..892181b0fce7a 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf @@ -962,6 +962,11 @@ 如果存在包含顶级语句的编译单元，则不能指定 /main。 + + At least one top-level statement must be non-empty. + At least one top-level statement must be non-empty. + + Cannot use local variable or local function '{0}' declared in a top-level statement in this context. 在此上下文中，无法使用在顶级语句中声明的局部变量或本地函数“{0}”。 diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf index 15683780f6906..c40f055ab4f13 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf @@ -962,6 +962,11 @@ 如果有編譯單位包含最上層陳述式，就無法指定 /main。 + + At least one top-level statement must be non-empty. + At least one top-level statement must be non-empty. + + Cannot use local variable or local function '{0}' declared in a top-level statement in this context. 在此內容中，無法使用最上層陳述式中宣告的區域變數或區域函式 '{0}'。 diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/FunctionPointerTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/FunctionPointerTests.cs index 2e597b7498082..c4cfb87ed8580 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/FunctionPointerTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/FunctionPointerTests.cs @@ -44,7 +44,12 @@ public void UsingAliasTest() Diagnostic(ErrorCode.ERR_IdentifierExpectedKW, "delegate").WithArguments("", "delegate").WithLocation(2, 11), // (2,25): error CS0116: A namespace cannot directly contain members such as fields or methods // using s = delegate*; - Diagnostic(ErrorCode.ERR_NamespaceUnexpected, ">").WithLocation(2, 25) + Diagnostic(ErrorCode.ERR_NamespaceUnexpected, ">").WithLocation(2, 25), + + // See same-named test in TopLevelStatementsParsingTests, there is a single top-level statement in the tree and it is an empty statement. + // (2,26): error CS8937: At least one top-level statement must be non-empty. + // using s = delegate*; + Diagnostic(ErrorCode.ERR_SimpleProgramIsEmpty, ";").WithLocation(2, 26) ); } diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/TopLevelStatementsTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/TopLevelStatementsTests.cs index 1885bc63119c3..3f36753d91e4d 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/TopLevelStatementsTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/TopLevelStatementsTests.cs @@ -8819,5 +8819,98 @@ void M() Statements (0) "); } + + [Fact] + public void EmptyStatements_01() + { + var text = @";"; + + var comp = CreateCompilation(text, options: TestOptions.DebugExe, parseOptions: DefaultParseOptions); + comp.VerifyDiagnostics( + // (1,1): error CS8937: At least one top-level statement must be non-empty. + // ; + Diagnostic(ErrorCode.ERR_SimpleProgramIsEmpty, ";").WithLocation(1, 1) + ); + } + + [Fact] + public void EmptyStatements_02() + { + var text = @";; + + +;; +;"; + + var comp = CreateCompilation(text, options: TestOptions.DebugExe, parseOptions: DefaultParseOptions); + comp.VerifyDiagnostics( + // (1,1): error CS8937: At least one top-level statement must be non-empty. + // ;; + Diagnostic(ErrorCode.ERR_SimpleProgramIsEmpty, ";").WithLocation(1, 1) + ); + } + + [Fact] + public void EmptyStatements_03() + { + var text = @" +System.Console.WriteLine(""Hi!""); +;; +; +"; + + var comp = CreateCompilation(text, options: TestOptions.DebugExe, parseOptions: DefaultParseOptions); + CompileAndVerify(comp, expectedOutput: "Hi!"); + } + + [Fact] + public void EmptyStatements_04() + { + var text = @" +;; +; +System.Console.WriteLine(""Hi!"");"; + + var comp = CreateCompilation(text, options: TestOptions.DebugExe, parseOptions: DefaultParseOptions); + CompileAndVerify(comp, expectedOutput: "Hi!"); + } + + [Fact] + public void EmptyStatements_05() + { + var text = @" +; +System.Console.WriteLine(""Hi!""); +; +"; + + var comp = CreateCompilation(text, options: TestOptions.DebugExe, parseOptions: DefaultParseOptions); + CompileAndVerify(comp, expectedOutput: "Hi!"); + } + + [Fact] + public void EmptyStatements_06() + { + var text = +@" +using System; +; + +class Program +{ + static void Main(String[] args) {} +} +"; + + var comp = CreateCompilation(text, options: TestOptions.DebugExe, parseOptions: DefaultParseOptions); + comp.VerifyDiagnostics( + // (3,1): error CS8937: At least one top-level statement must be non-empty. + // ; + Diagnostic(ErrorCode.ERR_SimpleProgramIsEmpty, ";").WithLocation(3, 1), + // (7,17): warning CS7022: The entry point of the program is global code; ignoring 'Program.Main(string[])' entry point. + // static void Main(String[] args) {} + Diagnostic(ErrorCode.WRN_MainIgnored, "Main").WithArguments("Program.Main(string[])").WithLocation(7, 17) + ); + } } } diff --git a/src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs b/src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs index 5967e1d75453b..a829a2b420bb7 100644 --- a/src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs +++ b/src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs @@ -2582,5 +2582,70 @@ public void ConstructorLike_03() } EOF(); } + + [Fact] + public void UsingAliasTest() + { + var test = @"using s = delegate*;"; + + UsingTree(test, + // (1,11): error CS1041: Identifier expected; 'delegate' is a keyword + // using s = delegate*; + Diagnostic(ErrorCode.ERR_IdentifierExpectedKW, "delegate").WithArguments("", "delegate").WithLocation(1, 11), + // (1,25): error CS0116: A namespace cannot directly contain members such as fields or methods + // using s = delegate*; + Diagnostic(ErrorCode.ERR_NamespaceUnexpected, ">").WithLocation(1, 25) + ); + + N(SyntaxKind.CompilationUnit); + { + N(SyntaxKind.UsingDirective); + { + N(SyntaxKind.UsingKeyword); + N(SyntaxKind.NameEquals); + { + N(SyntaxKind.IdentifierName); + { + N(SyntaxKind.IdentifierToken, "s"); + } + N(SyntaxKind.EqualsToken); + } + M(SyntaxKind.IdentifierName); + { + M(SyntaxKind.IdentifierToken); + } + M(SyntaxKind.SemicolonToken); + } + N(SyntaxKind.IncompleteMember); + { + N(SyntaxKind.FunctionPointerType); + { + N(SyntaxKind.DelegateKeyword); + N(SyntaxKind.AsteriskToken); + N(SyntaxKind.FunctionPointerParameterList); + { + N(SyntaxKind.LessThanToken); + N(SyntaxKind.FunctionPointerParameter); + { + N(SyntaxKind.PredefinedType); + { + N(SyntaxKind.VoidKeyword); + } + } + N(SyntaxKind.GreaterThanToken); + } + } + } + N(SyntaxKind.GlobalStatement); + { + N(SyntaxKind.EmptyStatement); + { + N(SyntaxKind.SemicolonToken); + } + } + N(SyntaxKind.EndOfFileToken); + } + EOF(); + } } }