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

Merge master to master-vs-deps

Author: JoeRobich

src/EditorFeatures/Core/EditorFeaturesResources.resx

@@ -917,4 +917,4 @@ Do you want to proceed?</value>
   <data name="Toggling_line_comment" xml:space="preserve">
     <value>Toggling line comment...</value>
   </data>
-</root>
+</root>

src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb

@@ -5475,12 +5475,8 @@ class C
             Public AutomationTextString As String = "Hello from IntelliCode: Length"
 
             Public Overrides Function ProvideCompletionsAsync(context As CompletionContext) As Task
-                Dim intelliCodeItem = CompletionItem.Create(displayText:="★ Length", filterText:="Length")
-                intelliCodeItem.AutomationText = AutomationTextString
-                context.AddItem(intelliCodeItem)
-
+                context.AddItem(CompletionItem.Create(displayText:="★ Length", filterText:="Length"))
                 context.AddItem(CompletionItem.Create(displayText:="★ Normalize", filterText:="Normalize"))
-                context.AddItem(CompletionItem.Create(displayText:="Normalize", filterText:="Normalize"))
                 context.AddItem(CompletionItem.Create(displayText:="Length", filterText:="Length"))
                 context.AddItem(CompletionItem.Create(displayText:="ToString()", filterText:="ToString"))
                 context.AddItem(CompletionItem.Create(displayText:="First()", filterText:="First"))

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

@@ -33,7 +33,7 @@ public override async Task InitializeAsync()
             VisualStudio.SolutionExplorer.AddProject(testProj, WellKnownProjectTemplates.ConsoleApplication, LanguageNames.VisualBasic);
         }
 
-        [WpfFact]
+        [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
         public void UpdateActiveStatementLeafNode()
         {
             VisualStudio.Editor.SetText(@"
@@ -64,7 +64,7 @@ End Module
             VisualStudio.Debugger.CheckExpression("names(1)", "String", "\"bar\"");
         }
 
-        [WpfFact]
+        [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
         public void AddTryCatchAroundActiveStatement()
         {
             VisualStudio.Editor.SetText(@"
@@ -92,7 +92,7 @@ Catch ex As Exception
             VisualStudio.Editor.Verify.CurrentLineText("End Try");
         }
 
-        [WpfFact]
+        [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
         public void EditLambdaExpression()
         {
             VisualStudio.Editor.SetText(@"
@@ -123,7 +123,7 @@ End Sub
             VisualStudio.ErrorList.Verify.NoBuildErrors();
         }
 
-        [WpfFact]
+        [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
         public void EnCWhileDebuggingFromImmediateWindow()
         {
             VisualStudio.Editor.SetText(@"
@@ -146,7 +146,6 @@ End Sub
             VisualStudio.Debugger.ExecuteStatement("Module1.Main()");
         }
 
-        [WpfFact]
         private void SetupMultiProjectSolution()
         {
             var basicLibrary = new ProjectUtils.Project("BasicLibrary1");
@@ -188,7 +187,7 @@ End Module
             VisualStudio.Workspace.WaitForAsyncOperations(Helper.HangMitigatingTimeout, FeatureAttribute.Workspace);
         }
 
-        [WpfFact]
+        [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
         public void MultiProjectDebuggingWhereNotAllModulesAreLoaded()
         {
             SetupMultiProjectSolution();
@@ -199,7 +198,7 @@ public void MultiProjectDebuggingWhereNotAllModulesAreLoaded()
             VisualStudio.ErrorList.Verify.NoErrors();
         }
 
-        [WpfFact]
+        [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
         [WorkItem(33829, "https://github.com/dotnet/roslyn/issues/33829")]
         public void DocumentStateTrackingReadonlyInRunMode()
         {
@@ -250,7 +249,7 @@ End Module
             VisualStudio.Editor.Verify.IsProjectItemDirty(expectedValue: false);
         }
 
-        [WpfFact]
+        [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
         public void LocalsWindowUpdatesAfterLocalGetsItsTypeUpdatedDuringEnC()
         {
             VisualStudio.Editor.SetText(@"
@@ -273,7 +272,7 @@ End Module
             VisualStudio.LocalsWindow.Verify.CheckEntry("goo", "Single", "10");
         }
 
-        [WpfFact]
+        [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
         public void LocalsWindowUpdatesCorrectlyDuringEnC()
         {
             VisualStudio.Editor.SetText(@"
@@ -306,7 +305,7 @@ End Module
             VisualStudio.LocalsWindow.Verify.CheckEntry("lLng", "Long", "444");
         }
 
-        [WpfFact]
+        [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
         public void WatchWindowUpdatesCorrectlyDuringEnC()
         {
             VisualStudio.Editor.SetText(@"