Merge pull request #37699 from dotnet/merges/master-to-master-vs-deps

Merge master to master-vs-deps

src/EditorFeatures/CSharpTest/EditAndContinue/StatementEditingTests.cs

@@ -2761,6 +2761,42 @@ void F()
                 Diagnostic(RudeEditKind.ChangingLambdaReturnType, "a", CSharpFeaturesResources.lambda));
         }
 
+        [Fact]
+        public void Lambdas_Update_Signature_Nullable()
+        {
+            var src1 = @"
+using System;
+
+class C
+{
+    void G1(Func<string, string> f) {}
+    void G2(Func<string?, string?> f) {}
+
+    void F()
+    {
+        G1(a => a);
+    }
+}
+";
+            var src2 = @"
+using System;
+
+class C
+{
+    void G1(Func<string, string> f) {}
+    void G2(Func<string?, string?> f) {}
+
+    void F()
+    {
+        G2(a => a);
+    }
+}
+";
+            var edits = GetTopEdits(src1, src2);
+
+            edits.VerifySemanticDiagnostics();
+        }
+
         [Fact]
         public void Lambdas_Update_Signature_SyntaxOnly1()
         {

src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicEditAndContinue.cs

@@ -34,7 +34,7 @@ public override async Task InitializeAsync()
             VisualStudio.SolutionExplorer.AddProject(testProj, WellKnownProjectTemplates.ConsoleApplication, LanguageNames.VisualBasic);
         }
 
-        // Also "https://github.com/dotnet/roslyn/issues/36763")]
+        // Also "https://github.com/dotnet/roslyn/issues/37689")]
         [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/35965")]
         [Trait(Traits.Feature, Traits.Features.DebuggingEditAndContinue)]
         public void UpdateActiveStatementLeafNode()
@@ -68,7 +68,7 @@ End Module
             VisualStudio.Debugger.CheckExpression("names(1)", "String", "\"bar\"");
         }
 
-        // Also "https://github.com/dotnet/roslyn/issues/36763")]
+        // Also "https://github.com/dotnet/roslyn/issues/37689")]
         [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/35965")]
         [Trait(Traits.Feature, Traits.Features.DebuggingEditAndContinue)]
         public void AddTryCatchAroundActiveStatement()
@@ -99,7 +99,7 @@ End Sub
             VisualStudio.Editor.Verify.CurrentLineText("End Try");
         }
 
-        // Also "https://github.com/dotnet/roslyn/issues/36763")]
+        // Also "https://github.com/dotnet/roslyn/issues/37689")]
         [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/35965")]
         [Trait(Traits.Feature, Traits.Features.DebuggingEditAndContinue)]
         public void EditLambdaExpression()
@@ -134,7 +134,7 @@ End Sub
             VisualStudio.ErrorList.Verify.NoBuildErrors();
         }
 
-        // Also "https://github.com/dotnet/roslyn/issues/36763")]
+        // Also "https://github.com/dotnet/roslyn/issues/37689")]
         [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/35965")]
         [Trait(Traits.Feature, Traits.Features.DebuggingEditAndContinue)]
         public void EnCWhileDebuggingFromImmediateWindow()
@@ -214,7 +214,7 @@ public void MultiProjectDebuggingWhereNotAllModulesAreLoaded()
             VisualStudio.ErrorList.Verify.NoErrors();
         }
 
-        // Also https://github.com/dotnet/roslyn/issues/36763
+        // Also "https://github.com/dotnet/roslyn/issues/37689")]
         [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/35965")]
         [Trait(Traits.Feature, Traits.Features.DebuggingEditAndContinue)]
         public void LocalsWindowUpdatesAfterLocalGetsItsTypeUpdatedDuringEnC()
@@ -240,7 +240,7 @@ End Module
             VisualStudio.LocalsWindow.Verify.CheckEntry("goo", "Single", "10");
         }
 
-        // Also https://github.com/dotnet/roslyn/issues/36763
+        // Also "https://github.com/dotnet/roslyn/issues/37689")]
         [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/35965")]
         [Trait(Traits.Feature, Traits.Features.DebuggingEditAndContinue)]
         public void LocalsWindowUpdatesCorrectlyDuringEnC()
@@ -276,8 +276,8 @@ End Module
             VisualStudio.LocalsWindow.Verify.CheckEntry("lLng", "Long", "444");
         }
 
-        // Also https://github.com/dotnet/roslyn/issues/36763
-        [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
+        // Also "https://github.com/dotnet/roslyn/issues/37689")]
+        [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/35965")]
         [Trait(Traits.Feature, Traits.Features.DebuggingEditAndContinue)]
         public void WatchWindowUpdatesCorrectlyDuringEnC()
         {