Merge remote-tracking branch 'upstream/main' into useExtension

Author: CyrusNajmabadi

eng/Directory.Packages.props

@@ -117,7 +117,7 @@
     <!--
       VS Debugger
     -->
-    <PackageVersion Include="Microsoft.VisualStudio.Debugger.Contracts" Version="17.13.0-beta.25105.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Debugger.Contracts" Version="18.0.0-beta.25359.1" />
     <PackageVersion Include="Microsoft.VisualStudio.Debugger.Engine-implementation" Version="17.13.1121201-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.Debugger.Metadata-implementation" Version="17.13.1121201-preview" />
 

eng/Publishing.props

@@ -17,11 +17,14 @@
   <!--
     During PR Validation we only need to publish symbols with Arcade,
     since our packages are published separately to the CoreXT feed.
+
+    Also, do not publish any symbols packages in source-only builds.
   -->
   <Target Name="_ResolvePublishRoslynNuGetPackages"
           DependsOnTargets="BeforePublish"
           BeforeTargets="PublishToAzureDevOpsArtifacts"
-          Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' ">
+          Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' or '$(DotNetBuildSourceOnly)' == 'true' ">
+
     <ItemGroup>
       <!-- Determine all NuGet packages being published -->
       <_NuGetPackagesToPush Include="@(ItemsToPushToBlobFeed)"
@@ -30,13 +33,25 @@
       <!-- Determine all symbol packages being published -->
       <_SymbolPackagesToPush Include="@(_NuGetPackagesToPush)"
                              Condition="$([System.String]::Copy(%(FullPath)).EndsWith('.symbols.nupkg'))" />
+      <_SymbolPackagesToPush Include="@(_NuGetPackagesToPush)"
+                             Condition="$([System.String]::Copy(%(FullPath)).Contains('.Symbols.'))" />
+    </ItemGroup>
 
+    <ItemGroup Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' ">
       <!-- Remove all NuGet packages from being published -->
       <ItemsToPushToBlobFeed Remove="@(_NuGetPackagesToPush)" />
+    </ItemGroup>
+
+    <ItemGroup Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">
+      <!-- Remove all symbols packages from being published -->
+      <ItemsToPushToBlobFeed Remove="@(_SymbolPackagesToPush)" />
+    </ItemGroup>
 
-      <!-- Include symbol packages for publishing -->
+    <ItemGroup Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' and '$(DotNetBuildSourceOnly)' != 'true' ">
+      <!-- Include symbol packages for publishing-->
       <ItemsToPushToBlobFeed Include="@(_SymbolPackagesToPush)" />
     </ItemGroup>
+
   </Target>
 
 </Project>

eng/Version.Details.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="f451e5d3036a4f140a989e0a7f3f1ae432420e71" BarId="274568" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="87e4c823cc62a13a3e8afbddc78bf718971f376c" BarId="276628" />
   <ProductDependencies>
     <!-- RoslynAnalyzers reference older builds of Roslyn and this is necessary for SourceBuild. -->
     <Dependency Name="Microsoft.CodeAnalysis" Version="3.11.0">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>ae1fff344d46976624e68ae17164e0607ab68b10</Sha>
     </Dependency>
-    <Dependency Name="System.CommandLine" Version="2.0.0-beta5.25210.1">
-      <Uri>https://github.com/dotnet/command-line-api</Uri>
-      <Sha>e9b0511d7f1128e2bc3be7a658a2a4ea977e602d</Sha>
+    <Dependency Name="System.CommandLine" Version="2.0.0-beta7.25374.102">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>87e4c823cc62a13a3e8afbddc78bf718971f376c</Sha>
     </Dependency>
     <!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
     <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0">

eng/Versions.props

@@ -39,7 +39,7 @@
     -->
     <SystemDataSqlClientVersion>4.8.6</SystemDataSqlClientVersion>
     <SystemMemoryVersion>4.6.0</SystemMemoryVersion>
-    <SystemNumericsVectorsVersion>4.6.1</SystemNumericsVectorsVersion>
+    <SystemNumericsVectorsVersion>4.6.0</SystemNumericsVectorsVersion>
     <SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
     <SystemThreadingTasksExtensionsVersion>4.6.0</SystemThreadingTasksExtensionsVersion>
     <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
@@ -48,7 +48,7 @@
     Versions managed by Arcade (see Versions.Details.xml)
   -->
   <PropertyGroup>
