Skip to content

Conversation

RikkiGibson
Copy link
Member

@RikkiGibson RikkiGibson commented Aug 18, 2025

Looked at all the places main-vs-deps is referenced in infra config files and added community also

@RikkiGibson RikkiGibson requested a review from a team as a code owner August 18, 2025 22:35
@RikkiGibson
Copy link
Member Author

Would like another review from @dotnet/roslyn-infrastructure if possible, especially with an eye for any bits I might have forgotten to update

@@ -55,6 +55,8 @@ configuration:
branch: main
- targetsBranch:
branch: main-vs-deps
- targetsBranch:
branch: community
Copy link
Member

Choose a reason for hiding this comment

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

Should we mention this branch in our contributing docs?

Copy link
Member

Choose a reason for hiding this comment

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

I see now there is a pinned issue informing about this which seems good enough given it's temporary. Although if we anticipate this being used more often in the future, there could be a note about this in the docs anyway (like "if there is a community branch, please use it" or some such).

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure, I'll open a follow up.

@RikkiGibson RikkiGibson merged commit a59d20f into dotnet:main Aug 19, 2025
27 checks passed
@dotnet-policy-service dotnet-policy-service bot added this to the Next milestone Aug 19, 2025
333fred added a commit to 333fred/roslyn that referenced this pull request Aug 19, 2025
* upstream/main: (275 commits)
  Update yml files to use community branch (dotnet#79950)
  [main] Source code updates from dotnet/dotnet (dotnet#79920)
  Allow MEF components to supply assembly path resolvers (dotnet#79218)
  update auto merge config (dotnet#79949)
  Update PublishData.json (dotnet#79946)
  Add comment
  Add vb tests
  VB side
  Fix results streamed by ForAttributeWithMetadataName with multiple parts
  chore: deleted accitenly committed local file.
  bugfix: generated the format methods as public as it is with the related properties. tests: updated resources accordingly to the changes.
  Revert "Sneak in a sneaky test IVT"
  Revert "Missed one"
  Missed one
  Sneak in a sneaky test IVT
  Export the analyzer loader for the Misc workspace so the Razor generator has a consistent ALC
  Update localization branch to 17.14
  Reorder checks to report issue as early as possible
  Avoid crash from Script class instantiation (dotnet#79879)
  Unblock type forwarding scenarios involving extensions (dotnet#79905)
  ...
@RikkiGibson RikkiGibson modified the milestones: Next, 18.0 P1 Aug 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants