Merge main to tokenizer branch (#11085)

Trivial conflict resolutions only.

Directory.Packages.props

@@ -13,7 +13,8 @@
     <_BasicReferenceAssembliesVersion>1.7.2</_BasicReferenceAssembliesVersion>
     <_BenchmarkDotNetPackageVersion>0.13.5.2136</_BenchmarkDotNetPackageVersion>
     <_MicrosoftVisualStudioExtensibilityTestingVersion>0.1.187-beta</_MicrosoftVisualStudioExtensibilityTestingVersion>
-    <_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.11.0-beta1.24170.2</_MicrosoftCodeAnalysisAnalyzersPackageVersion>
+    <_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.11.0</_MicrosoftCodeAnalysisAnalyzersPackageVersion>
+    <_RoslynDiagnosticAnalyzersPackageVersion>3.11.0-beta1.24508.2</_RoslynDiagnosticAnalyzersPackageVersion>
     <_MicrosoftVisualStudioLanguageServicesPackageVersion>$(MicrosoftVisualStudioLanguageServicesPackageVersion)</_MicrosoftVisualStudioLanguageServicesPackageVersion>
     <_XunitPackageVersion>2.6.3</_XunitPackageVersion>
     <_MicrosoftBuildPackageVersion>17.11.0-preview-24309-01</_MicrosoftBuildPackageVersion>
@@ -34,7 +35,6 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.2-beta1.24121.1" NoWarn="NU1608" />
     <!-- Temporarily force analyzers to match compiler version https://github.com/dotnet/razor-tooling/issues/6758 -->
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(_MicrosoftCodeAnalysisAnalyzersPackageVersion)" NoWarn="NU1608" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(_MicrosoftCodeAnalysisAnalyzersPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisCommonPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer" Version="$(MicrosoftCodeAnalysisCSharpAnalyzerTestingPackageVersion)" />
@@ -106,7 +106,7 @@
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Nerdbank.Streams" Version="2.11.74" />
     <PackageVersion Include="NuGet.VisualStudio" Version="17.9.1" />
-    <PackageVersion Include="Roslyn.Diagnostics.Analyzers" Version="$(_MicrosoftCodeAnalysisAnalyzersPackageVersion)" />
+    <PackageVersion Include="Roslyn.Diagnostics.Analyzers" Version="$(_RoslynDiagnosticAnalyzersPackageVersion)" />
     <PackageVersion Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" />
     <PackageVersion Include="System.Resources.Extensions" Version="8.0.0" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />

src/Analyzers/Directory.Build.props

@@ -16,7 +16,6 @@
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" NoWarn="NU1608" />
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" />
     <PackageReference Include="Roslyn.Diagnostics.Analyzers" />
   </ItemGroup>
 

src/Compiler/Directory.Build.props

@@ -39,7 +39,6 @@
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" NoWarn="NU1608" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" PrivateAssets="All" />
     <PackageReference Include="Roslyn.Diagnostics.Analyzers" PrivateAssets="All" />
 
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\Analyzers\Razor.Diagnostics.Analyzers\Razor.Diagnostics.Analyzers.csproj"

src/Compiler/Microsoft.AspNetCore.Razor.Language/legacyTest/TestFiles/ParserTests/CSharpSectionTest/ParserDoesNotOutputErrorOtherNestedDirectives.diag.txt

@@ -1,2 +1,2 @@
-(1,17): Error RZ2005: The 'inherits` directive must appear at the start of the line.
+(1,17): Error RZ2005: The 'inherits' directive must appear at the start of the line.
 (1,30): Error RZ1017: Unexpected literal following the 'inherits' directive. Expected 'line break'.

src/Compiler/Microsoft.AspNetCore.Razor.Language/legacyTest/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnMultipleNestedSections.diag.txt

@@ -1,4 +1,4 @@
 (1,16): Error RZ2002: Section blocks ("@section Header { ... }") cannot be nested.  Only one level of section blocks are allowed.
-(1,17): Error RZ2005: The 'section` directive must appear at the start of the line.
+(1,17): Error RZ2005: The 'section' directive must appear at the start of the line.
 (1,42): Error RZ2002: Section blocks ("@section Header { ... }") cannot be nested.  Only one level of section blocks are allowed.
-(1,43): Error RZ2005: The 'section` directive must appear at the start of the line.
+(1,43): Error RZ2005: The 'section' directive must appear at the start of the line.

src/Compiler/Microsoft.AspNetCore.Razor.Language/legacyTest/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.diag.txt

@@ -1,2 +1,2 @@
 (1,16): Error RZ2002: Section blocks ("@section Header { ... }") cannot be nested.  Only one level of section blocks are allowed.
-(1,17): Error RZ2005: The 'section` directive must appear at the start of the line.
+(1,17): Error RZ2005: The 'section' directive must appear at the start of the line.

src/Compiler/Microsoft.AspNetCore.Razor.Language/legacyTest/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.diag.txt

@@ -1 +1 @@
-(1,4): Error RZ2005: The 'section` directive must appear at the start of the line.
+(1,4): Error RZ2005: The 'section' directive must appear at the start of the line.

src/Compiler/Microsoft.AspNetCore.Razor.Language/legacyTest/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.diag.txt

@@ -1 +1 @@
-(1,5): Error RZ2005: The 'custom` directive must appear at the start of the line.
+(1,5): Error RZ2005: The 'custom' directive must appear at the start of the line.

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserDoesNotOutputErrorOtherNestedDirectives.diag.txt

@@ -1,2 +1,2 @@
-(1,17): Error RZ2005: The 'inherits` directive must appear at the start of the line.
+(1,17): Error RZ2005: The 'inherits' directive must appear at the start of the line.
 (1,30): Error RZ1017: Unexpected literal following the 'inherits' directive. Expected 'line break'.

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnMultipleNestedSections.diag.txt

@@ -1,4 +1,4 @@
 (1,16): Error RZ2002: Section blocks ("@section Header { ... }") cannot be nested.  Only one level of section blocks are allowed.
-(1,17): Error RZ2005: The 'section` directive must appear at the start of the line.
+(1,17): Error RZ2005: The 'section' directive must appear at the start of the line.
 (1,42): Error RZ2002: Section blocks ("@section Header { ... }") cannot be nested.  Only one level of section blocks are allowed.
-(1,43): Error RZ2005: The 'section` directive must appear at the start of the line.
+(1,43): Error RZ2005: The 'section' directive must appear at the start of the line.

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.diag.txt

@@ -1,2 +1,2 @@
 (1,16): Error RZ2002: Section blocks ("@section Header { ... }") cannot be nested.  Only one level of section blocks are allowed.
-(1,17): Error RZ2005: The 'section` directive must appear at the start of the line.
+(1,17): Error RZ2005: The 'section' directive must appear at the start of the line.

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingToCodeIfThereIsNoMarkupOnThatLine.diag.txt

@@ -1 +1 @@
-(1,4): Error RZ2005: The 'section` directive must appear at the start of the line.
+(1,4): Error RZ2005: The 'section' directive must appear at the start of the line.

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.diag.txt

@@ -1 +1 @@
-(1,5): Error RZ2005: The 'custom` directive must appear at the start of the line.
+(1,5): Error RZ2005: The 'custom' directive must appear at the start of the line.

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Resources.resx

@@ -195,7 +195,7 @@
     <value>The '{0}' directive expects a type name.</value>
   </data>
   <data name="DirectiveMustAppearAtStartOfLine" xml:space="preserve">
-    <value>The '{0}` directive must appear at the start of the line.</value>
+    <value>The '{0}' directive must appear at the start of the line.</value>
   </data>
   <data name="DirectiveTokensMustBeSeparatedByWhitespace" xml:space="preserve">
     <value>The '{0}' directives value(s) must be separated by whitespace.</value>

src/Razor/Directory.Build.props

@@ -5,7 +5,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" NoWarn="NU1608" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" PrivateAssets="all" />
     <PackageReference Include="Roslyn.Diagnostics.Analyzers" PrivateAssets="all" />
 
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\Analyzers\Razor.Diagnostics.Analyzers\Razor.Diagnostics.Analyzers.csproj"

src/Shared/Directory.Build.props

@@ -16,7 +16,6 @@
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" NoWarn="NU1608" />
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" />
     <PackageReference Include="Roslyn.Diagnostics.Analyzers" />
 
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\Analyzers\Razor.Diagnostics.Analyzers\Razor.Diagnostics.Analyzers.csproj"