Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge release/dev17.4 to main #64743

Merged
merged 3 commits into from
Oct 14, 2022
Merged

Merge release/dev17.4 to main #64743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e47644
Update VS Platform NuGet package version
genlu Oct 12, 2022
725b3f0
Fix NRT warnings
genlu Oct 14, 2022
0d6b4d8
Merge pull request #64667 from genlu/BumpEditorPackages
genlu Oct 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.145-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
<!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
<CodeStyleAnalyzerVersion>4.3.0-1.final</CodeStyleAnalyzerVersion>
<VisualStudioEditorPackagesVersion>17.4.136-preview</VisualStudioEditorPackagesVersion>
<VisualStudioEditorPackagesVersion>17.4.203-preview</VisualStudioEditorPackagesVersion>
<!-- This should generally be set to $(VisualStudioEditorPackagesVersion),
but sometimes EditorFeatures.Cocoa specifically requires a newer editor build. -->
<VisualStudioMacEditorPackagesVersion>17.3.133-preview</VisualStudioMacEditorPackagesVersion>
Expand Down
13 changes: 8 additions & 5 deletions src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/EditorInProcess.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ private Func<IWpfTextView, CancellationToken, Task<bool>> GetLightBulbApplicatio
}

var actionSetsForAction = await action.GetActionSetsAsync(cancellationToken);
var fixAllAction = await GetFixAllSuggestedActionAsync(actionSetsForAction, fixAllScope.Value, cancellationToken);
var fixAllAction = await GetFixAllSuggestedActionAsync(actionSetsForAction!, fixAllScope.Value, cancellationToken);
if (fixAllAction == null)
{
throw new InvalidOperationException($"Unable to find FixAll in {fixAllScope} code fix for suggested action '{action.DisplayText}'.");
Expand Down Expand Up @@ -890,9 +890,12 @@ private async Task<IEnumerable<ISuggestedAction>> SelectActionsAsync(IEnumerable
foreach (var action in actionSet.Actions)
{
actions.Add(action);
var nestedActionSets = await action.GetActionSetsAsync(cancellationToken);
var nestedActions = await SelectActionsAsync(nestedActionSets, cancellationToken);
actions.AddRange(nestedActions);
if (action.HasActionSets)
{
var nestedActionSets = await action.GetActionSetsAsync(cancellationToken);
var nestedActions = await SelectActionsAsync(nestedActionSets!, cancellationToken);
actions.AddRange(nestedActions);
}
}
}
}
Expand Down Expand Up @@ -921,7 +924,7 @@ private async Task<IEnumerable<ISuggestedAction>> SelectActionsAsync(IEnumerable
if (action.HasActionSets)
{
var nestedActionSets = await action.GetActionSetsAsync(cancellationToken);
var fixAllCodeAction = await GetFixAllSuggestedActionAsync(nestedActionSets, fixAllScope, cancellationToken);
var fixAllCodeAction = await GetFixAllSuggestedActionAsync(nestedActionSets!, fixAllScope, cancellationToken);
if (fixAllCodeAction != null)
{
return fixAllCodeAction;
Expand Down
13 changes: 8 additions & 5 deletions src/VisualStudio/IntegrationTest/TestUtilities/InProcess/TextViewWindow_InProc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ private Func<IWpfTextView, Task<bool>> GetLightBulbApplicationAction(string acti
}

var actionSetsForAction = await action.GetActionSetsAsync(CancellationToken.None);
var fixAllAction = await GetFixAllSuggestedActionAsync(JoinableTaskFactory, actionSetsForAction, fixAllScope.Value);
var fixAllAction = await GetFixAllSuggestedActionAsync(JoinableTaskFactory, actionSetsForAction!, fixAllScope.Value);
if (fixAllAction == null)
{
throw new InvalidOperationException($"Unable to find FixAll in {fixAllScope.ToString()} code fix for suggested action '{action.DisplayText}'.");
Expand Down Expand Up @@ -486,9 +486,12 @@ private async Task<IEnumerable<ISuggestedAction>> SelectActionsAsync(IEnumerable
foreach (var action in actionSet.Actions)
{
actions.Add(action);
var nestedActionSets = await action.GetActionSetsAsync(CancellationToken.None);
var nestedActions = await SelectActionsAsync(nestedActionSets);
actions.AddRange(nestedActions);
if (action.HasActionSets)
{
var nestedActionSets = await action.GetActionSetsAsync(CancellationToken.None);
var nestedActions = await SelectActionsAsync(nestedActionSets!);
actions.AddRange(nestedActions);
}
}
}
}
Expand Down Expand Up @@ -517,7 +520,7 @@ private async Task<IEnumerable<ISuggestedAction>> SelectActionsAsync(IEnumerable
if (action.HasActionSets)
{
var nestedActionSets = await action.GetActionSetsAsync(CancellationToken.None);
var fixAllCodeAction = await GetFixAllSuggestedActionAsync(joinableTaskFactory, nestedActionSets, fixAllScope);
var fixAllCodeAction = await GetFixAllSuggestedActionAsync(joinableTaskFactory, nestedActionSets!, fixAllScope);
if (fixAllCodeAction != null)
{
return fixAllCodeAction;
Expand Down