Update Versions.props for Dev18 #77138
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
added
Area-Infrastructure
untriaged
akhera99
changed the title
dibarbet
approved these changes
Feb 10, 2025
Member
dibarbet
left a comment
dibarbet
left a comment
There was a problem hiding this comment.
If we're creating a dev18 branch, IMHO we should do some kind of merge from main to it. Otherwise it will get out of date quickly. And it is different from servicing branches in that it should be up to date with main (even infra).
Probably the easiest way would be to utilize arcade's branch merge github action. We would configure it to merge main to the dev18 branch maybe once a day or once a week.
Similar to https://github.com/dotnet/vscode-csharp/blob/main/.github/workflows/branch-merge.yml , except with a scheduled trigger instead of on push
dibarbet
reviewed
Feb 10, 2025
eng/config/PublishData.json
Outdated
| "Shipping", | ||
| "NonShipping" | ||
| ], | ||
| "vsBranch": "dev/monicaro/versioning", |
Member
There was a problem hiding this comment.
I assume this is temporary until we get an actual branch
Member
Author
There was a problem hiding this comment.
correct, that's in progress
eng/config/PublishData.json
Outdated
| "insertionTitlePrefix": "[d17.14 P1]", | ||
| "insertionCreateDraftPR": false | ||
| }, | ||
| "release/dev18.0": { |
Member
There was a problem hiding this comment.
(spoke offline) - this change needs to be made in main
akhera99
changed the title
dibarbet
approved these changes
Feb 10, 2025
JoeRobich
added a commit
to dotnet/roslyn-tools
that referenced
this pull request
Mar 6, 2025
The Arcade inter-branch merge GH action creates merge commits with a differently formatted message (ex. `[automated] Merge branch 'prerelease' => 'main' (#8039)`) Tested by generating PR list between Roslyn main and Roslyn release/dev18.0: *Before*: ```md ### Changes from [main](dotnet/roslyn@main) to [release/dev18.0](dotnet/roslyn@release/dev18.0): [View Complete Diff of Changes](https://github.com/dotnet/roslyn/compare/main...release/dev18.0?w=1) - [[automated] Merge branch 'main' => 'release/dev18.0' (77445)](dotnet/roslyn#77445) - [[automated] Merge branch 'main' => 'release/dev18.0' (77441)](dotnet/roslyn#77441) - [[automated] Merge branch 'main' => 'release/dev18.0' (77431)](dotnet/roslyn#77431) - [[automated] Merge branch 'main' => 'release/dev18.0' (77409)](dotnet/roslyn#77409) - [[automated] Merge branch 'main' => 'release/dev18.0' (77374)](dotnet/roslyn#77374) - [[automated] Merge branch 'main' => 'release/dev18.0' (77292)](dotnet/roslyn#77292) - [[automated] Merge branch 'main' => 'release/dev18.0' (77226)](dotnet/roslyn#77226) - [[automated] Merge branch 'main' => 'release/dev18.0' (77153)](dotnet/roslyn#77153) - [Update Versions.props for Dev18 (77138)](dotnet/roslyn#77138) ``` *After*: ```md ### Changes from [main](dotnet/roslyn@main) to [release/dev18.0](dotnet/roslyn@release/dev18.0): [View Complete Diff of Changes](https://github.com/dotnet/roslyn/compare/main...release/dev18.0?w=1) - [Update Versions.props for Dev18 (77138)](dotnet/roslyn#77138) ```
This was referenced Apr 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.