Skip to content

Commit

Permalink
Merge pull request #51318 from dotnet/merges/release/dev16.9-to-relea…
Browse files Browse the repository at this point in the history
…se/dev16.9-vs-deps

Merge release/dev16.9 to release/dev16.9-vs-deps
  • Loading branch information
msftbot[bot] committed Feb 18, 2021
2 parents 8d78fb5 + ca8abf7 commit cf6270b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 4 additions & 1 deletion azure-pipelines-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ jobs:
- job: VS_Integration
pool:
name: NetCorePublic-Pool
queue: $(queueName)
queue: BuildPool.Windows.VS2019.Pre.Scouting.Open
# One this integration test fix has flowed in to master-vs-deps, we can update the queueName variable, and revert this change.
# Tracked by https://github.com/dotnet/roslyn/issues/51312
# queue: $(queueName)
strategy:
maxParallel: 4
matrix:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ public static class WellKnownCommandNames
public const string Edit_ListMembers = "Edit.ListMembers";
public const string Edit_ParameterInfo = "Edit.ParameterInfo";
public const string Edit_QuickInfo = "Edit.QuickInfo";
// This will need to be reverted when we move to 16.8p3. DevDiv bug:
// https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1193302
public const string Edit_ToggleCompletionMode = "Edit.ToggleIntelliSensesuggestioncompletionmode";
public const string Edit_ToggleCompletionMode = "Edit.ToggleCompletionMode";
public const string Edit_Undo = "Edit.Undo";
public const string Edit_Redo = "Edit.Redo";
public const string Edit_SelectionCancel = "Edit.SelectionCancel";
Expand Down

0 comments on commit cf6270b

Please sign in to comment.