Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add preview suffix in experimental CI Builds, enable expinsert #11534

Open
wants to merge 6 commits into
base: vs17.8
Choose a base branch
from

Conversation

JanProvaznik
Copy link
Member

@JanProvaznik JanProvaznik commented Mar 4, 2025

Fixes #11492

Context

we added packages to feeds when developing whose version matched the ones we wanted to release, which lead to conflicts

Changes Made

  1. for experimental builds on release branches removes the branding so that the produced packages have -preview suffix which prevents conflicts in feeds
  2. ported experimental insertion pipeline to release branches
  3. add a step that in exp insertion selects a servicing target branch based on the branch prefix exp/vsXX.Y(Y)...

Testing

MSBuild pipeline run: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=11123072&view=results
Exp Insertion: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=11123201&view=results

Notes

  • should merge flow to active vs17.* release branches

@JanProvaznik JanProvaznik requested a review from a team March 4, 2025 12:47
@JanProvaznik JanProvaznik changed the title remove release branding for experimental in CI Build remove release branding for experimental CI Builds Mar 4, 2025
@JanProvaznik JanProvaznik changed the title remove release branding for experimental CI Builds add preview prefix in experimental CI Builds Mar 4, 2025
@JanProvaznik JanProvaznik changed the title add preview prefix in experimental CI Builds add preview prefix in experimental CI Builds, enable expinsert Mar 4, 2025
@JanProvaznik JanProvaznik changed the title add preview prefix in experimental CI Builds, enable expinsert add preview suffix in experimental CI Builds, enable expinsert Mar 4, 2025
@JanProvaznik JanProvaznik linked an issue Mar 5, 2025 that may be closed by this pull request
@JanProvaznik JanProvaznik self-assigned this Mar 5, 2025
.vsts-dotnet.yml Outdated
foreach ($node in $nodes) {
$node.ParentNode.RemoveChild($node) | Out-Null
}
$xml.Save($versionsPath)
Copy link
Member

Choose a reason for hiding this comment

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

I don't love editing files on disk for this. Would it be possible to instead pass

/p:DotNetFinalVersionKind=prerelease /p:PreReleaseVersionLabel=experimental to the build command in this case?

Copy link
Member

Choose a reason for hiding this comment

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

Ah actually it looks like that doesn't help like I thought. What about conditions in the project XML itself on a "This is experimental" property set in this yaml?

Copy link
Member Author

@JanProvaznik JanProvaznik Mar 5, 2025

Choose a reason for hiding this comment

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

Why wouldn't it help?
When I ran locally CIBuild.cmd /p:DotNetFinalVersionKind= it built the packages with suffixes which I wanted.
I'll delete the xml logic and test.
This logic comes from arcade

actually /p:SuppressFinalPackageVersion=true is even better

@JanProvaznik JanProvaznik requested a review from a team March 10, 2025 08:44
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.

experimental insertion should not push non-preview packages
2 participants