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

chore(deps): Bump GitVersion.MsBuild from 5.12.0 to 6.0.0 #215

Closed
wants to merge 3 commits into from

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jul 22, 2024

Bumps GitVersion.MsBuild from 5.12.0 to 6.0.0.

Release notes

Sourced from GitVersion.MsBuild's releases.

6.0.0

As part of this release we had 1594 commits.

The changes that were introduced can be found within each of the pre-releases:

6.0.0-alpha.1 6.0.0-beta.1 6.0.0-beta.2 6.0.0-beta.3 6.0.0-beta.4 6.0.0-beta.5 6.0.0-beta.6 6.0.0-beta.7 6.0.0-rc.1 6.0.0-rc.2

For additional information check the BREAKING_CHANGES.md

Breaking changes

Bugs

... (truncated)

Changelog

Sourced from GitVersion.MsBuild's changelog.

v6.0.0

Platforms

  • Drop support for .NET Framework 4.8, .NET Core 3.1 and .NET 5.0. Changed the project targets to .NET 6.0 or later.

Caching

  • Refactor caching system in GitVersion to use json files instead of yaml files. This change is not backwards compatible with the old caching system.

Configuration changes:

  • The configuration properties continuous-delivery-fallback-tag, tag-number-pattern, and tag were renamed to continuous-delivery-fallback-label, label-number-pattern, and label respectively. tag-pre-release-weight and tag-prefix remained as they were as they are referring to a Git tag.

  • When using a commit message that matches both *-version-bump-message and no-bump-message, there is no increment for that commit. In other words, no-bump-message now takes precedence over *-version-bump-message.

  • The fallback version strategy now returns 0.0.0 and is flagged with ShouldIncrement equal to true. This yields the version 0.1.0 on the develop branch (IncrementStrategy.Minor by default) and 0.0.1 on the main branch (IncremetnStrategy.Patch by default).

  • The current branch (child) inherits its configuration from the source (parent) branch if the increment strategy is set to Inherit. This makes branch configuration recursive, simpler, more intuitive, more flexible, and more robust.

  • Instead of having a single effective configuration, we now have one effective configuration per branch where the increment strategy is not set to inherit.

  • The new implementation of the branch configuration inheritance affects per default only the pull-requests, hotfix and feature branches. In this case the next version will be generated like the child branch is not existing and the commits have been made on the source branch.

    • The following example illustrates this behavior. On the feature branch the semantic version 1.1.0-just-a-test.1+2 will now be generated instead of version 1.0.0-just-a-test.1+3 previously:

      * 1f1cfb4 52 minutes ago  (HEAD -> feature/just-a-test)
      * 1f9654d 54 minutes ago  (release/1.1.0)
      * be72411 56 minutes ago  (develop)
      * 14800ff 58 minutes ago  (tag: 1.0.0, main)
      
  • A new unknown branch magic string has been introduced to give the user the possibility to specify the branch configuration for a branch which is not known. A branch is not known if only the regular expression of the branch configuration with the name unknown is matching. Please notice that this branch configuration behaves like any other branch configurations.

  • Additional fallback branch configuration properties have been introduced at the root to define base properties which will be inherit to the branch configurations. That means if no other branch configuration in the inheritance line defines the given property the fallback property applies. Notice that the inheritance tree can be controlled using the increment strategy property in the branch configuration section.

    • The following example illustrates this behavior. The hotfix branch configuration overrides the main branch configuration and the result overrides the fallback branch configuration.

      * 1f1cfb4 52 minutes ago  (HEAD -> hotfix/just-a-test)
      * 14800ff 58 minutes ago  (tag: 1.0.0, main)
      
  • When overriding the configuration with e.g. GitVersion.yaml the software distinguishes between properties who are not existent and properties who are null. This is especially important if the user wants to define branch related configuration which are marked with increment strategy Inherit.

  • Following root configuration properties have been removed:

    • continuous-delivery-fallback-tag
  • A new branch related property with name track-merge-message has been introduced. Consider we have a main branch and a release/1.0.0 branch and merge changes from release/1.0.0 to the main branch. In this scenario the merge message will be interpreted as a next version 1.0.0 when track-merge-message is set to true otherwise 0.0.1.

  • The pre-release tags are only considered when they are matching with the label name of the branch. This has an effect on the way how the CommitCountSource will be determined.

  • The process of increasing the version with bump message when CommitMessageIncrementing is enabled and increment strategy is None has been changed.

  • A new configuration property with name version-in-branch-pattern has been introduced. This setting only applies on branches where the option is-release-branch is set to true. Please notice that the branch name needs to be defined after the version number by default (instead of support/lts-2.0.0 please name the branch like support/2.0.0-lts).

  • The is-release-branch property of the hotfix branch setting has been changed from false to true. If present the hotfix number will be considered now by default.

  • In the GitHub and the Git Flow workflows the label property is by default set to an empty string on the main branch. This yields to a pre-release version on main with an empty tag. Instead of for instance 1.0.1+46 GitVersion generates the full semantic version 1.0.1-46 instead. This behavior can be changed to generate only stable versions (no pre-release version) with setting the label to null (Please keep in mind that the label property on root needs to be set to null as well, otherwise the fallback applies). This change is caused by issue #2347.

  • The useBranchName magic string has been removed. Instead use {BranchName} for label.

  • The BranchPrefixToTrim configuration property has been removed. RegularExpression is now used to capture named groups instead.

    • Default RegularExpression for feature branches is changed from ^features?[/-] to ^features?[/-](https://github.com/GitTools/GitVersion/blob/main/?<BranchName>.+) to support using {BranchName} out-of-the-box
    • Default RegularExpression for unknown branches is changed from .* to (?<BranchName>.+) to support using {BranchName} out-of-the-box
  • The Mainline mode and the related implementation has been removed completely. The new Mainline version strategy should be used instead.

... (truncated)

Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot will merge this PR once CI passes on it, as requested by @Anheledir.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Summary by CodeRabbit

  • Chores
    • Updated the version of the GitVersion.MsBuild package, which may enhance versioning capabilities and overall build process.

@dependabot dependabot bot added the maintenance Some refactoring, code-cleanups or applying best practices. label Jul 22, 2024
Copy link

coderabbitai bot commented Jul 22, 2024

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Walkthrough

The project BaseBotService has undergone an update to its versioning package, specifically changing from GitVersion.MsBuild version 5.12.0 to 6.0.0. This update may enhance the build process and versioning capabilities, potentially introducing new features or improvements. The overall structure and functionality of the project remain unchanged, ensuring continuity in its operations.

Changes

Files Change Summary
BaseBotService/BaseBotService.csproj Updated GitVersion.MsBuild package from 5.12.0 to 6.0.0

Poem

In the garden where changes bloom,
A version rose, dispelling gloom.
From five to six, a leap so bright,
Our bot will dance in coding's light.
With hops and skips, it shall abide,
As new features swell with pride! 🐇✨


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@dependabot dependabot bot force-pushed the dependabot/nuget/GitVersion.MsBuild-6.0.0 branch from c16251b to 716a00e Compare July 31, 2024 23:35
@Anheledir
Copy link
Owner

@dependabot recreate

Bumps [GitVersion.MsBuild](https://github.com/GitTools/GitVersion) from 5.12.0 to 6.0.0.
- [Release notes](https://github.com/GitTools/GitVersion/releases)
- [Changelog](https://github.com/GitTools/GitVersion/blob/main/BREAKING_CHANGES.md)
- [Commits](GitTools/GitVersion@5.12.0...6.0.0)

---
updated-dependencies:
- dependency-name: GitVersion.MsBuild
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot force-pushed the dependabot/nuget/GitVersion.MsBuild-6.0.0 branch from 716a00e to b582afb Compare July 31, 2024 23:43
@Anheledir
Copy link
Owner

@coderabbitai review

Copy link

coderabbitai bot commented Jul 31, 2024

Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@Anheledir
Copy link
Owner

@dependabot squash and merge

@Anheledir Anheledir self-assigned this Jul 31, 2024
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 830d44b and b582afb.

Files selected for processing (1)
  • BaseBotService/BaseBotService.csproj (1 hunks)
Additional comments not posted (1)
BaseBotService/BaseBotService.csproj (1)

39-41: Verify and update configurations for breaking changes.

The GitVersion.MsBuild package has been updated from version 5.12.0 to 6.0.0, which includes several breaking changes. Ensure that all configurations and code references are updated accordingly.

Verification successful

Verify and update configurations for breaking changes.

The GitVersion.MsBuild package has been updated from version 5.12.0 to 6.0.0, which includes several breaking changes. Ensure that all configurations and code references are updated accordingly.

  • BaseBotService/BaseBotService.csproj: Contains references to GitVersion and GitVersion.MsBuild.
Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify and update configurations for breaking changes introduced by GitVersion.MsBuild 6.0.0.

# Test: Search for configurations related to GitVersion.MsBuild. Expect: Updated configurations as per the new version.
rg --type yaml --type json --type csproj 'GitVersion'

Length of output: 84


Script:

#!/bin/bash
# Description: Verify and update configurations for breaking changes introduced by GitVersion.MsBuild 6.0.0.

# Test: Search for configurations related to GitVersion.MsBuild in XML files and other relevant configuration files.
rg --type xml --type yaml --type json 'GitVersion'

Length of output: 199


Script:

#!/bin/bash
# Description: Diagnose why rg did not search any files by running with --debug flag.

# Test: Run rg with --debug to understand why files are being skipped.
rg --debug --type xml --type yaml --type json 'GitVersion'

Length of output: 46112


Script:

#!/bin/bash
# Description: Search for configurations related to GitVersion.MsBuild in all files, including XML, YAML, and JSON files, without applying any filters.

# Test: Run rg to search for 'GitVersion' in all files.
rg 'GitVersion' --type-add 'csproj:*.csproj' --type xml --type yaml --type json

Length of output: 228


Script:

#!/bin/bash
# Description: Search for configurations related to GitVersion.MsBuild in all files without applying any filters.

# Test: Run rg to search for 'GitVersion' in all files.
rg 'GitVersion'

Length of output: 199

@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ Anheledir
❌ dependabot[bot]
You have signed the CLA already but the status is still pending? Let us recheck it.

Copy link
Contributor Author

dependabot bot commented on behalf of github Jul 31, 2024

One of your CI runs failed on this pull request, so Dependabot won't merge it.

Dependabot will still automatically merge this pull request if you amend it and your tests pass.

Signed-off-by: Gordon Breuer <[email protected]>
Copy link

@Anheledir Anheledir closed this Aug 1, 2024
Copy link
Contributor Author

dependabot bot commented on behalf of github Aug 1, 2024

OK, I won't notify you again about this release, but will get in touch when a new version is available. If you'd rather skip all updates until the next major or minor version, let me know by commenting @dependabot ignore this major version or @dependabot ignore this minor version. You can also ignore all major, minor, or patch releases for a dependency by adding an ignore condition with the desired update_types to your config file.

If you change your mind, just re-open this PR and I'll resolve any conflicts on it.

@dependabot dependabot bot deleted the dependabot/nuget/GitVersion.MsBuild-6.0.0 branch August 1, 2024 00:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
infrastructure maintenance Some refactoring, code-cleanups or applying best practices.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants