Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Move version label next to version prefix - #12609

#12609
Merged
AR-May merged 1 commit into
dotnet:maindotnet/msbuild:mainfrom
AR-May:move-version-label-to-get-conflictAR-May/msbuild:move-version-label-to-get-conflictCopy head branch name to clipboard
Oct 6, 2025
Merged

Move version label next to version prefix#12609
AR-May merged 1 commit into
dotnet:maindotnet/msbuild:mainfrom
AR-May:move-version-label-to-get-conflictAR-May/msbuild:move-version-label-to-get-conflictCopy head branch name to clipboard

Conversation

@AR-May

@AR-May AR-May commented Oct 6, 2025

Copy link
Copy Markdown
Member

Moving version label near to version prefix hoping that we will introduce merge conflicts on version label when merging release branch to main.

See #12592 (comment)

@AR-May
AR-May requested a review from a team as a code owner October 6, 2025 15:00
Copilot AI review requested due to automatic review settings October 6, 2025 15:00

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull Request Overview

This PR moves the PreReleaseVersionLabel property definition to be positioned immediately after VersionPrefix in the Versions.props file. The change is intended to create merge conflicts when merging release branches to main, making version-related changes more visible during the merge process.

Key Changes

  • Relocated PreReleaseVersionLabel property from line 10 to line 7
  • No functional changes to the build or versioning logic

@AR-May
AR-May enabled auto-merge (squash) October 6, 2025 15:30
@AR-May
AR-May merged commit f4fbb16 into dotnet:main Oct 6, 2025
9 checks passed
This was referenced Jul 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.