Merge main

.github/workflows/main-merge.yml

@@ -2,9 +2,9 @@
 
 name: Inter-branch merge
 on:
-  # schedule:
-  #   # Create a merge every 3 hours (works only for merges from `main`, others would need a `push` trigger).
-  #   - cron: '0 */3 * * *'
+  schedule:
+    # Create a merge every 3 hours (works only for merges from `main`, others would need a `push` trigger).
+    - cron: '0 */3 * * *'
   workflow_dispatch:
     inputs:
       configuration_file_branch:
@@ -21,5 +21,6 @@ jobs:
     if: github.repository == 'dotnet/roslyn'
     uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
     with:
-      configuration_file_path: 'eng/config/branch-merge.jsonc'
+      configuration_file_path: 'eng/config/main-to-main-vs-deps-branch-merge.jsonc'
       configuration_file_branch: ${{ inputs.configuration_file_branch || 'main' }}
+

Roslyn.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31319.15
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.10623.112 main
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RoslynDeployment", "src\Deployment\RoslynDeployment.csproj", "{600AF682-E097-407B-AD85-EE3CED37E680}"
 EndProject
@@ -2207,8 +2207,11 @@ Global
 		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\VisualBasic\VisualBasicWorkspaceExtensions.projitems*{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}*SharedItemsImports = 5
 		src\Analyzers\CSharp\Tests\CSharpAnalyzers.UnitTests.projitems*{58969243-7f59-4236-93d0-c93b81f569b3}*SharedItemsImports = 13
 		src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
+		src\Dependencies\Contracts\Microsoft.CodeAnalysis.Contracts.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
 		src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
+		src\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
 		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
+		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Extensions\Microsoft.CodeAnalysis.Extensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
 		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
 		src\Analyzers\Core\CodeFixes\CodeFixes.projitems*{5ff1e493-69cc-4d0b-83f2-039f469a04e1}*SharedItemsImports = 5
 		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{5ff1e493-69cc-4d0b-83f2-039f469a04e1}*SharedItemsImports = 5

eng/Directory.Packages.props

@@ -66,9 +66,6 @@
     <PackageVersion Include="Microsoft.VisualStudio.Extensibility.JsonGenerators.Sdk" Version="17.12.2037-preview3" />
     <PackageVersion Include="Microsoft.VSSDK.Debugger.VSDConfigTool" Version="17.13.1100801-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.ProjectSystem" Version="17.0.77-pre-g62a6cb5699" />
-    <PackageVersion Include="Microsoft.VisualStudio.Progression.CodeSchema" Version="15.8.27812-alpha" />
-    <PackageVersion Include="Microsoft.VisualStudio.Progression.Common" Version="15.8.27812-alpha" />
-    <PackageVersion Include="Microsoft.VisualStudio.Progression.Interfaces" Version="15.8.27812-alpha" />
     <PackageVersion Include="Microsoft.VisualStudio.CallHierarchy.Package.Definitions" Version="15.8.27812-alpha" />
     <PackageVersion Include="Microsoft.VisualStudio.CodeAnalysis.Sdk.UI" Version="15.8.27812-alpha" />
     <PackageVersion Include="Microsoft.VisualStudio.Language.CallHierarchy" Version="15.8.27812-alpha" />
@@ -99,14 +96,12 @@
     <PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.13.226" />
     <PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.13.226" />
     <PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.13.40008" />
-    <PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="17.13.40008" />
     <PackageVersion Include="Microsoft.VisualStudio.Language" Version="17.13.226" />
     <PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="17.13.226" />
     <PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.13.226" />
     <PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.13.33" />
     <PackageVersion Include="Microsoft.VisualStudio.RemoteControl" Version="16.3.52" />
     <PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.13.7" />
-    <PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.13.40008" />
     <PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.14.8" />
     <PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="17.13.226" />
     <PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="17.13.226" />

eng/Version.Details.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d" BarId="269724" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="25bec1af21db71468c5c2c3a588dd54d0e058e9d" BarId="271417" />
   <ProductDependencies>
     <!-- RoslynAnalyzers reference older builds of Roslyn and this is necessary for SourceBuild. -->
     <Dependency Name="Microsoft.CodeAnalysis" Version="3.11.0">

