Skip to content

Commit 2186f66

Browse files
arturcicarturcic
authored
Merge pull request #4211 from GitTools/dependabot/nuget/src/YamlDotNet-16.1.2
(deps): Bump YamlDotNet from 16.1.0 to 16.1.2 in /src
2 parents 1920438 + 6941b9f commit 2186f66

File tree

10 files changed

+52
-41
lines changed

10 files changed

+52
-41
lines changed

‎docs/input/docs/reference/configuration.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ assembly-versioning-scheme: MajorMinorPatch
4545
assembly-file-versioning-scheme: MajorMinorPatch
4646
tag-prefix: '[vV]?'
4747
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
48-
major-version-bump-message: '\+semver:\s?(breaking|major)'
49-
minor-version-bump-message: '\+semver:\s?(feature|minor)'
50-
patch-version-bump-message: '\+semver:\s?(fix|patch)'
51-
no-bump-message: '\+semver:\s?(none|skip)'
48+
major-version-bump-message: \+semver:\s?(breaking|major)
49+
minor-version-bump-message: \+semver:\s?(feature|minor)
50+
patch-version-bump-message: \+semver:\s?(fix|patch)
51+
no-bump-message: \+semver:\s?(none|skip)
5252
tag-pre-release-weight: 60000
5353
commit-date-format: yyyy-MM-dd
5454
merge-message-formats: {}
@@ -221,10 +221,10 @@ assembly-versioning-scheme: MajorMinorPatch
221221
assembly-file-versioning-scheme: MajorMinorPatch
222222
tag-prefix: '[vV]?'
223223
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
224-
major-version-bump-message: '\+semver:\s?(breaking|major)'
225-
minor-version-bump-message: '\+semver:\s?(feature|minor)'
226-
patch-version-bump-message: '\+semver:\s?(fix|patch)'
227-
no-bump-message: '\+semver:\s?(none|skip)'
224+
major-version-bump-message: \+semver:\s?(breaking|major)
225+
minor-version-bump-message: \+semver:\s?(feature|minor)
226+
patch-version-bump-message: \+semver:\s?(fix|patch)
227+
no-bump-message: \+semver:\s?(none|skip)
228228
tag-pre-release-weight: 60000
229229
commit-date-format: yyyy-MM-dd
230230
merge-message-formats: {}
@@ -346,10 +346,10 @@ assembly-versioning-scheme: MajorMinorPatch
346346
assembly-file-versioning-scheme: MajorMinorPatch
347347
tag-prefix: '[vV]?'
348348
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
349-
major-version-bump-message: '\+semver:\s?(breaking|major)'
350-
minor-version-bump-message: '\+semver:\s?(feature|minor)'
351-
patch-version-bump-message: '\+semver:\s?(fix|patch)'
352-
no-bump-message: '\+semver:\s?(none|skip)'
349+
major-version-bump-message: \+semver:\s?(breaking|major)
350+
minor-version-bump-message: \+semver:\s?(feature|minor)
351+
patch-version-bump-message: \+semver:\s?(fix|patch)
352+
no-bump-message: \+semver:\s?(none|skip)
353353
tag-pre-release-weight: 60000
354354
commit-date-format: yyyy-MM-dd
355355
merge-message-formats: {}

‎docs/input/docs/workflows/GitFlow/v1.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
assembly-file-versioning-scheme: MajorMinorPatch
33
tag-prefix: '[vV]?'
44
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
5-
major-version-bump-message: '\+semver:\s?(breaking|major)'
6-
minor-version-bump-message: '\+semver:\s?(feature|minor)'
7-
patch-version-bump-message: '\+semver:\s?(fix|patch)'
8-
no-bump-message: '\+semver:\s?(none|skip)'
5+
major-version-bump-message: \+semver:\s?(breaking|major)
6+
minor-version-bump-message: \+semver:\s?(feature|minor)
7+
patch-version-bump-message: \+semver:\s?(fix|patch)
8+
no-bump-message: \+semver:\s?(none|skip)
99
tag-pre-release-weight: 60000
1010
commit-date-format: yyyy-MM-dd
1111
merge-message-formats: {}