-    <SystemCommandLineVersion>2.0.0-beta5.25210.1</SystemCommandLineVersion>
+    <SystemCommandLineVersion>2.0.0-beta7.25374.102</SystemCommandLineVersion>
     <SystemCompositionVersion>9.0.0</SystemCompositionVersion>
     <SystemConfigurationConfigurationManagerVersion>9.0.0</SystemConfigurationConfigurationManagerVersion>
     <SystemDiagnosticsEventLogVersion>9.0.0</SystemDiagnosticsEventLogVersion>

src/Analyzers/CSharp/CodeFixes/MisplacedUsingDirectives/MisplacedUsingDirectivesCodeFixProvider.cs

@@ -36,7 +36,7 @@ namespace Microsoft.CodeAnalysis.CSharp.MisplacedUsingDirectives;
 [ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.MoveMisplacedUsingDirectives), Shared]
 [method: ImportingConstructor]
 [method: SuppressMessage("RoslynDiagnosticsReliability", "RS0033:Importing constructor should be [Obsolete]", Justification = "Used in test code: https://github.com/dotnet/roslyn/issues/42814")]
-internal sealed partial class MisplacedUsingDirectivesCodeFixProvider() : CodeFixProvider
+internal sealed class MisplacedUsingDirectivesCodeFixProvider() : CodeFixProvider
 {
     private static readonly SyntaxAnnotation s_usingPlacementCodeFixAnnotation = new(nameof(s_usingPlacementCodeFixAnnotation));
 
@@ -73,10 +73,9 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
 
         foreach (var diagnostic in context.Diagnostics)
         {
-            context.RegisterCodeFix(
-                CodeAction.Create(
+            context.RegisterCodeFix(CodeAction.Create(
                     CSharpAnalyzersResources.Move_misplaced_using_directives,
-                    token => GetTransformedDocumentAsync(document, compilationUnit, GetAllUsingDirectives(compilationUnit), placement, simplifierOptions, token),
+                    cancellationToken => GetTransformedDocumentAsync(document, compilationUnit, placement, simplifierOptions, cancellationToken),
                     nameof(CSharpAnalyzersResources.Move_misplaced_using_directives)),
                 diagnostic);
         }
@@ -101,7 +100,7 @@ internal static async Task<Document> TransformDocumentIfRequiredAsync(
             return document;
 
         return await GetTransformedDocumentAsync(
-            document, compilationUnit, allUsingDirectives, placement, simplifierOptions, cancellationToken).ConfigureAwait(false);
+            document, compilationUnit, placement, simplifierOptions, cancellationToken).ConfigureAwait(false);
     }
 
     private static ImmutableArray<UsingDirectiveSyntax> GetAllUsingDirectives(CompilationUnitSyntax compilationUnit)
@@ -123,7 +122,7 @@ void Recurse(SyntaxList<MemberDeclarationSyntax> members)
         {
             foreach (var member in members)
             {
-                if (member is NamespaceDeclarationSyntax namespaceDeclaration)
+                if (member is BaseNamespaceDeclarationSyntax namespaceDeclaration)
                 {
                     result.AddRange(namespaceDeclaration.Usings);
                     Recurse(namespaceDeclaration.Members);
@@ -135,13 +134,14 @@ void Recurse(SyntaxList<MemberDeclarationSyntax> members)
     private static async Task<Document> GetTransformedDocumentAsync(
         Document document,
         CompilationUnitSyntax compilationUnit,
-        ImmutableArray<UsingDirectiveSyntax> allUsingDirectives,
         AddImportPlacement placement,
         SimplifierOptions simplifierOptions,
         CancellationToken cancellationToken)
     {
         var bannerService = document.GetRequiredLanguageService<IFileBannerFactsService>();
 
+        var allUsingDirectives = GetAllUsingDirectives(compilationUnit);
+
         // Expand usings so that they can be properly simplified after they are relocated.
         var compilationUnitWithExpandedUsings = await ExpandUsingDirectivesAsync(
             document, compilationUnit, allUsingDirectives, cancellationToken).ConfigureAwait(false);

src/Analyzers/CSharp/CodeFixes/UseImplicitOrExplicitType/UseExplicitTypeCodeFixProvider.cs

@@ -17,6 +17,7 @@
 using Microsoft.CodeAnalysis.LanguageService;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.CSharp.TypeStyle;
@@ -96,7 +97,8 @@ private static async Task HandleDeclarationExpressionAsync(Document document, Sy
             var leadingTrivia = declarationExpression.GetLeadingTrivia()
                 .Concat(variableDesignation.GetAllPrecedingTriviaToPreviousToken().Where(t => !t.IsWhitespace()).Select(t => t.WithoutAnnotations(SyntaxAnnotation.ElasticAnnotation)));
 
-            var tupleDeclaration = GenerateTupleDeclaration(tupleTypeSymbol, variableDesignation).WithLeadingTrivia(leadingTrivia);
+            var tupleDeclaration = GenerateTupleDeclaration(
+                semanticModel, tupleTypeSymbol, variableDesignation, cancellationToken).WithLeadingTrivia(leadingTrivia);
 
             editor.ReplaceNode(declarationExpression, tupleDeclaration);
         }
@@ -171,7 +173,11 @@ private static ITypeSymbol AdjustNullabilityOfTypeSymbol(
         return typeSymbol;
     }
 
-    private static ExpressionSyntax GenerateTupleDeclaration(ITypeSymbol typeSymbol, ParenthesizedVariableDesignationSyntax parensDesignation)
+    private static ExpressionSyntax GenerateTupleDeclaration(
+        SemanticModel semanticModel,
+        ITypeSymbol typeSymbol,
+        ParenthesizedVariableDesignationSyntax parensDesignation,
+        CancellationToken cancellationToken)
     {
         Debug.Assert(typeSymbol.IsTupleType);
         var elements = ((INamedTypeSymbol)typeSymbol).TupleElements;
@@ -186,12 +192,18 @@ private static ExpressionSyntax GenerateTupleDeclaration(ITypeSymbol typeSymbol,
             switch (designation.Kind())
             {
                 case SyntaxKind.SingleVariableDesignation:
+                    var singleVariableDesignation = (SingleVariableDesignationSyntax)designation;
+                    var localSymbol = semanticModel.GetDeclaredSymbol(singleVariableDesignation, cancellationToken);
+                    var symbolType = localSymbol.GetSymbolType() ?? type;
+                    newDeclaration = DeclarationExpression(symbolType.GenerateTypeSyntax(allowVar: false), singleVariableDesignation);
+                    break;
                 case SyntaxKind.DiscardDesignation:
                     var typeName = type.GenerateTypeSyntax(allowVar: false);
                     newDeclaration = DeclarationExpression(typeName, designation);
                     break;
                 case SyntaxKind.ParenthesizedVariableDesignation:
-                    newDeclaration = GenerateTupleDeclaration(type, (ParenthesizedVariableDesignationSyntax)designation);
+                    newDeclaration = GenerateTupleDeclaration(
+                        semanticModel, type, (ParenthesizedVariableDesignationSyntax)designation, cancellationToken);
                     break;
                 default:
                     throw ExceptionUtilities.UnexpectedValue(designation.Kind());
@@ -213,13 +225,14 @@ private static ExpressionSyntax GenerateTupleDeclaration(ITypeSymbol typeSymbol,
             .WithTrailingTrivia(parensDesignation.GetTrailingTrivia());
     }
 
-    private static SyntaxNode GenerateTypeDeclaration(TypeSyntax typeSyntax, ITypeSymbol newTypeSymbol)
+    private static TypeSyntax GenerateTypeDeclaration(TypeSyntax typeSyntax, ITypeSymbol newTypeSymbol)
     {
         // We're going to be passed through the simplifier.  Tell it to not just convert this back to var (as
         // that would defeat the purpose of this refactoring entirely).
         var newTypeSyntax = newTypeSymbol
-                     .GenerateTypeSyntax(allowVar: false)
-                     .WithTriviaFrom(typeSyntax);
+            .GenerateTypeSyntax(allowVar: false)
+            .WithAdditionalAnnotations(Simplifier.AddImportsAnnotation)
+            .WithTriviaFrom(typeSyntax);
 
         return newTypeSyntax;
     }

src/Analyzers/CSharp/Tests/AddRequiredParentheses/AddRequiredExpressionParenthesesTests.cs

@@ -427,9 +427,8 @@ void M()
             """, RequireAllParenthesesForClarity);
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/79286")]
-    public async Task TestCoalescePrecedence4()
-    {
-        await TestMissingAsync(
+    public Task TestCoalescePrecedence4()
+        => TestMissingAsync(
             """
             class C
             {
@@ -439,7 +438,6 @@ void M()
                 }
             }
             """, RequireAllParenthesesForClarity);
-    }
 
     [Fact]
     public Task TestBitwisePrecedence1()