Merge main to main-vs-deps

.editorconfig

@@ -63,7 +63,6 @@ dotnet_style_explicit_tuple_names = true:suggestion
 
 # Whitespace options
 dotnet_style_allow_multiple_blank_lines_experimental = false
-dotnet_style_allow_statement_immediately_after_block_experimental = true
 
 # Non-private static fields are PascalCase
 dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.severity = suggestion
@@ -242,6 +241,10 @@ csharp_prefer_braces = true:silent
 csharp_preserve_single_line_blocks = true
 csharp_preserve_single_line_statements = true
 
+# Currently only enabled for C# due to crash in VB analyzer.  VB can be enabled once
+# https://github.com/dotnet/roslyn/pull/54259 has been published.
+dotnet_style_allow_statement_immediately_after_block_experimental = false
+
 [src/CodeStyle/**.{cs,vb}]
 # warning RS0005: Do not use generic CodeAction.Create to create CodeAction
 dotnet_diagnostic.RS0005.severity = none
@@ -291,7 +294,7 @@ dotnet_diagnostic.IDE2001.severity = warning
 dotnet_diagnostic.IDE2002.severity = warning
 
 # dotnet_style_allow_statement_immediately_after_block_experimental
-dotnet_diagnostic.IDE2003.severity = none
+dotnet_diagnostic.IDE2003.severity = warning
 
 # csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental
 dotnet_diagnostic.IDE2004.severity = warning

eng/targets/VisualStudio.targets

@@ -139,5 +139,14 @@
     <PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" ExcludeAssets="all"/>
   </ItemGroup>
 
+  <Target Name="_CheckDeploymentTargetVisualStudioVersion"
+		      Condition="'$(DeployExtension)' == 'true' and '$(CreateVsixContainer)' == 'true'"
+          BeforeTargets="DeployVsixExtensionFiles"
+	       	DependsOnTargets="GetVsixDeploymentPath">
+
+    <Error Text="Deployment to Dev17 is not supported in this branch. Use the corresponding *-vs-deps branch." 
+           Condition="$([MSBuild]::ValueOrDefault('$(ExtensionsPath)', '').Contains('17.0'))"/>
+  </Target>
+
   <Import Project="GeneratePkgDef.targets" Condition="'$(MSBuildRuntimeType)' != 'Core' and '$(GeneratePkgDefFile)' == 'true' and '$(DesignTimeBuild)' != 'true' and '$(BuildingForLiveUnitTesting)' != 'true'" />
 </Project>

src/Analyzers/CSharp/Analyzers/AddAccessibilityModifiers/CSharpAddAccessibilityModifiersDiagnosticAnalyzer.cs

@@ -112,6 +112,7 @@ private void ProcessMemberDeclaration(
                                 return;
                             }
                         }
+
                         break;
 
                     case SyntaxKind.ClassDeclaration:
@@ -125,6 +126,7 @@ private void ProcessMemberDeclaration(
                                 return;
                             }
                         }
+
                         break;
 
                     default:

src/Analyzers/CSharp/Analyzers/UseIndexOrRangeOperator/CSharpUseRangeOperatorDiagnosticAnalyzer.cs

@@ -82,6 +82,7 @@ private void AnalyzeInvocation(
             {
                 return;
             }
+
             context.ReportDiagnostic(CreateDiagnostic(resultOpt.Value));
         }
 

src/Analyzers/CSharp/CodeFixes/RemoveUnnecessaryDiscardDesignation/CSharpRemoveUnnecessaryDiscardDesignationCodeFixProvider.cs

@@ -80,6 +80,7 @@ protected override Task FixAllAsync(
                                     SyntaxFactory.TypePattern(((DeclarationPatternSyntax)current).Type)
                                                  .WithAdditionalAnnotations(Formatter.Annotation));
                         }
+
                         break;
                     case RecursivePatternSyntax recursivePattern:
                         editor.ReplaceNode(

src/Analyzers/CSharp/CodeFixes/UseSimpleUsingStatement/UseSimpleUsingStatementCodeFixProvider.cs

@@ -163,6 +163,7 @@ private static SyntaxTriviaList Expand(List<StatementSyntax> result, UsingStatem
                     result.Add(anythingElse);
                     return default;
             }
+
             return default;
         }
 

src/Analyzers/VisualBasic/CodeFixes/RemoveUnnecessaryByVal/VisualBasicRemoveUnnecessaryByValCodeFixProvider.vb

@@ -35,6 +35,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.RemoveUnnecessaryByVal
                     Function(ct) FixAsync(context.Document, diagnostic, ct)),
                     diagnostic)
             Next
+
             Return Task.CompletedTask
         End Function
 

src/Analyzers/VisualBasic/CodeFixes/SimplifyObjectCreation/VisualBasicSimplifyObjectCreationCodeFixProvider.vb

@@ -33,6 +33,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.SimplifyObjectCreation
                     Function(ct) FixAsync(context.Document, diagnostic, ct)),
                     diagnostic)
             Next
+
             Return Task.CompletedTask
         End Function
 

src/EditorFeatures/CSharp/CompleteStatement/CompleteStatementCommandHandler.cs

@@ -223,6 +223,7 @@ private static bool MoveCaretToSemicolonPosition(
                 {
                     return MoveCaretToFinalPositionInStatement(speculative, currentNode, args, originalCaret, caret, true);
                 }
+
                 return false;
             }
             else if (syntaxFacts.IsStatement(currentNode)

src/EditorFeatures/CSharp/DecompiledSource/AssemblyResolver.cs

@@ -71,6 +71,7 @@ public PEFile Resolve(IAssemblyReference name)
                 {
                     Log(CSharpEditorResources.WARN_Version_mismatch_Expected_0_Got_1, name.Version, assemblies[0].Identity.Version);
                 }
+
                 return MakePEFile(assemblies[0]);
             }
 

src/EditorFeatures/CSharp/Highlighting/KeywordHighlighters/ReturnStatementHighlighter.cs

@@ -63,6 +63,7 @@ private void HighlightRelatedKeywords(SyntaxNode node, List<TextSpan> spans)
                         if (!child.AsNode().IsReturnableConstruct())
                             HighlightRelatedKeywords(child.AsNode(), spans);
                     }
+
                     break;
             }
         }

src/EditorFeatures/CSharp/Highlighting/KeywordHighlighters/YieldStatementHighlighter.cs

@@ -69,6 +69,7 @@ private void HighlightRelatedKeywords(SyntaxNode node, List<TextSpan> spans)
                             HighlightRelatedKeywords(child.AsNode(), spans);
                         }
                     }
+
                     break;
             }
         }

src/EditorFeatures/CSharpTest/Completion/CompletionProviders/SymbolCompletionProviderTests.cs

@@ -9576,6 +9576,7 @@ void goo()
             {
                 await VerifyItemExistsAsync(markup, "Item" + i);
             }
+
             await VerifyItemExistsAsync(markup, "ToString");
 
             await VerifyItemIsAbsentAsync(markup, "Item1");

src/EditorFeatures/CSharpTest/Diagnostics/AddExplicitCast/AddExplicitCastTests.cs

@@ -2522,6 +2522,7 @@ public Test(string s, Base b, int i, params object[] list) : this(d : [||]b, s :
                 var (actions, actionToInvoke) = await GetCodeActionsAsync(workspace, new TestParameters());
                 Assert.Equal(2, actions.Length);
             }
+
             var expect_0 =
 @"
 class Program
@@ -2671,6 +2672,7 @@ void M()
                 var (actions, actionToInvoke) = await GetCodeActionsAsync(workspace, new TestParameters());
                 Assert.Equal(2, actions.Length);
             }
+
             var expect_0 =
 @"
 class Program
@@ -2746,6 +2748,7 @@ void M()
                 var (actions, actionToInvoke) = await GetCodeActionsAsync(workspace, new TestParameters());
                 Assert.Equal(3, actions.Length);
             }
+
             var expect_0 =
 @"
 class Program

src/EditorFeatures/CSharpTest/Diagnostics/Suppression/SuppressionTests.cs

@@ -927,6 +927,7 @@ public void AnalyzeNode(SyntaxNodeAnalysisContext context)
                                 {
                                     context.ReportDiagnostic(Diagnostic.Create(Descriptor, trivia.GetLocation()));
                                 }
+
                                 break;
                         }
                     }

src/EditorFeatures/CSharpTest/ImplementInterface/ImplementExplicitlyTests.cs

@@ -15,7 +15,7 @@
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ImplementInterface
 {
-    public partial class ImplementExplicitlyTests : AbstractCSharpCodeActionTest
+    public class ImplementExplicitlyTests : AbstractCSharpCodeActionTest
     {
         private const int SingleMember = 0;
         private const int SameInterface = 1;

src/EditorFeatures/CSharpTest/ImplementInterface/ImplementImplicitlyTests.cs

@@ -16,7 +16,7 @@
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ImplementInterface
 {
-    public partial class ImplementImplicitlyTests : AbstractCSharpCodeActionTest
+    public class ImplementImplicitlyTests : AbstractCSharpCodeActionTest
     {
         private const int SingleMember = 0;
         private const int SameInterface = 1;