‎docs/input/docs/workflows/GitHubFlow/v1.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
assembly-file-versioning-scheme: MajorMinorPatch
33
tag-prefix: '[vV]?'
44
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
5-
major-version-bump-message: '\+semver:\s?(breaking|major)'
6-
minor-version-bump-message: '\+semver:\s?(feature|minor)'
7-
patch-version-bump-message: '\+semver:\s?(fix|patch)'
8-
no-bump-message: '\+semver:\s?(none|skip)'
5+
major-version-bump-message: \+semver:\s?(breaking|major)
6+
minor-version-bump-message: \+semver:\s?(feature|minor)
7+
patch-version-bump-message: \+semver:\s?(fix|patch)
8+
no-bump-message: \+semver:\s?(none|skip)
99
tag-pre-release-weight: 60000
1010
commit-date-format: yyyy-MM-dd
1111
merge-message-formats: {}

‎docs/input/docs/workflows/TrunkBased/preview1.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
assembly-file-versioning-scheme: MajorMinorPatch
33
tag-prefix: '[vV]?'
44
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
5-
major-version-bump-message: '\+semver:\s?(breaking|major)'
6-
minor-version-bump-message: '\+semver:\s?(feature|minor)'
7-
patch-version-bump-message: '\+semver:\s?(fix|patch)'
8-
no-bump-message: '\+semver:\s?(none|skip)'
5+
major-version-bump-message: \+semver:\s?(breaking|major)
6+
minor-version-bump-message: \+semver:\s?(feature|minor)
7+
patch-version-bump-message: \+semver:\s?(fix|patch)
8+
no-bump-message: \+semver:\s?(none|skip)
99
tag-pre-release-weight: 60000
1010
commit-date-format: yyyy-MM-dd
1111
merge-message-formats: {}

‎src/Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
3737
<PackageVersion Include="Shouldly" Version="4.2.1" />
3838
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
39-
<PackageVersion Include="YamlDotNet" Version="16.1.0" />
39+
<PackageVersion Include="YamlDotNet" Version="16.1.2" />
4040
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
4141
</ItemGroup>
4242
</Project>

‎src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.CanWriteOutEffectiveConfiguration.approved.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ assembly-versioning-scheme: MajorMinorPatch
22
assembly-file-versioning-scheme: MajorMinorPatch
33
tag-prefix: '[vV]?'
44
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
5-
major-version-bump-message: '\+semver:\s?(breaking|major)'
6-
minor-version-bump-message: '\+semver:\s?(feature|minor)'
7-
patch-version-bump-message: '\+semver:\s?(fix|patch)'
8-
no-bump-message: '\+semver:\s?(none|skip)'
5+
major-version-bump-message: \+semver:\s?(breaking|major)
6+
minor-version-bump-message: \+semver:\s?(feature|minor)
7+
patch-version-bump-message: \+semver:\s?(fix|patch)
8+
no-bump-message: \+semver:\s?(none|skip)
99
tag-pre-release-weight: 60000
1010
commit-date-format: yyyy-MM-dd
1111
merge-message-formats: {}

‎src/GitVersion.Configuration.Tests/Workflows/approved/GitFlow/v1.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
assembly-file-versioning-scheme: MajorMinorPatch
33
tag-prefix: '[vV]?'
44
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
5-
major-version-bump-message: '\+semver:\s?(breaking|major)'
6-
minor-version-bump-message: '\+semver:\s?(feature|minor)'
7-
patch-version-bump-message: '\+semver:\s?(fix|patch)'
8-
no-bump-message: '\+semver:\s?(none|skip)'
5+
major-version-bump-message: \+semver:\s?(breaking|major)
6+
minor-version-bump-message: \+semver:\s?(feature|minor)
7+
patch-version-bump-message: \+semver:\s?(fix|patch)
8+
no-bump-message: \+semver:\s?(none|skip)
99
tag-pre-release-weight: 60000
1010
commit-date-format: yyyy-MM-dd
1111
merge-message-formats: {}

