Merge branch 'main' into patch-1

Author: fowl2

.editorconfig

@@ -61,11 +61,11 @@ dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
 dotnet_style_prefer_simplified_interpolation = true:suggestion
 
 # Dispose rules (CA2000 and CA2213) ported to IDE analyzers. We already execute the CA rules on the repo, so disable the IDE ones.
+dotnet_diagnostic.IDE0005.severity = none
 dotnet_diagnostic.IDE0067.severity = none
 dotnet_diagnostic.IDE0068.severity = none
 dotnet_diagnostic.IDE0069.severity = none
 dotnet_diagnostic.CA1016.severity = none
-
 #### C# Coding Conventions ####
 
 # Prefer "var" everywhere
@@ -188,3 +188,5 @@ dotnet_diagnostic.CA1816.severity = warning
 
 # IDE0005: Using directive is unnecessary.
 dotnet_diagnostic.IDE0005.severity = warning
+
+[resharper_]xml_space_before_self_closing = true

.github/dependabot.yml

@@ -43,6 +43,10 @@ updates:
     - "dependencies"
   commit-message:
     prefix: "(docs deps)"
+  groups:
+    remark:
+      patterns:
+      - "remark*"
   directory: "/"
   schedule:
     interval: monthly

BREAKING_CHANGES.md

@@ -28,6 +28,10 @@
 *   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?[/-](?<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
 
 ## v5.0.0
 

build/Directory.Packages.props

@@ -13,6 +13,6 @@
     <PackageVersion Include="Cake.Docker" Version="1.2.2" />
     <PackageVersion Include="Cake.Git" Version="3.0.0" />
     <PackageVersion Include="Cake.Json" Version="7.0.1" />
-    <PackageVersion Include="xunit.assert" Version="2.5.0" />
+    <PackageVersion Include="xunit.assert" Version="2.5.1" />
   </ItemGroup>
 </Project>

docs/input/docs/reference/configuration.md

@@ -484,7 +484,9 @@ values, but here they are if you need to:
 ### regex
 
 This is the regex which is used to match the current branch to the correct
-branch configuration.
+branch configuration. 
+
+[Named groups](https://learn.microsoft.com/en-us/dotnet/standard/base-types/grouping-constructs-in-regular-expressions#named-matched-subexpressions) can be used to dynamically label pre-releases based on the branch name, or parts of it. See [Label](#label) for more details and examples.
 
 ### source-branches
 
@@ -572,11 +574,13 @@ Same as for the [global configuration, explained above](#mode).
 
 ### label
 
-The pre release label to use for this branch. Use the value `useBranchName` to use
-the branch name instead. For example `feature/foo` would become a pre-release
-label of `foo` with this value. Use the value `{BranchName}` as a placeholder to
-insert the branch name. For example `feature/foo` would become a pre-release label
-of `alpha.foo` with the value of `alpha.{BranchName}`.
+The pre-release label to use for this branch. Use the value `{BranchName}` as a placeholder to
+insert the value of the named group `BranchName` from the [regular expression](#regex). 
+
+For example: branch `feature/foo` would become a pre-release label
+of `alpha.foo` with `label: 'alpha.{BranchName}'` and `regex: '^features?[/-](?<BranchName>.+)'`.
+
+Another example: branch `features/sc-12345/some-description` would become a pre-release label of `sc-12345` with `label: '{StoryNo}'` and `regex: '^features?[/-](?<StoryNo>sc-\d+)[-/].+'`.
 
 **Note:** To clear a default use an empty string: `label: ''`
 

new-cli/Directory.Packages.props

@@ -9,7 +9,7 @@
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageVersion Include="Polly" Version="7.2.4" />
+    <PackageVersion Include="Polly" Version="8.0.0" />
     <PackageVersion Include="Scriban" Version="5.9.0" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="7.0.0" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="4.1.0" />