Merge remote-tracking branch 'DotNetAnalyzers/stabilization'

Author: sharwell

NuGet.config

@@ -6,6 +6,6 @@
     <add key="symreader-converter" value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
 
     <!-- Uncomment this to test unpublished builds from the AppVeyor feed. -->
-    <!--<add key="appveyor-stylecop" value="https://ci.appveyor.com/nuget/stylecopanalyzers-jqg4a6mt0hgj" />-->
+    <!--<add key="appveyor-stylecop" value="https://ci.appveyor.com/nuget/stylecopanalyzers" />-->
   </packageSources>
 </configuration>

StyleCop.Analyzers/Directory.Build.props

@@ -44,7 +44,7 @@
   <ItemGroup>
     <PackageReference Include="AsyncUsageAnalyzers" Version="1.0.0-alpha003" PrivateAssets="all" />
     <PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.46" PrivateAssets="all" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.1-beta.61" PrivateAssets="all" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.1-rc.94" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="2.11.0-beta2-63603-03" PrivateAssets="all" />
   </ItemGroup>
 

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1135UnitTests.cs

@@ -307,5 +307,17 @@ namespace Test
 
             await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
         }
+
+        [Fact]
+        public async Task TestFullyQualifiedTopLevelNamespaceAsync()
+        {
+            var testCode = @"
+namespace MyNamespace {
+  using System;
+}
+";
+
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/StyleCopCodeFixVerifier`2.cs

@@ -171,13 +171,13 @@ public CSharpTest(LanguageVersion? languageVersion)
                 }
             }
 
-            public SourceFileList TestSources => TestState.Sources;
+            public SourceFileList TestSources => this.TestState.Sources;
 
-            public SourceFileList FixedSources => FixedState.Sources;
+            public SourceFileList FixedSources => this.FixedState.Sources;
 
-            public SourceFileCollection FixedAdditionalFiles => FixedState.AdditionalFiles;
+            public SourceFileCollection FixedAdditionalFiles => this.FixedState.AdditionalFiles;
 
-            public List<DiagnosticResult> RemainingDiagnostics => FixedState.ExpectedDiagnostics;
+            public List<DiagnosticResult> RemainingDiagnostics => this.FixedState.ExpectedDiagnostics;
 
             /// <summary>
             /// Gets or sets the value of the <see cref="FormattingOptions.IndentationSize"/> to apply to the test

StyleCop.Analyzers/StyleCop.Analyzers/Helpers/SymbolNameHelpers.cs

@@ -85,10 +85,14 @@ private static void AppendQualifiedSymbolName(StringBuilder builder, ISymbol sym
                 break;
 
             default:
-                builder
-                    .Append(symbol.ContainingNamespace.ToDisplayString())
-                    .Append(".")
-                    .Append(symbol.Name);
+                if (!symbol.ContainingNamespace.IsGlobalNamespace)
+                {
+                    builder
+                        .Append(symbol.ContainingNamespace.ToDisplayString())
+                        .Append(".");
+                }
+
+                builder.Append(symbol.Name);
                 break;
             }
         }

StyleCop.Analyzers/version.json

@@ -5,7 +5,8 @@
     "precision": "revision"
   },
   "publicReleaseRefSpec": [
-    "^refs/heads/master$"
+    "^refs/heads/master$",
+    "^refs/heads/stabilization$"
   ],
   "nugetPackageVersion": {
     "semVer": 2