eng/build.ps1

@@ -440,7 +440,7 @@ function TestUsingRunTests() {
     }
 
   } elseif ($testVsi) {
-    $args += " --timeout 110"
+    $args += " --timeout 220"
     $args += " --runtime both"
     $args += " --sequential"
     $args += " --include '\.IntegrationTests'"

eng/config/PublishData.json

@@ -176,6 +176,15 @@
       "insertionCreateDraftPR": false
     },
     "main": {
+      "nugetKind": [
+        "Shipping",
+        "NonShipping"
+      ],
+      "vsBranch": "main",
+      "insertionCreateDraftPR": true,
+      "insertionTitlePrefix": "[Validation]"
+    },
+    "main-vs-deps": {
       "nugetKind": [
         "Shipping",
         "NonShipping"

eng/config/globalconfigs/Common.globalconfig

@@ -127,9 +127,6 @@ dotnet_diagnostic.VSTHRD010.severity = none
 # VSTHRD110: Observe result of async calls
 dotnet_diagnostic.VSTHRD110.severity = none
 
-# Workaround for old Microsoft.VisualStudio.Progression.* packages: https://github.com/dotnet/roslyn/issues/71404
-dotnet_diagnostic.VSIXCompatibility1001.severity = none
-
 dotnet_diagnostic.HAA0101.severity = none
 dotnet_diagnostic.HAA0102.severity = none
 dotnet_diagnostic.HAA0201.severity = none

eng/config/main-to-main-vs-deps-branch-merge.jsonc

@@ -0,0 +1,10 @@
+// Used by .github/workflows/main-merge.yml
+{
+    "merge-flow-configurations": {
+        // Merge any main changes to main-vs-deps.
+        "main": {
+            "MergeToBranch": "main-vs-deps",
+            "ExtraSwitches": "-QuietComments"
+        }
+    }
+}

eng/targets/Settings.props

@@ -11,9 +11,6 @@
 
     <VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix>
 
-    <!-- Workaround for old Microsoft.VisualStudio.Progression.* packages -->
-    <NoWarn>$(NoWarn);VSIXCompatibility1001</NoWarn>
-
     <!-- TODO: https://github.com/dotnet/roslyn/issues/71667 -->
     <NoWarn>$(NoWarn);NU1507</NoWarn>
 
@@ -120,6 +117,7 @@
     <MicrosoftCodeAnalysisLanguageServerKey>002400000480000094000000060200000024000052534131000400000100010009f3c8fcb7cb2592cc6e6d3646d4d9a2bda9e7a243d357bc17a5a06f50ed0dae74a343cd9538fe45bbc90a3f7cbecb23558205e3b246b69f7f7730e520460d560da1c68cda9e2256e3b801629e2dc1fd588b1681aaf4f2c98abcfc50086ecbcd55f76f7dbaf018e708527d8ae3a2714b3ec9b62bd9aaf56cf55b3ffc9eee31aa</MicrosoftCodeAnalysisLanguageServerKey>
     <MicrosoftCodeAnalysisCompilerDeveloperSDKKey>00240000048000009400000006020000002400005253413100040000010001005984d9e99e5722bb74ddbb59972bff1a2fd9e0ccb2d50e09ef85e39ec4a4e4bf2de896997de1af164be0558cdd5a50a283b9353fc4e5ccc1c87363e6e7d87af7bec8ca40281596fc8f5b5aad9904230f6f3892f8dde382cee7ba9854004d86ce93834a86b42ebdd0faf86d9fa6d935e05aed68cb4d828cea77df028739aaa9dc</MicrosoftCodeAnalysisCompilerDeveloperSDKKey>
     <CopilotKey>002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293</CopilotKey>
+    <AIToolsKey>$(MicrosoftSharedPublicKey)</AIToolsKey>
   </PropertyGroup>
 
   <!--

src/Analyzers/Core/Analyzers/RemoveUnnecessarySuppressions/AbstractRemoveUnnecessaryPragmaSuppressionsDiagnosticAnalyzer.cs

@@ -759,62 +759,78 @@ private async Task<bool> ProcessSuppressMessageAttributesAsync(
                     continue;
                 }
 
-                var symbols = SemanticFacts.GetDeclaredSymbols(semanticModel, node, cancellationToken);
-                foreach (var symbol in symbols)
+                // In the case of declaration nodes that can have more than one symbol e.g. fields and events,
+                // the attributes are shared between then. Given this, we only need to inspect the first symbol
+                // of the node.
+                var symbol = SemanticFacts
+                    .GetDeclaredSymbols(semanticModel, node, cancellationToken)
+                    .FirstOrDefault();
+
+                // If we somehow do not have a symbol, we can't do anything. Otherwise, check if our symbol is
+                // a partial definition. If it is, skip it in favor of checking the implementation.
+                if (symbol is null or
+                    IMethodSymbol { IsPartialDefinition: true } or
+                    IPropertySymbol { IsPartialDefinition: true })
                 {
-                    switch (symbol?.Kind)
-                    {
-                        // Local SuppressMessageAttributes are only applicable for types and members.
-                        case SymbolKind.NamedType:
-                        case SymbolKind.Method:
-                        case SymbolKind.Field:
-                        case SymbolKind.Property:
-                        case SymbolKind.Event:
-                            break;
-
-                        default:
-                            continue;
-                    }
+                    continue;
+                }
 
-                    // Skip already processed symbols from partial declarations
-                    var isPartial = symbol.Locations.Length > 1;
-                    if (isPartial && !processedPartialSymbols.Add(symbol))
-                    {
+                switch (symbol?.Kind)
+                {
+                    // Local SuppressMessageAttributes are only applicable for types and members.
+                    case SymbolKind.NamedType:
+                    case SymbolKind.Method:
+                    case SymbolKind.Field:
+                    case SymbolKind.Property:
+                    case SymbolKind.Event:
+                        break;
+
+                    default:
                         continue;
-                    }
+                }
+
+                // Skip already processed symbols from partial declarations
+                var isPartial = symbol.Locations.Length > 1;
 
-                    foreach (var attribute in symbol.GetAttributes())
+                if (isPartial && !processedPartialSymbols.Add(symbol))
+                {
+                    continue;
+                }
+
+                foreach (var attribute in symbol.GetAttributes())
+                {
+                    if (attribute.ApplicationSyntaxReference != null &&
+                        TryGetSuppressedDiagnosticId(attribute, suppressMessageAttributeType, out var id, out var category))
                     {
-                        if (attribute.ApplicationSyntaxReference != null &&
-                            TryGetSuppressedDiagnosticId(attribute, suppressMessageAttributeType, out var id, out var category))
+                        // Ignore unsupported IDs and those excluded through user option.
+                        if (!IsSupportedAnalyzerDiagnosticId(id) ||
+                            userIdExclusions.Contains(id, StringComparer.OrdinalIgnoreCase) ||
+                            category?.Length > 0 && userCategoryExclusions.Contains(category, StringComparer.OrdinalIgnoreCase))
+                        {
+                            continue;
+                        }
+
+                        if (!idToSuppressMessageAttributesMap.TryGetValue(id, out var nodesForId))
                         {
-                            // Ignore unsupported IDs and those excluded through user option.
-                            if (!IsSupportedAnalyzerDiagnosticId(id) ||
-                                userIdExclusions.Contains(id, StringComparer.OrdinalIgnoreCase) ||
-                                category?.Length > 0 && userCategoryExclusions.Contains(category, StringComparer.OrdinalIgnoreCase))
-                            {
-                                continue;
-                            }
-
-                            if (!idToSuppressMessageAttributesMap.TryGetValue(id, out var nodesForId))
-                            {
-                                nodesForId = [];
-                                idToSuppressMessageAttributesMap.Add(id, nodesForId);
-                            }
-
-                            var attributeNode = await attribute.ApplicationSyntaxReference.GetSyntaxAsync(cancellationToken).ConfigureAwait(false);
-                            nodesForId.Add(attributeNode);
-
-                            // Initialize the attribute node as unnecessary at the start of the algorithm.
-                            // Later processing will identify attributes which are indeed responsible for suppressing diagnostics
-                            // and mark them as used.
-                            // NOTE: For attributes on partial symbols with multiple declarations, we conservatively
-                            // consider them as used and avoid unnecessary attribute analysis because that would potentially
-                            // require analysis across multiple files, which can be expensive from a performance standpoint.
-                            suppressMessageAttributesToIsUsedMap.Add(attributeNode, isPartial);
+                            nodesForId = [];
+                            idToSuppressMessageAttributesMap.Add(id, nodesForId);
                         }
+
+                        var attributeNode = await attribute.ApplicationSyntaxReference.GetSyntaxAsync(cancellationToken).ConfigureAwait(false);
+                        nodesForId.Add(attributeNode);
+
+                        // Initialize the attribute node as unnecessary at the start of the algorithm.
+                        // Later processing will identify attributes which are indeed responsible for suppressing diagnostics
+                        // and mark them as used.
+                        // NOTE: For attributes on partial symbols with multiple declarations, we conservatively
+                        // consider them as used and avoid unnecessary attribute analysis because that would potentially
+                        // require analysis across multiple files, which can be expensive from a performance standpoint.
+                        suppressMessageAttributesToIsUsedMap.Add(attributeNode, isPartial);
                     }
                 }
+
+                // Individual variables within a variable declaration cannot be decorated with distinct attributes, so we
+                // should avoid looking at any of the subsequent symbols for this node as they will be the same.
             }
         }
 

