Skip to content

Commit e2cf954

Browse files
arturcicHHobeck
authored andcommitted
update GitVersion.configuration.json using GitVersion.Schema
1 parent 9ddc1f3 commit e2cf954

File tree

2 files changed

+59
-11
lines changed

2 files changed

+59
-11
lines changed

schemas/6.0/GitVersion.configuration.json

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@
129129
"prevent-increment-of-merged-branch-version": {
130130
"$ref": "#/$defs/nullableOfBoolean2"
131131
},
132+
"prevent-increment-when-current-commit-tagged": {
133+
"$ref": "#/$defs/nullableOfBoolean3"
134+
},
132135
"regex": {
133136
"$ref": "#/$defs/string2"
134137
},
@@ -157,13 +160,13 @@
157160
]
158161
},
159162
"track-merge-message": {
160-
"$ref": "#/$defs/nullableOfBoolean3"
163+
"$ref": "#/$defs/nullableOfBoolean4"
161164
},
162165
"track-merge-target": {
163-
"$ref": "#/$defs/nullableOfBoolean4"
166+
"$ref": "#/$defs/nullableOfBoolean5"
164167
},
165168
"tracks-release-branches": {
166-
"$ref": "#/$defs/nullableOfBoolean5"
169+
"$ref": "#/$defs/nullableOfBoolean6"
167170
},
168171
"update-build-number": {
169172
"description": "Whether to update the build number in the project file. Defaults to true.",
@@ -176,6 +179,22 @@
176179
"default": "(?<version>[vV]?\\d+(\\.\\d+)?(\\.\\d+)?).*",
177180
"type": "string"
178181
},
182+
"strategies": {
183+
"description": "Specifies which version strategies (one or more) will be used to determine the next version. Following values are available: 'ConfiguredNextVersion', 'MergeMessage', 'TaggedCommit', 'TrackReleaseBranches', 'VersionInBranchName' and 'TrunkBased'.",
184+
"type": "array",
185+
"items": {
186+
"description": "Specifies which version strategies (one or more) will be used to determine the next version. Following values are available: 'ConfiguredNextVersion', 'MergeMessage', 'TaggedCommit', 'TrackReleaseBranches', 'VersionInBranchName' and 'TrunkBased'.",
187+
"enum": [
188+
"None",
189+
"ConfiguredNextVersion",
190+
"MergeMessage",
191+
"TaggedCommit",
192+
"TrackReleaseBranches",
193+
"VersionInBranchName",
194+
"TrunkBased"
195+
]
196+
}
197+
},
179198
"workflow": {
180199
"description": "The base template of the configuration to use. Possible values are: 'GitFlow/v1' or 'GitHubFlow/v1'",
181200
"type": "string"
@@ -215,20 +234,23 @@
215234
"prevent-increment-of-merged-branch-version": {
216235
"$ref": "#/$defs/nullableOfBoolean2"
217236
},
237+
"prevent-increment-when-current-commit-tagged": {
238+
"$ref": "#/$defs/nullableOfBoolean3"
239+
},
218240
"regex": {
219241
"$ref": "#/$defs/string2"
220242
},
221243
"source-branches": {
222244
"$ref": "#/$defs/hashSetOfString1"
223245
},
224246
"track-merge-message": {
225-
"$ref": "#/$defs/nullableOfBoolean3"
247+
"$ref": "#/$defs/nullableOfBoolean4"
226248
},
227249
"track-merge-target": {
228-
"$ref": "#/$defs/nullableOfBoolean4"
250+
"$ref": "#/$defs/nullableOfBoolean5"
229251
},
230252
"tracks-release-branches": {
231-
"$ref": "#/$defs/nullableOfBoolean5"
253+
"$ref": "#/$defs/nullableOfBoolean6"
232254
}
233255
}
234256
},
@@ -245,8 +267,7 @@
245267
"enum": [
246268
"ManualDeployment",
247269
"ContinuousDelivery",
248-
"ContinuousDeployment",
249-
"TrunkBased"
270+
"ContinuousDeployment"
250271
]
251272
},
252273
"incrementStrategy": {
@@ -305,6 +326,13 @@
305326
"null"
306327
]
307328
},
329+
"nullableOfBoolean3": {
330+
"description": "This branch related property controls the behvior whether to use the tagged (value set to true) or the incremented (value set to false) semantic version. Defaults to true.",
331+
"type": [
332+
"boolean",
333+
"null"
334+
]
335+
},
308336
"string2": {
309337
"format": "regex",
310338
"description": "The regular expression pattern to use to match this branch.",
@@ -318,21 +346,21 @@
318346
"type": "string"
319347
}
320348
},
321-
"nullableOfBoolean3": {
349+
"nullableOfBoolean4": {
322350
"description": "This property is a branch related property and gives the user the possibility to control the behavior of whether the merge commit message will be interpreted as a next version or not.",
323351
"type": [
324352
"boolean",
325353
"null"
326354
]
327355
},
328-
"nullableOfBoolean4": {
356+
"nullableOfBoolean5": {
329357
"description": "Strategy which will look for tagged merge commits directly off the current branch.",
330358
"type": [
331359
"boolean",
332360
"null"
333361
]
334362
},
335-
"nullableOfBoolean5": {
363+
"nullableOfBoolean6": {
336364
"description": "Indicates this branch configuration represents develop in GitFlow.",
337365
"type": [
338366
"boolean",

src/.run/GitVersion.Schema.run.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="GitVersion.Schema" type="DotNetProject" factoryName=".NET Project">
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Schema/bin/Debug/net8.0/schema.exe" />
4+
<option name="PROGRAM_PARAMETERS" value="--OutputDirectory schemas --Version 6.0" />
5+
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
6+
<option name="PASS_PARENT_ENVS" value="1" />
7+
<option name="USE_EXTERNAL_CONSOLE" value="0" />
8+
<option name="USE_MONO" value="0" />
9+
<option name="RUNTIME_ARGUMENTS" value="" />
10+
<option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.Schema/GitVersion.Schema.csproj" />
11+
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
12+
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
13+
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
14+
<option name="PROJECT_KIND" value="DotNetCore" />
15+
<option name="PROJECT_TFM" value="net8.0" />
16+
<method v="2">
17+
<option name="Build" />
18+
</method>
19+
</configuration>
20+
</component>

0 commit comments

Comments
 (0)