‎src/GitVersion.Configuration.Tests/Workflows/approved/GitHubFlow/v1.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
assembly-file-versioning-scheme: MajorMinorPatch
33
tag-prefix: '[vV]?'
44
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
5-
major-version-bump-message: '\+semver:\s?(breaking|major)'
6-
minor-version-bump-message: '\+semver:\s?(feature|minor)'
7-
patch-version-bump-message: '\+semver:\s?(fix|patch)'
8-
no-bump-message: '\+semver:\s?(none|skip)'
5+
major-version-bump-message: \+semver:\s?(breaking|major)
6+
minor-version-bump-message: \+semver:\s?(feature|minor)
7+
patch-version-bump-message: \+semver:\s?(fix|patch)
8+
no-bump-message: \+semver:\s?(none|skip)
99
tag-pre-release-weight: 60000
1010
commit-date-format: yyyy-MM-dd
1111
merge-message-formats: {}

‎src/GitVersion.Configuration.Tests/Workflows/approved/TrunkBased/preview1.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
assembly-file-versioning-scheme: MajorMinorPatch
33
tag-prefix: '[vV]?'
44
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
5-
major-version-bump-message: '\+semver:\s?(breaking|major)'
6-
minor-version-bump-message: '\+semver:\s?(feature|minor)'
7-
patch-version-bump-message: '\+semver:\s?(fix|patch)'
8-
no-bump-message: '\+semver:\s?(none|skip)'
5+
major-version-bump-message: \+semver:\s?(breaking|major)
6+
minor-version-bump-message: \+semver:\s?(feature|minor)
7+
patch-version-bump-message: \+semver:\s?(fix|patch)
8+
no-bump-message: \+semver:\s?(none|skip)
99
tag-pre-release-weight: 60000
1010
commit-date-format: yyyy-MM-dd
1111
merge-message-formats: {}

‎src/GitVersion.Core/Configuration/ConfigurationConstants.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@ internal static class ConfigurationConstants
2222
VersionStrategies.VersionInBranchName
2323
];
2424
public const string DefaultAssemblyInformationalFormat = "{InformationalVersion}";
25+
//language=regexp
2526
public const string DefaultTagPrefix = "[vV]?";
27+
//language=regexp
2628
public const string DefaultVersionInBranchPattern = @"(?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*";
2729
public const string DefaultCommitDateFormat = "yyyy-MM-dd";
2830
public const string BranchNamePlaceholder = "{BranchName}";
31+
//language=regexp
2932
public const string DefaultLabelNumberPattern = @"[/-](?<number>\d+)";
3033
public const bool DefaultUpdateBuildNumber = true;
3134
public const int DefaultTagPreReleaseWeight = 60000;
@@ -40,12 +43,20 @@ internal static class ConfigurationConstants
4043
public const string SupportBranchKey = "support";
4144
public const string UnknownBranchKey = "unknown";
4245

46+
//language=regexp
4347
public const string MainBranchRegex = "^master$|^main$";
48+
//language=regexp
4449
public const string DevelopBranchRegex = "^dev(elop)?(ment)?$";
50+
//language=regexp
4551
public const string ReleaseBranchRegex = "^releases?[/-](?<BranchName>.+)";
52+
//language=regexp
4653
public const string FeatureBranchRegex = "^features?[/-](?<BranchName>.+)";
54+
//language=regexp
4755
public const string PullRequestBranchRegex = @"^(pull|pull\-requests|pr)[/-]";
56+
//language=regexp
4857
public const string HotfixBranchRegex = "^hotfix(es)?[/-](?<BranchName>.+)";
58+
//language=regexp
4959
public const string SupportBranchRegex = "^support[/-](?<BranchName>.+)";
60+
//language=regexp
5061
public const string UnknownBranchRegex = "(?<BranchName>.+)";
5162
}

0 commit comments

Comments
 (0)