Merge pull request #59281 from sharwell/update-harness

Update integration test harness for 17.2 Preview 1
dotnet · Feb 4, 2022 · 78c556a · 78c556a
2 parents abe7bed + 2690351
commit 78c556a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -22,7 +22,7 @@
     <RoslynDiagnosticsNugetPackageVersion>3.3.3-beta1.21105.3</RoslynDiagnosticsNugetPackageVersion>
     <MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21366.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisTestingVersion>1.1.1-beta1.22081.4</MicrosoftCodeAnalysisTestingVersion>
-    <MicrosoftVisualStudioExtensibilityTestingVersion>0.1.122-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
+    <MicrosoftVisualStudioExtensibilityTestingVersion>0.1.124-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
     <!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
     <CodeStyleAnalyzerVersion>4.0.1</CodeStyleAnalyzerVersion>
     <VisualStudioEditorPackagesVersion>16.10.230</VisualStudioEditorPackagesVersion>

diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/LightBulbHelper.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/LightBulbHelper.cs
@@ -85,13 +85,14 @@ public static async Task<IEnumerable<SuggestedActionSet>> WaitForItemsAsync(Test
             }
             catch (OperationCanceledException) when (!cancellationToken.IsCancellationRequested)
             {
-                if (Version.Parse("17.1.31928.29") >= await testServices.Shell.GetVersionAsync(cancellationToken))
+                var version = await testServices.Shell.GetVersionAsync(cancellationToken);
+                if (Version.Parse("17.2.32127.420") >= version)
                 {
                     // Unexpected cancellation can occur when the editor dismisses the light bulb without request
                     return null;
                 }
 
-                throw;
+                throw new OperationCanceledException($"IDE version '{version}' unexpectedly dismissed the light bulb.");
             }
         }
     }