Skip to content

Revert "Revert "[main] Update dependencies from dotnet/command-line-api (#29131)""#33157

Merged
adamsitnik merged 3 commits intomainfrom
revert-33146-revert-scl-update
Jun 30, 2023
Merged

Revert "Revert "[main] Update dependencies from dotnet/command-line-api (#29131)""#33157
adamsitnik merged 3 commits intomainfrom
revert-33146-revert-scl-update

Conversation

@marcpopMSFT
Copy link
Copy Markdown
Member

@marcpopMSFT marcpopMSFT commented Jun 9, 2023

Reverts #33146

Don't merge this until we synchronize PRs across the following repos:

  • dotnet/format
  • dotnet/roslyn
  • dotnet/runtime
  • dotnet/sdk
  • dotnet/templating

@adamsitnik
Copy link
Copy Markdown
Member

adamsitnik commented Jun 12, 2023

@adamsitnik
Copy link
Copy Markdown
Member

An update: all the PRs are ready, but we are waiting until the preview snap (21/06/2023) to avoid any last-minute issues with codeflow.

cc @baronfel

@am11
Copy link
Copy Markdown
Member

am11 commented Jun 22, 2023

Lets resolve the next batch of merge conflicts on the day of merge, because resolution in runtime repo is non-trivial. I have a process in place. 😅

Copy link
Copy Markdown
Member

@adamsitnik adamsitnik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@adamsitnik adamsitnik merged commit 6483a69 into main Jun 30, 2023
@adamsitnik adamsitnik deleted the revert-33146-revert-scl-update branch June 30, 2023 12:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-dotnet new the item is related to dotnet new command untriaged Request triage from a team member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants