Skip to content

Commit

Permalink
Merge pull request #4211 from GitTools/dependabot/nuget/src/YamlDotNe…
Browse files Browse the repository at this point in the history 
…t-16.1.2

(deps): Bump YamlDotNet from 16.1.0 to 16.1.2 in /src
  • Loading branch information
@arturcic
arturcic authored Sep 17, 2024
2 parents 1920438 + 6941b9f commit 2186f66
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 41 deletions.
24 changes: 12 additions & 12 deletions docs/input/docs/reference/configuration.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ assembly-versioning-scheme: MajorMinorPatch
assembly-file-versioning-scheme: MajorMinorPatch
tag-prefix: '[vV]?'
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
major-version-bump-message: '\+semver:\s?(breaking|major)'
minor-version-bump-message: '\+semver:\s?(feature|minor)'
patch-version-bump-message: '\+semver:\s?(fix|patch)'
no-bump-message: '\+semver:\s?(none|skip)'
major-version-bump-message: \+semver:\s?(breaking|major)
minor-version-bump-message: \+semver:\s?(feature|minor)
patch-version-bump-message: \+semver:\s?(fix|patch)
no-bump-message: \+semver:\s?(none|skip)
tag-pre-release-weight: 60000
commit-date-format: yyyy-MM-dd
merge-message-formats: {}
Expand Down Expand Up @@ -221,10 +221,10 @@ assembly-versioning-scheme: MajorMinorPatch
assembly-file-versioning-scheme: MajorMinorPatch
tag-prefix: '[vV]?'
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
major-version-bump-message: '\+semver:\s?(breaking|major)'
minor-version-bump-message: '\+semver:\s?(feature|minor)'
patch-version-bump-message: '\+semver:\s?(fix|patch)'
no-bump-message: '\+semver:\s?(none|skip)'
major-version-bump-message: \+semver:\s?(breaking|major)
minor-version-bump-message: \+semver:\s?(feature|minor)
patch-version-bump-message: \+semver:\s?(fix|patch)
no-bump-message: \+semver:\s?(none|skip)
tag-pre-release-weight: 60000
commit-date-format: yyyy-MM-dd
merge-message-formats: {}
Expand Down Expand Up @@ -346,10 +346,10 @@ assembly-versioning-scheme: MajorMinorPatch
assembly-file-versioning-scheme: MajorMinorPatch
tag-prefix: '[vV]?'
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
major-version-bump-message: '\+semver:\s?(breaking|major)'
minor-version-bump-message: '\+semver:\s?(feature|minor)'
patch-version-bump-message: '\+semver:\s?(fix|patch)'
no-bump-message: '\+semver:\s?(none|skip)'
major-version-bump-message: \+semver:\s?(breaking|major)
minor-version-bump-message: \+semver:\s?(feature|minor)
patch-version-bump-message: \+semver:\s?(fix|patch)
no-bump-message: \+semver:\s?(none|skip)
tag-pre-release-weight: 60000
commit-date-format: yyyy-MM-dd
merge-message-formats: {}
Expand Down
8 changes: 4 additions & 4 deletions docs/input/docs/workflows/GitFlow/v1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
assembly-file-versioning-scheme: MajorMinorPatch
tag-prefix: '[vV]?'
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
major-version-bump-message: '\+semver:\s?(breaking|major)'
minor-version-bump-message: '\+semver:\s?(feature|minor)'
patch-version-bump-message: '\+semver:\s?(fix|patch)'
no-bump-message: '\+semver:\s?(none|skip)'
major-version-bump-message: \+semver:\s?(breaking|major)
minor-version-bump-message: \+semver:\s?(feature|minor)
patch-version-bump-message: \+semver:\s?(fix|patch)
no-bump-message: \+semver:\s?(none|skip)
tag-pre-release-weight: 60000
commit-date-format: yyyy-MM-dd
merge-message-formats: {}
Expand Down
8 changes: 4 additions & 4 deletions docs/input/docs/workflows/GitHubFlow/v1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
assembly-file-versioning-scheme: MajorMinorPatch
tag-prefix: '[vV]?'
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
major-version-bump-message: '\+semver:\s?(breaking|major)'
minor-version-bump-message: '\+semver:\s?(feature|minor)'
patch-version-bump-message: '\+semver:\s?(fix|patch)'
no-bump-message: '\+semver:\s?(none|skip)'
major-version-bump-message: \+semver:\s?(breaking|major)
minor-version-bump-message: \+semver:\s?(feature|minor)
patch-version-bump-message: \+semver:\s?(fix|patch)
no-bump-message: \+semver:\s?(none|skip)
tag-pre-release-weight: 60000
commit-date-format: yyyy-MM-dd
merge-message-formats: {}
Expand Down
8 changes: 4 additions & 4 deletions docs/input/docs/workflows/TrunkBased/preview1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
assembly-file-versioning-scheme: MajorMinorPatch
tag-prefix: '[vV]?'
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
major-version-bump-message: '\+semver:\s?(breaking|major)'
minor-version-bump-message: '\+semver:\s?(feature|minor)'
patch-version-bump-message: '\+semver:\s?(fix|patch)'
no-bump-message: '\+semver:\s?(none|skip)'
major-version-bump-message: \+semver:\s?(breaking|major)
minor-version-bump-message: \+semver:\s?(feature|minor)
patch-version-bump-message: \+semver:\s?(fix|patch)
no-bump-message: \+semver:\s?(none|skip)
tag-pre-release-weight: 60000
commit-date-format: yyyy-MM-dd
merge-message-formats: {}
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Packages.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageVersion Include="Shouldly" Version="4.2.1" />
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
<PackageVersion Include="YamlDotNet" Version="16.1.0" />
<PackageVersion Include="YamlDotNet" Version="16.1.2" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions ...s/Configuration/ConfigurationProviderTests.CanWriteOutEffectiveConfiguration.approved.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ assembly-versioning-scheme: MajorMinorPatch
assembly-file-versioning-scheme: MajorMinorPatch
tag-prefix: '[vV]?'
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
major-version-bump-message: '\+semver:\s?(breaking|major)'
minor-version-bump-message: '\+semver:\s?(feature|minor)'
patch-version-bump-message: '\+semver:\s?(fix|patch)'
no-bump-message: '\+semver:\s?(none|skip)'
major-version-bump-message: \+semver:\s?(breaking|major)
minor-version-bump-message: \+semver:\s?(feature|minor)
patch-version-bump-message: \+semver:\s?(fix|patch)
no-bump-message: \+semver:\s?(none|skip)
tag-pre-release-weight: 60000
commit-date-format: yyyy-MM-dd
merge-message-formats: {}
Expand Down
8 changes: 4 additions & 4 deletions src/GitVersion.Configuration.Tests/Workflows/approved/GitFlow/v1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
assembly-file-versioning-scheme: MajorMinorPatch
tag-prefix: '[vV]?'
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
major-version-bump-message: '\+semver:\s?(breaking|major)'
minor-version-bump-message: '\+semver:\s?(feature|minor)'
patch-version-bump-message: '\+semver:\s?(fix|patch)'
no-bump-message: '\+semver:\s?(none|skip)'
major-version-bump-message: \+semver:\s?(breaking|major)
minor-version-bump-message: \+semver:\s?(feature|minor)
patch-version-bump-message: \+semver:\s?(fix|patch)
no-bump-message: \+semver:\s?(none|skip)
tag-pre-release-weight: 60000
commit-date-format: yyyy-MM-dd
merge-message-formats: {}
Expand Down
8 changes: 4 additions & 4 deletions src/GitVersion.Configuration.Tests/Workflows/approved/GitHubFlow/v1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
assembly-file-versioning-scheme: MajorMinorPatch
tag-prefix: '[vV]?'
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
major-version-bump-message: '\+semver:\s?(breaking|major)'
minor-version-bump-message: '\+semver:\s?(feature|minor)'
patch-version-bump-message: '\+semver:\s?(fix|patch)'
no-bump-message: '\+semver:\s?(none|skip)'
major-version-bump-message: \+semver:\s?(breaking|major)
minor-version-bump-message: \+semver:\s?(feature|minor)
patch-version-bump-message: \+semver:\s?(fix|patch)
no-bump-message: \+semver:\s?(none|skip)
tag-pre-release-weight: 60000
commit-date-format: yyyy-MM-dd
merge-message-formats: {}
Expand Down
8 changes: 4 additions & 4 deletions src/GitVersion.Configuration.Tests/Workflows/approved/TrunkBased/preview1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
assembly-file-versioning-scheme: MajorMinorPatch
tag-prefix: '[vV]?'
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
major-version-bump-message: '\+semver:\s?(breaking|major)'
minor-version-bump-message: '\+semver:\s?(feature|minor)'
patch-version-bump-message: '\+semver:\s?(fix|patch)'
no-bump-message: '\+semver:\s?(none|skip)'
major-version-bump-message: \+semver:\s?(breaking|major)
minor-version-bump-message: \+semver:\s?(feature|minor)
patch-version-bump-message: \+semver:\s?(fix|patch)
no-bump-message: \+semver:\s?(none|skip)
tag-pre-release-weight: 60000
commit-date-format: yyyy-MM-dd
merge-message-formats: {}
Expand Down
11 changes: 11 additions & 0 deletions src/GitVersion.Core/Configuration/ConfigurationConstants.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@ internal static class ConfigurationConstants
VersionStrategies.VersionInBranchName
];
public const string DefaultAssemblyInformationalFormat = "{InformationalVersion}";
//language=regexp
public const string DefaultTagPrefix = "[vV]?";
//language=regexp
public const string DefaultVersionInBranchPattern = @"(?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*";
public const string DefaultCommitDateFormat = "yyyy-MM-dd";
public const string BranchNamePlaceholder = "{BranchName}";
//language=regexp
public const string DefaultLabelNumberPattern = @"[/-](?<number>\d+)";
public const bool DefaultUpdateBuildNumber = true;
public const int DefaultTagPreReleaseWeight = 60000;
Expand All @@ -40,12 +43,20 @@ internal static class ConfigurationConstants
public const string SupportBranchKey = "support";
public const string UnknownBranchKey = "unknown";

//language=regexp
public const string MainBranchRegex = "^master$|^main$";
//language=regexp
public const string DevelopBranchRegex = "^dev(elop)?(ment)?$";
//language=regexp
public const string ReleaseBranchRegex = "^releases?[/-](?<BranchName>.+)";
//language=regexp
public const string FeatureBranchRegex = "^features?[/-](?<BranchName>.+)";
//language=regexp
public const string PullRequestBranchRegex = @"^(pull|pull\-requests|pr)[/-]";
//language=regexp
public const string HotfixBranchRegex = "^hotfix(es)?[/-](?<BranchName>.+)";
//language=regexp
public const string SupportBranchRegex = "^support[/-](?<BranchName>.+)";
//language=regexp
public const string UnknownBranchRegex = "(?<BranchName>.+)";
}

0 comments on commit 2186f66

Please sign in to comment.