diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpRenameFileToMatchTypeRefactoring.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpRenameFileToMatchTypeRefactoring.cs index 76e3358fb6f92..04113ae34ef59 100644 --- a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpRenameFileToMatchTypeRefactoring.cs +++ b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpRenameFileToMatchTypeRefactoring.cs @@ -24,7 +24,7 @@ public CSharpRenameFileToMatchTypeRefactoring(VisualStudioInstanceFactory instan { } - [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/60463"), Trait(Traits.Feature, Traits.Features.CodeActionsMoveType)] + [WpfFact, Trait(Traits.Feature, Traits.Features.CodeActionsMoveType)] public void RenameFileToMatchType_ExistingCode() { var project = new ProjectUtils.Project(ProjectName); diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpCodeActions.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpCodeActions.cs index 8d3c9a400746b..1bef0fec9b283 100644 --- a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpCodeActions.cs +++ b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpCodeActions.cs @@ -82,7 +82,7 @@ class Program await TestServices.EditorVerifier.CodeActionAsync("using System;", cancellationToken: HangMitigatingCancellationToken); } - [IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/60460"), Trait(Traits.Feature, Traits.Features.CodeActionsAddImport)] + [IdeFact, Trait(Traits.Feature, Traits.Features.CodeActionsAddImport)] public async Task FastDoubleInvoke() { // We want to invoke the first smart tag and then *immediately* try invoking the next. @@ -462,7 +462,7 @@ await TestServices.EditorVerifier.CodeActionAsync( AssertEx.EqualOrDiff(expectedSecondFile, await TestServices.Editor.GetTextAsync(HangMitigatingCancellationToken)); } - [IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/60461"), Trait(Traits.Feature, Traits.Features.CodeActionsGenerateMethod)] + [IdeFact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateMethod)] public async Task ClassificationInPreviewPane() { await SetUpEditorAsync(@" @@ -538,7 +538,7 @@ await TestServices.Workspace.WaitForAllAsyncOperationsAsync( await TestServices.EditorVerifier.TextContainsAsync("using System.IO;", cancellationToken: HangMitigatingCancellationToken); } - [IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/60461"), Trait(Traits.Feature, Traits.Features.CodeActionsGenerateType)] + [IdeFact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateType)] public async Task GFUFuzzyMatchAfterRenameTrackingAndAfterGenerateType() { await SetUpEditorAsync(@" diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpGoToBase.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpGoToBase.cs index eae77392406b8..3deb794a56dc9 100644 --- a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpGoToBase.cs +++ b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpGoToBase.cs @@ -20,7 +20,7 @@ public CSharpGoToBase() { } - [IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/60386")] + [IdeFact] public async Task GoToBaseFromMetadataAsSource() { await TestServices.SolutionExplorer.AddFileAsync(ProjectName, "C.cs", cancellationToken: HangMitigatingCancellationToken); diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpUpdateProjectToAllowUnsafe.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpUpdateProjectToAllowUnsafe.cs index d0e4786f4d9c7..860ccfb7754ca 100644 --- a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpUpdateProjectToAllowUnsafe.cs +++ b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpUpdateProjectToAllowUnsafe.cs @@ -48,7 +48,7 @@ public async Task CPSProject_GeneralPropertyGroupUpdated() VerifyPropertyOutsideConfiguration(await GetProjectFileElementAsync(project, HangMitigatingCancellationToken), "AllowUnsafeBlocks", "true"); } - [IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/60461")] + [IdeFact] public async Task LegacyProject_AllConfigurationsUpdated() { var project = ProjectName; diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpUpgradeProject.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpUpgradeProject.cs index a6ca34328ff5b..3664307544f32 100644 --- a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpUpgradeProject.cs +++ b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpUpgradeProject.cs @@ -47,7 +47,7 @@ public async Task CPSProject_GeneralPropertyGroupUpdated() VerifyPropertyOutsideConfiguration(await GetProjectFileElementAsync(project, HangMitigatingCancellationToken), "LangVersion", "latest"); } - [IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/60463")] + [IdeFact] public async Task LegacyProject_AllConfigurationsUpdated() { var project = ProjectName; diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/LightBulbHelper.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/LightBulbHelper.cs index 5a8bd2eb3b1d7..956ef4c93cb75 100644 --- a/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/LightBulbHelper.cs +++ b/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/LightBulbHelper.cs @@ -61,6 +61,8 @@ public static async Task> WaitForItemsAsync(Test if (e.Status == QuerySuggestedActionCompletionStatus.Completed) tcs.SetResult(e.ActionSets.ToList()); + else if (e.Status == QuerySuggestedActionCompletionStatus.CompletedWithoutData) + tcs.SetResult(new List()); else if (e.Status == QuerySuggestedActionCompletionStatus.Canceled) tcs.TrySetCanceled(); else @@ -88,7 +90,7 @@ public static async Task> WaitForItemsAsync(Test catch (OperationCanceledException) when (!cancellationToken.IsCancellationRequested) { var version = await testServices.Shell.GetVersionAsync(cancellationToken); - if (Version.Parse("17.2.32210.308") >= version) + if (Version.Parse("17.2.32314.265") >= version) { // Unexpected cancellation can occur when the editor dismisses the light bulb without request return null; diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/LightBulbHelper.cs b/src/VisualStudio/IntegrationTest/TestUtilities/LightBulbHelper.cs index 549b9d6ec950e..b4adb603a73d0 100644 --- a/src/VisualStudio/IntegrationTest/TestUtilities/LightBulbHelper.cs +++ b/src/VisualStudio/IntegrationTest/TestUtilities/LightBulbHelper.cs @@ -65,6 +65,8 @@ public static async Task> WaitForItemsAsync(ILig if (e.Status == QuerySuggestedActionCompletionStatus.Completed) tcs.SetResult(e.ActionSets.ToList()); + else if (e.Status == QuerySuggestedActionCompletionStatus.CompletedWithoutData) + tcs.SetResult(new List()); else tcs.SetException(new InvalidOperationException($"Light bulb transitioned to non-complete state: {e.Status}"));