src/Analyzers/VisualBasic/Tests/RemoveUnnecessaryImports/RemoveUnnecessaryImportsTests.vb

@@ -1323,5 +1323,17 @@ End Namespace
 parseOptions:=TestOptions.Regular,
 compilationOptions:=TestOptions.ReleaseExe.WithGlobalImports({GlobalImport.Parse("System"), GlobalImport.Parse("Goo"), GlobalImport.Parse("Bar")}))
         End Function
+
+        <Fact, WorkItem("https://github.com/dotnet/roslyn/issues/78799")>
+        Public Async Function TestExplicitSelectionOfFullImportStatement() As Task
+            Await TestAsync(
+"[|Imports System.Collections.Generic|]
+
+Class C
+End Class",
+"Class C
+End Class",
+TestOptions.Regular)
+        End Function
     End Class
 End Namespace

src/Compilers/CSharp/Portable/Binder/Binder.ValueChecks.cs

@@ -3029,13 +3029,13 @@ private bool CheckInvocationArgMixingWithUpdatedRules(
                 }
             }
 
-            inferDeclarationExpressionValEscape();
+            inferDeclarationExpressionValEscape(argsOpt, localScopeDepth, escapeValues);
 
             mixableArguments.Free();
             escapeValues.Free();
             return valid;
 
-            void inferDeclarationExpressionValEscape()
+            void inferDeclarationExpressionValEscape(ImmutableArray<BoundExpression> argsOpt, SafeContext localScopeDepth, ArrayBuilder<EscapeValue> escapeValues)
             {
                 // find the widest scope that arguments could safely escape to.
                 // use this scope as the inferred STE of declaration expressions.

src/Compilers/CSharp/Portable/Binder/Binder_Conversions.cs

@@ -2286,7 +2286,7 @@ private static void CheckParameterModifierMismatchMethodConversion(SyntaxNode sy
                 return;
             }
 
-            if (SourceMemberContainerTypeSymbol.RequiresValidScopedOverrideForRefSafety(delegateMethod))
+            if (SourceMemberContainerTypeSymbol.RequiresValidScopedOverrideForRefSafety(delegateMethod, lambdaOrMethod.TryGetThisParameter(out var thisParameter) ? thisParameter : null))
             {
                 SourceMemberContainerTypeSymbol.CheckValidScopedOverride(
                     delegateMethod,