Merge main into features/PartialEventsCtors

Roslyn.sln

@@ -205,7 +205,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Expr
 EndProject
 Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Microsoft.CodeAnalysis.VisualBasic.ResultProvider.UnitTests", "src\ExpressionEvaluator\VisualBasic\Test\ResultProvider\Microsoft.CodeAnalysis.VisualBasic.ResultProvider.UnitTests.vbproj", "{ACE53515-482C-4C6A-E2D2-4242A687DFEE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExpressionCompiler.Utilities", "src\ExpressionEvaluator\Core\Test\ExpressionCompiler\Microsoft.CodeAnalysis.ExpressionCompiler.Utilities.csproj", "{21B80A31-8FF9-4E3A-8403-AABD635AEED9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExpressionCompiler.Test.Utilities", "src\ExpressionEvaluator\Core\Test\ExpressionCompiler\Microsoft.CodeAnalysis.ExpressionCompiler.Test.Utilities.csproj", "{21B80A31-8FF9-4E3A-8403-AABD635AEED9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ResultProvider.Utilities", "src\ExpressionEvaluator\Core\Test\ResultProvider\Microsoft.CodeAnalysis.ResultProvider.Utilities.csproj", "{ABDBAC1E-350E-4DC3-BB45-3504404545EE}"
 EndProject

azure-pipelines-pr-validation.yml

@@ -33,8 +33,6 @@ variables:
     value: false
   - name: Codeql.SkipTaskAutoInjection
     value: true
-  - name: SignType
-    value: ''
 
   # To retrieve OptProf data we need to authenticate to the VS drop storage.
   # If the pipeline is running in DevDiv, the account has access to the VS drop storage.

docs/Language Feature Status.md

@@ -10,15 +10,16 @@ efforts behind them.
 
 | Feature | Branch | State | Developer | Reviewer | IDE Buddy | LDM Champ |
 | ------- | ------ | ----- | --------- | -------- | --------- | --------- |
+| [Partial Events and Constructors](https://github.com/dotnet/csharplang/issues/9058) | [features/PartialEventsCtors](https://github.com/dotnet/roslyn/tree/features/PartialEventsCtors) | [In Progress](https://github.com/dotnet/roslyn/issues/76859) | [jjonescz](https://github.com/jjonescz) | [cston](https://github.com/cston), [RikkiGibson](https://github.com/RikkiGibson) |  |  |
 | Runtime Async | [features/runtime-async](https://github.com/dotnet/roslyn/tree/features/runtime-async) | [In Progress](https://github.com/dotnet/roslyn/issues/75960) | [333fred](https://github.com/333fred) | [jcouv](https://github.com/jcouv), [RikkiGibson](https://github.com/RikkiGibson) |  |  |
-| [Simple lambda parameters with modifiers](https://github.com/dotnet/csharplang/blob/main/proposals/simple-lambda-parameters-with-modifiers.md) | [PR](https://github.com/dotnet/roslyn/pull/75400) | [In Progress](https://github.com/dotnet/roslyn/issues/76298) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [jjonescz](https://github.com/jjonescz), [cston](https://github.com/cston) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
 | [Null-conditional assignment](https://github.com/dotnet/csharplang/issues/6045) | [null-conditional-assignment](https://github.com/dotnet/roslyn/tree/features/null-conditional-assignment) | [In Progress](https://github.com/dotnet/roslyn/issues/75554) | [RikkiGibson](https://github.com/RikkiGibson) | [cston](https://github.com/cston), [jjonescz](https://github.com/jjonescz) | TBD | [RikkiGibson](https://github.com/RikkiGibson) |
 | [Extensions](https://github.com/dotnet/csharplang/issues/8697) | [extensions](https://github.com/dotnet/roslyn/tree/features/extensions) | [In Progress](https://github.com/dotnet/roslyn/issues/76130) | [jcouv](https://github.com/jcouv), [AlekseyTs](https://github.com/AlekseyTs) | [jjonescz](https://github.com/jjonescz), TBD | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [MadsTorgersen](https://github.com/MadsTorgersen) |
 | [Dictionary expressions](https://github.com/dotnet/csharplang/issues/8659) | [dictionary-expressions](https://github.com/dotnet/roslyn/tree/features/dictionary-expressions) | [In Progress](https://github.com/dotnet/roslyn/issues/76310) | [cston](https://github.com/cston), [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [333fred](https://github.com/333fred), [jcouv](https://github.com/jcouv) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
 | [`field` keyword in properties](https://github.com/dotnet/csharplang/issues/140) | [field-keyword](https://github.com/dotnet/roslyn/tree/features/field-keyword) | [Merged into 17.12p3](https://github.com/dotnet/roslyn/issues/57012) | [Youssef1313](https://github.com/Youssef1313), [cston](https://github.com/cston) | [333fred](https://github.com/333fred), [RikkiGibson](https://github.com/RikkiGibson) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
 | [First-class Span Types](https://github.com/dotnet/csharplang/issues/7905) | [FirstClassSpan](https://github.com/dotnet/roslyn/tree/features/FirstClassSpan) | [Merged into 17.13p1](https://github.com/dotnet/roslyn/issues/73445) | [jjonescz](https://github.com/jjonescz) | [cston](https://github.com/cston), [333fred](https://github.com/333fred) | | [333fred](https://github.com/333fred), [stephentoub](https://github.com/stephentoub) |
 | [Unbound generic types in `nameof`](https://github.com/dotnet/csharplang/issues/8480) | [PR](https://github.com/dotnet/roslyn/pull/75368) | [Merged into 17.13p2](https://github.com/dotnet/roslyn/pull/75368) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [jcouv](https://github.com/jcouv), [AlekseyTs](https://github.com/AlekseyTs) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
 | [String literals in data section as UTF8](https://github.com/dotnet/roslyn/blob/main/docs/features/string-literals-data-section.md) | [PR](https://github.com/dotnet/roslyn/pull/76036) | [Merged into 17.14p1](https://github.com/dotnet/roslyn/issues/76234) | [jjonescz](https://github.com/jjonescz) | [AlekseyTs](https://github.com/AlekseyTs), [cston](https://github.com/cston) | N/A | N/A |
+| [Simple lambda parameters with modifiers](https://github.com/dotnet/csharplang/blob/main/proposals/simple-lambda-parameters-with-modifiers.md) | [PR](https://github.com/dotnet/roslyn/pull/75400) | [Merged into 17.14p1](https://github.com/dotnet/roslyn/pull/75400) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [jjonescz](https://github.com/jjonescz), [cston](https://github.com/cston) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
 
 # Working Set VB
 

eng/Signing.props

@@ -61,19 +61,4 @@
     <FileSignInfo Include="Microsoft.VisualStudio.Threading.dll" CertificateName="MicrosoftSHA2" />
     <FileSignInfo Include="StreamJsonRpc.dll" CertificateName="MicrosoftSHA2" />
   </ItemGroup>
-
-  <!--
-    We do not intend to ship the artifacts produced for PR validation build so we can skip signing the artifacts.
-   -->
-  <Choose>
-    <When Condition="'$(PreReleaseVersionLabel)' == 'pr-validation' And '$(SignType)' == ''">
-      <ItemGroup>
-        <ItemsToSign Remove="@(ItemsToSign)" />
-      </ItemGroup>
-
-      <PropertyGroup>
-        <AllowEmptySignList>true</AllowEmptySignList>
-      </PropertyGroup>
-    </When>
-  </Choose>
 </Project>

eng/config/PublishData.json

@@ -281,6 +281,16 @@
       "insertionTitlePrefix": "[Do not merge, please close me]",
       "vsMajorVersion": 17,
       "insertionCreateDraftPR": false
+    },
+    "features/vscode_net9": {
+      "nugetKind": [
+        "Shipping",
+        "NonShipping"
+      ],
+      "vsBranch": "main",
+      "insertionTitlePrefix": "[Do not merge, please close me]",
+      "vsMajorVersion": 17,
+      "insertionCreateDraftPR": true
     }
   }
 }

eng/test-rebuild.ps1

@@ -67,7 +67,8 @@ try {
 
   # Semantic Search reference assemblies can't be reconstructed from source.
   # The assemblies are not marked with ReferenceAssemblyAttribute attribute.
-  " --exclude net9.0\GeneratedRefAssemblies\Microsoft.CodeAnalysis.dll" +
+  " --exclude net8.0\GeneratedRefAssemblies\Microsoft.CodeAnalysis.dll" +
+  " --exclude net8.0\GeneratedRefAssemblies\Microsoft.CodeAnalysis.CSharp.dll" +
 
   " --debugPath `"$ArtifactsDir/BuildValidator`"" +
   " --sourcePath `"$RepoRoot/`"" +

src/Analyzers/CSharp/Analyzers/ConvertTypeofToNameof/CSharpConvertTypeOfToNameOfDiagnosticAnalyzer.cs

@@ -19,9 +19,6 @@ internal sealed class CSharpConvertTypeOfToNameOfDiagnosticAnalyzer()
 {
     private static readonly string s_title = CSharpAnalyzersResources.typeof_can_be_converted_to_nameof;
 
-    protected override bool SupportsUnboundGenerics(ParseOptions options)
-        => options.LanguageVersion().IsCSharp14OrAbove();
-
     protected override bool IsValidTypeofAction(OperationAnalysisContext context)
     {
         var node = context.Operation.Syntax;

src/Analyzers/CSharp/Analyzers/UseAutoProperty/CSharpUseAutoPropertyAnalyzer.cs

@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Shared.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Shared.Extensions;
@@ -41,23 +42,9 @@ protected override bool SupportsReadOnlyProperties(Compilation compilation)
     protected override bool SupportsPropertyInitializer(Compilation compilation)
         => compilation.LanguageVersion() >= LanguageVersion.CSharp6;
 
-    protected override bool SupportsFieldExpression(Compilation compilation)
-        => compilation.LanguageVersion() >= LanguageVersion.Preview;
-
     protected override ExpressionSyntax? GetFieldInitializer(VariableDeclaratorSyntax variable, CancellationToken cancellationToken)
         => variable.Initializer?.Value;
 
-    protected override bool ContainsFieldExpression(PropertyDeclarationSyntax propertyDeclaration, CancellationToken cancellationToken)
-    {
-        foreach (var node in propertyDeclaration.DescendantNodes())
-        {
-            if (node.IsKind(SyntaxKind.FieldExpression))
-                return true;
-        }
-
-        return false;
-    }
-
     protected override void RecordIneligibleFieldLocations(
         HashSet<string> fieldNames,
         ConcurrentDictionary<IFieldSymbol, ConcurrentSet<SyntaxNode>> ineligibleFieldUsageIfOutsideProperty,

src/Analyzers/CSharp/Tests/ConvertTypeOfToNameOf/ConvertTypeOfToNameOfTests.cs

@@ -267,19 +267,7 @@ class Goo<T>
                     { 
                         void M() 
                         {
-                            _ = [|typeof(Goo<int>).Name|];
-                        }
-                    }
-                }
-                """,
-            FixedCode = """
-                class Test
-                {
-                    class Goo<T> 
-                    { 
-                        void M() 
-                        {
-                            _ = nameof(Goo<>);
+                            _ = typeof(Goo<int>).Name;
                         }
                     }
                 }
@@ -321,19 +309,7 @@ class Goo<T>
                     { 
                         void M() 
                         {
-                            _ = [|typeof(Goo<>).Name|];
-                        }
-                    }
-                }
-                """,
-            FixedCode = """
-                class Test
-                {
-                    class Goo<T> 
-                    { 
-                        void M() 
-                        {
-                            _ = nameof(Goo<>);
+                            _ = typeof(Goo<>).Name;
                         }
                     }
                 }

src/Analyzers/CSharp/Tests/ImplementInterface/ImplementInterfaceTests.cs

@@ -7626,7 +7626,7 @@ public void M1()
     [Fact, WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/994328")]
     public async Task TestDisposePatternWhenAdditionalUsingsAreIntroduced1()
     {
-#if NET9_0_OR_GREATER
+#if NET
         var extraUsing = """
 
             using System.Diagnostics.CodeAnalysis;

src/Analyzers/CSharp/Tests/UseAutoProperty/UseAutoPropertyTests_Field.cs

@@ -4,6 +4,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Shared.Extensions;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Roslyn.Test.Utilities;
 using Xunit;
@@ -14,7 +15,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.UseAutoProperty;
 public sealed partial class UseAutoPropertyTests
 {
     private static readonly ParseOptions CSharp13 = CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp13);
-    private static readonly ParseOptions CSharp14 = CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.Preview);
+    private static readonly ParseOptions CSharp14 = CSharpParseOptions.Default.WithLanguageVersion(LanguageVersionExtensions.CSharpNext);
 
     [Fact]
     public async Task TestNotInCSharp13()
@@ -1601,4 +1602,111 @@ void M()
             }
             """, new TestParameters(parseOptions: CSharp14));
     }
+
+    [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/76901")]
+    public async Task TestReadAndWrite()
+    {
+        await TestInRegularAndScript1Async(
+            """
+            class C
+            {
+                private int [|_g|];
+
+                public int CustomGetter
+                {
+                    get => _g < 0 ? 0 : _g; // Synthesized return value
+                    set => _g = value;
+                }
+            }
+            """,
+            """
+            class C
+            {
+                public int CustomGetter
+                {
+                    get => field < 0 ? 0 : field; // Synthesized return value
+                    set;
+                }
+            }
+            """, new TestParameters(parseOptions: CSharp14));
+    }
+
+    [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/76901")]
+    public async Task TestContractCall()
+    {
+        await TestInRegularAndScript1Async(
+            """
+            class C
+            {
+                private int [|_s|];
+
+                public int CustomSetter
+                {
+                    get => _s;
+                    set
+                    {
+                        Assumes.True(value >= 0); // Validation
+                        _s = value;
+                    }
+                }
+            }
+            """,
+            """
+            class C
+            {
+                public int CustomSetter
+                {
+                    get;
+                    set
+                    {
+                        Assumes.True(value >= 0); // Validation
+                        field = value;
+                    }
+                }
+            }
+            """, new TestParameters(parseOptions: CSharp14));
+    }
+
+    [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/76901")]
+    public async Task TestDelegateInvoke()
+    {
+        await TestInRegularAndScript1Async(
+            """
+            using System;
+
+            class C
+            {
+                private int [|_s|];
+                public event Action<string> OnChanged;
+
+                public int ObservableProp
+                {
+                    get => _s;
+                    set
+                    {
+                        _s = value;
+                        OnChanged.Invoke(nameof(ObservableProp));
+                    }
+                }
+            }
+            """,
+            """
+            using System;
+
+            class C
+            {
+                public event Action<string> OnChanged;
+
+                public int ObservableProp
+                {
+                    get;
+                    set
+                    {
+                        field = value;
+                        OnChanged.Invoke(nameof(ObservableProp));
+                    }
+                }
+            }
+            """, new TestParameters(parseOptions: CSharp14));
+    }
 }

src/Analyzers/CSharp/Tests/UseImplicitlyTypedLambdaExpression/UseImplicitlyTypedLambdaExpressionTests.cs

@@ -4,6 +4,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Shared.Extensions;
 using Microsoft.CodeAnalysis.CSharp.UseImplicitlyTypedLambdaExpression;
 using Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions;
 using Microsoft.CodeAnalysis.Test.Utilities;
@@ -18,7 +19,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.UseImplicitlyTypedLambd
 [Trait(Traits.Feature, Traits.Features.CodeActionsUseImplicitObjectCreation)]
 public sealed class UseImplicitlyTypedLambdaExpressionTests
 {
-    private static readonly LanguageVersion CSharp14 = LanguageVersion.Preview;
+    private static readonly LanguageVersion CSharp14 = LanguageVersionExtensions.CSharpNext;
 
     [Fact]
     public async Task TestAssignedToObject()

src/Analyzers/Core/Analyzers/ConvertTypeofToNameof/AbstractConvertTypeOfToNameOfDiagnosticAnalyzer.cs

@@ -20,12 +20,8 @@ public override DiagnosticAnalyzerCategory GetAnalyzerCategory()
 
     protected abstract bool IsValidTypeofAction(OperationAnalysisContext context);
 
-    protected abstract bool SupportsUnboundGenerics(ParseOptions options);
-
     protected override void InitializeWorker(AnalysisContext context)
-    {
-        context.RegisterOperationAction(AnalyzeAction, OperationKind.TypeOf);
-    }
+        => context.RegisterOperationAction(AnalyzeAction, OperationKind.TypeOf);
 
     protected void AnalyzeAction(OperationAnalysisContext context)
     {
@@ -47,7 +43,7 @@ protected void AnalyzeAction(OperationAnalysisContext context)
 
     }
 
-    private bool IsValidOperation(IOperation operation)
+    private static bool IsValidOperation(IOperation operation)
     {
         // Cast to a typeof operation & check parent is a property reference and member access
         var typeofOperation = (ITypeOfOperation)operation;
@@ -69,11 +65,10 @@ private bool IsValidOperation(IOperation operation)
         if (typeofOperation.TypeOperand is not INamedTypeSymbol namedType)
             return false;
 
-        // Non-generic types are always convertible.  typeof(X).Name can always be converted to nameof(X)
-        if (namedType.TypeArguments.Length == 0)
-            return true;
-
-        // Generic types are convertible if the lang supports it.  e.g. typeof(X<Y>).Name can be converted to nameof(X<>).
-        return SupportsUnboundGenerics(operation.Syntax.SyntaxTree.Options);
+        // Note: generic names like `typeof(List<int>)` are not convertible (since the name will be List`1). However,
+        // it's fine if an outer part of the name is generic (like `typeof(List<int>.Enumerator)`). as that will be
+        // convertible to `nameof(List<>.Enumerator)`.  So we only need to check the type arguments directly on the type
+        // here, not on any containing types.
+        return namedType.TypeArguments.Length == 0;
     }
 }