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

[arcade] Move to arcade 8.0 for main and to use new Version system #22400

Merged
merged 28 commits into from
May 15, 2024

Conversation

rmarinho
Copy link
Member

@rmarinho rmarinho commented May 14, 2024

Description of Change

This pull request introduces several changes to the versioning system for our handler, leveraging the .NET Arcade versioning rules. The changes include moving the arcade to the 8.0 channel and updating xharness. This update ensures that our versioning scheme aligns with the established rules and practices, enhancing consistency and predictability in our build process.

Key Changes

  • Move the arcade to the 8.0 channel.
  • Apply Arcade versioning rules.
  • Update xharness to align with the new versioning system.

Versioning Scheme

Taking the following example:

  • Major: 8
  • Minor: 0
  • Patch: 40

The PatchNumberDate is calculated based on the format "yyyymmdd.Rev", producing something like 24264.1.

  • Local builds: 8.0.40-dev.{PatchNumberDate}
  • PR and CI builds: 8.0.40-ci.{PatchNumberDate}

Branching Strategy

  1. Servicing Branches:

    • When creating a servicing branch from the main branch, update the PreReleaseVersionLabel to servicing and set StabilizePackageVersion to true.
    • Example: Release servicing - 8.0.40
  2. Preview Branches:

    • When creating a preview branch from the net9 branch, update the PreReleaseVersionLabel to preview , the PreReleaseInteractionVersion to the number of you want and set StabilizePackageVersion to true.
    • Example: Release previews - 8.0.40-preview.1.{PatchNumberDate}

Implementation Examples

  • Local Build: 8.0.40-dev.24264.1
  • PR and CI Build: 8.0.40-ci.24264.1
  • Servicing Release: 8.0.40
  • Preview Release: 9.0.0-preview.1.24264.1

Documentation Reference

For detailed versioning rules and additional context, refer to the Arcade versioning documentation.

This pull request helps ensuring our versioning system is robust, predictable, facilitating better build management and release processes.

Update of package versions:

  • .config/dotnet-tools.json: Updated the Microsoft.DotNet.XHarness.CLI package version from 9.0.0-prerelease.24256.1 to 9.0.0-prerelease.24263.1.
  • eng/Version.Details.xml: Updated the versions of Microsoft.DotNet.XHarness.TestRunners.Common, Microsoft.DotNet.XHarness.TestRunners.Xunit, and Microsoft.DotNet.XHarness.CLI packages.
  • eng/Versions.props: Updated the versions of Microsoft.DotNet.XHarness.TestRunners.Common, Microsoft.DotNet.XHarness.TestRunners.Xunit, and Microsoft.DotNet.XHarness.CLI packages.

Removal of productBuild option:

Other changes:

  • eng/cake/dotnet.cake: Added the officialBuildId argument to the dotnet-pack-maui task. [1] [2]
  • Directory.Build.props and eng/Environment.Build.props: Moved the condition for importing Environment.Build.props to the top of Directory.Build.props and added a ContinuousIntegrationBuild condition in Environment.Build.props. [1] [2] [3]
  • eng/Versions.props and eng/Versions.targets: Made changes related to versioning and build characteristics. [1] [2] [3] [4]
  • eng/common/build.cmd: The entire file was removed.

@Eilon Eilon added the area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions label May 14, 2024
@rmarinho rmarinho marked this pull request as ready for review May 15, 2024 09:59
@rmarinho rmarinho requested a review from a team as a code owner May 15, 2024 09:59
@rmarinho rmarinho added the do-not-merge Don't merge this PR label May 15, 2024
@rmarinho rmarinho changed the title [arcade] Move to arcade 8.0 for main [arcade] Move to arcade 8.0 for main and to use new Version system May 15, 2024
@rmarinho rmarinho requested review from mattleibow and PureWeen and removed request for StephaneDelcroix and jfversluis May 15, 2024 15:38
@rmarinho rmarinho removed the do-not-merge Don't merge this PR label May 15, 2024
Copy link
Member

@mattleibow mattleibow left a comment

Choose a reason for hiding this comment

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

LGTM

@rmarinho rmarinho merged commit af10540 into main May 15, 2024
35 of 50 checks passed
@rmarinho rmarinho deleted the try-arcade-build branch May 15, 2024 17:32
@github-actions github-actions bot locked and limited conversation to collaborators Jun 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions fixed-in-8.0.60 fixed-in-9.0.0-preview.5.24307.10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants