Skip to content

Commit 83dbf0e

Browse files
arturcicarturcic
committed
order properties
1 parent 516f2e7 commit 83dbf0e

11 files changed

+164
-191
lines changed

‎src/GitVersion.Core.Tests/VersionCalculation/Approved/JsonVersionBuilderTests.Json.approved.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
2+
"AssemblySemFileVer": "1.2.0.0",
3+
"AssemblySemVer": "1.2.0.0",
4+
"BranchName": "feature1",
5+
"BuildMetaData": 5,
6+
"CommitDate": "2014-03-06",
7+
"CommitsSinceVersionSource": 5,
8+
"EscapedBranchName": "feature1",
9+
"FullBuildMetaData": "5.Branch.feature1.Sha.commitSha",
10+
"FullSemVer": "1.2.0-unstable.4+5",
11+
"InformationalVersion": "1.2.0-unstable.4+5.Branch.feature1.Sha.commitSha",
212
"Major": 1,
13+
"MajorMinorPatch": "1.2.0",
314
"Minor": 2,
415
"Patch": 0,
5-
"PreReleaseTag": "unstable.4",
6-
"PreReleaseTagWithDash": "-unstable.4",
716
"PreReleaseLabel": "unstable",
817
"PreReleaseLabelWithDash": "-unstable",
918
"PreReleaseNumber": 4,
10-
"WeightedPreReleaseNumber": 4,
11-
"BuildMetaData": 5,
12-
"FullBuildMetaData": "5.Branch.feature1.Sha.commitSha",
13-
"MajorMinorPatch": "1.2.0",
19+
"PreReleaseTag": "unstable.4",
20+
"PreReleaseTagWithDash": "-unstable.4",
1421
"SemVer": "1.2.0-unstable.4",
15-
"AssemblySemVer": "1.2.0.0",
16-
"AssemblySemFileVer": "1.2.0.0",
17-
"FullSemVer": "1.2.0-unstable.4+5",
18-
"InformationalVersion": "1.2.0-unstable.4+5.Branch.feature1.Sha.commitSha",
19-
"BranchName": "feature1",
20-
"EscapedBranchName": "feature1",
2122
"Sha": "commitSha",
2223
"ShortSha": "commitShortSha",
24+
"UncommittedChanges": 0,
2325
"VersionSourceSha": "versionSourceSha",
24-
"CommitsSinceVersionSource": 5,
25-
"CommitDate": "2014-03-06",
26-
"UncommittedChanges": 0
26+
"WeightedPreReleaseNumber": 4
2727
}

‎src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranch.approved.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
2+
"AssemblySemFileVer": "1.2.3.0",
3+
"AssemblySemVer": "1.2.3.0",
4+
"BranchName": "feature/123",
5+
"BuildMetaData": 5,
6+
"CommitDate": "2014-03-06",
7+
"CommitsSinceVersionSource": 5,
8+
"EscapedBranchName": "feature-123",
9+
"FullBuildMetaData": "5.Branch.feature-123.Sha.commitSha",
10+
"FullSemVer": "1.2.3+5",
11+
"InformationalVersion": "1.2.3+5.Branch.feature-123.Sha.commitSha",
212
"Major": 1,
13+
"MajorMinorPatch": "1.2.3",
314
"Minor": 2,
415
"Patch": 3,
5-
"PreReleaseTag": "",
6-
"PreReleaseTagWithDash": "",
716
"PreReleaseLabel": "",
817
"PreReleaseLabelWithDash": "",
918
"PreReleaseNumber": null,
10-
"WeightedPreReleaseNumber": 0,
11-
"BuildMetaData": 5,
12-
"FullBuildMetaData": "5.Branch.feature-123.Sha.commitSha",
13-
"MajorMinorPatch": "1.2.3",
19+
"PreReleaseTag": "",
20+
"PreReleaseTagWithDash": "",
1421
"SemVer": "1.2.3",
15-
"AssemblySemVer": "1.2.3.0",
16-
"AssemblySemFileVer": "1.2.3.0",
17-
"FullSemVer": "1.2.3+5",
18-
"InformationalVersion": "1.2.3+5.Branch.feature-123.Sha.commitSha",
19-
"BranchName": "feature/123",
20-
"EscapedBranchName": "feature-123",
2122
"Sha": "commitSha",
2223
"ShortSha": "commitShortSha",
24+
"UncommittedChanges": 0,
2325
"VersionSourceSha": "versionSourceSha",
24-
"CommitsSinceVersionSource": 5,
25-
"CommitDate": "2014-03-06",
26-
"UncommittedChanges": 0
26+
"WeightedPreReleaseNumber": 0
2727
}

‎src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomAssemblyInfoFormat.approved.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
2+
"AssemblySemFileVer": "1.2.3.0",
3+
"AssemblySemVer": "1.2.3.0",
4+
"BranchName": "feature/123",
5+
"BuildMetaData": 5,
6+
"CommitDate": "2014-03-06",
7+
"CommitsSinceVersionSource": 5,
8+
"EscapedBranchName": "feature-123",
9+
"FullBuildMetaData": "5.Branch.feature-123.Sha.commitSha",
10+
"FullSemVer": "1.2.3+5",
11+
"InformationalVersion": "1.2.3+5.Branch.feature-123.Sha.commitShortSha",
212
"Major": 1,
13+
"MajorMinorPatch": "1.2.3",
314
"Minor": 2,
415
"Patch": 3,
5-
"PreReleaseTag": "",
6-
"PreReleaseTagWithDash": "",
716
"PreReleaseLabel": "",
817
"PreReleaseLabelWithDash": "",
918
"PreReleaseNumber": null,
10-
"WeightedPreReleaseNumber": 0,
11-
"BuildMetaData": 5,
12-
"FullBuildMetaData": "5.Branch.feature-123.Sha.commitSha",
13-
"MajorMinorPatch": "1.2.3",
19+
"PreReleaseTag": "",
20+
"PreReleaseTagWithDash": "",
1421
"SemVer": "1.2.3",
15-
"AssemblySemVer": "1.2.3.0",
16-
"AssemblySemFileVer": "1.2.3.0",
17-
"FullSemVer": "1.2.3+5",
18-
"InformationalVersion": "1.2.3+5.Branch.feature-123.Sha.commitShortSha",
19-
"BranchName": "feature/123",
20-
"EscapedBranchName": "feature-123",
2122
"Sha": "commitSha",
2223
"ShortSha": "commitShortSha",
24+
"UncommittedChanges": 0,
2325
"VersionSourceSha": "versionSourceSha",
24-
"CommitsSinceVersionSource": 5,
25-
"CommitDate": "2014-03-06",
26-
"UncommittedChanges": 0
26+
"WeightedPreReleaseNumber": 0
2727
}

‎src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
2+
"AssemblySemFileVer": "1.2.3.0",
3+
"AssemblySemVer": "1.2.3.0",
4+
"BranchName": "develop",
5+
"BuildMetaData": 5,
6+
"CommitDate": "2014-03-06",
7+
"CommitsSinceVersionSource": 5,
8+
"EscapedBranchName": "develop",
9+
"FullBuildMetaData": "5.Branch.develop.Sha.commitSha",
10+
"FullSemVer": "1.2.3-unstable.4+5",
11+
"InformationalVersion": "1.2.3-unstable.4+5.Branch.develop.Sha.commitSha",
212
"Major": 1,
13+
"MajorMinorPatch": "1.2.3",
314
"Minor": 2,
415
"Patch": 3,
5-
"PreReleaseTag": "unstable.4",
6-
"PreReleaseTagWithDash": "-unstable.4",
716
"PreReleaseLabel": "unstable",
817
"PreReleaseLabelWithDash": "-unstable",
918
"PreReleaseNumber": 4,
10-
"WeightedPreReleaseNumber": 4,
11-
"BuildMetaData": 5,
12-
"FullBuildMetaData": "5.Branch.develop.Sha.commitSha",
13-
"MajorMinorPatch": "1.2.3",
19+
"PreReleaseTag": "unstable.4",
20+
"PreReleaseTagWithDash": "-unstable.4",
1421
"SemVer": "1.2.3-unstable.4",
15-
"AssemblySemVer": "1.2.3.0",
16-
"AssemblySemFileVer": "1.2.3.0",
17-
"FullSemVer": "1.2.3-unstable.4+5",
18-
"InformationalVersion": "1.2.3-unstable.4+5.Branch.develop.Sha.commitSha",
19-
"BranchName": "develop",
20-
"EscapedBranchName": "develop",
2122
"Sha": "commitSha",
2223
"ShortSha": "commitShortSha",
24+
"UncommittedChanges": 0,
2325
"VersionSourceSha": "versionSourceSha",
24-
"CommitsSinceVersionSource": 5,
25-
"CommitDate": "2014-03-06",
26-
"UncommittedChanges": 0
26+
"WeightedPreReleaseNumber": 4
2727
}

‎src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
2+
"AssemblySemFileVer": "1.2.3.0",
3+
"AssemblySemVer": "1.2.3.0",
4+
"BranchName": "develop",
5+
"BuildMetaData": 5,
6+
"CommitDate": "2014-03-06",
7+
"CommitsSinceVersionSource": 5,
8+
"EscapedBranchName": "develop",
9+
"FullBuildMetaData": "5.Branch.develop.Sha.commitSha",
10+
"FullSemVer": "1.2.3+5",
11+
"InformationalVersion": "1.2.3+5.Branch.develop.Sha.commitSha",
212
"Major": 1,
13+
"MajorMinorPatch": "1.2.3",
314
"Minor": 2,
415
"Patch": 3,
5-
"PreReleaseTag": "",
6-
"PreReleaseTagWithDash": "",
716
"PreReleaseLabel": "",
817
"PreReleaseLabelWithDash": "",
918
"PreReleaseNumber": null,
10-
"WeightedPreReleaseNumber": 0,
11-
"BuildMetaData": 5,
12-
"FullBuildMetaData": "5.Branch.develop.Sha.commitSha",
13-
"MajorMinorPatch": "1.2.3",
19+
"PreReleaseTag": "",
20+
"PreReleaseTagWithDash": "",
1421
"SemVer": "1.2.3",
15-
"AssemblySemVer": "1.2.3.0",
16-
"AssemblySemFileVer": "1.2.3.0",
17-
"FullSemVer": "1.2.3+5",
18-
"InformationalVersion": "1.2.3+5.Branch.develop.Sha.commitSha",
19-
"BranchName": "develop",
20-
"EscapedBranchName": "develop",
2122
"Sha": "commitSha",
2223
"ShortSha": "commitShortSha",
24+
"UncommittedChanges": 0,
2325
"VersionSourceSha": "versionSourceSha",
24-
"CommitsSinceVersionSource": 5,
25-
"CommitDate": "2014-03-06",
26-
"UncommittedChanges": 0
26+
"WeightedPreReleaseNumber": 0
2727
}

‎src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
2+
"AssemblySemFileVer": "1.2.3.0",
3+
"AssemblySemVer": "1.2.3.0",
4+
"BranchName": "develop",
5+
"BuildMetaData": null,
6+
"CommitDate": "2014-03-06",
7+
"CommitsSinceVersionSource": 5,
8+
"EscapedBranchName": "develop",
9+
"FullBuildMetaData": "Branch.develop.Sha.commitSha",
10+
"FullSemVer": "1.2.3-unstable.8",
11+
"InformationalVersion": "1.2.3-unstable.8+Branch.develop.Sha.commitSha",
212
"Major": 1,
13+
"MajorMinorPatch": "1.2.3",
314
"Minor": 2,
415
"Patch": 3,
5-
"PreReleaseTag": "unstable.8",
6-
"PreReleaseTagWithDash": "-unstable.8",
716
"PreReleaseLabel": "unstable",
817
"PreReleaseLabelWithDash": "-unstable",
918
"PreReleaseNumber": 8,
10-
"WeightedPreReleaseNumber": 8,
11-
"BuildMetaData": null,
12-
"FullBuildMetaData": "Branch.develop.Sha.commitSha",
13-
"MajorMinorPatch": "1.2.3",
19+
"PreReleaseTag": "unstable.8",
20+
"PreReleaseTagWithDash": "-unstable.8",
1421
"SemVer": "1.2.3-unstable.8",
15-
"AssemblySemVer": "1.2.3.0",
16-
"AssemblySemFileVer": "1.2.3.0",
17-
"FullSemVer": "1.2.3-unstable.8",
18-
"InformationalVersion": "1.2.3-unstable.8+Branch.develop.Sha.commitSha",
19-
"BranchName": "develop",
20-
"EscapedBranchName": "develop",
2122
"Sha": "commitSha",
2223
"ShortSha": "commitShortSha",
24+
"UncommittedChanges": 0,
2325
"VersionSourceSha": "versionSourceSha",
24-
"CommitsSinceVersionSource": 5,
25-
"CommitDate": "2014-03-06",
26-
"UncommittedChanges": 0
26+
"WeightedPreReleaseNumber": 8
2727
}

‎src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
2+
"AssemblySemFileVer": "1.2.3.0",
3+
"AssemblySemVer": "1.2.3.0",
4+
"BranchName": "develop",
5+
"BuildMetaData": null,
6+
"CommitDate": "2014-03-06",
7+
"CommitsSinceVersionSource": 5,
8+
"EscapedBranchName": "develop",
9+
"FullBuildMetaData": "Branch.develop.Sha.commitSha",
10+
"FullSemVer": "1.2.3-ci.5",
11+
"InformationalVersion": "1.2.3-ci.5+Branch.develop.Sha.commitSha",
212
"Major": 1,
13+
"MajorMinorPatch": "1.2.3",
314
"Minor": 2,
415
"Patch": 3,
5-
"PreReleaseTag": "ci.5",
6-
"PreReleaseTagWithDash": "-ci.5",
716
"PreReleaseLabel": "ci",
817
"PreReleaseLabelWithDash": "-ci",
918
"PreReleaseNumber": 5,
10-
"WeightedPreReleaseNumber": 5,
11-
"BuildMetaData": null,
12-
"FullBuildMetaData": "Branch.develop.Sha.commitSha",
13-
"MajorMinorPatch": "1.2.3",
19+
"PreReleaseTag": "ci.5",
20+
"PreReleaseTagWithDash": "-ci.5",
1421
"SemVer": "1.2.3-ci.5",
15-
"AssemblySemVer": "1.2.3.0",
16-
"AssemblySemFileVer": "1.2.3.0",
17-
"FullSemVer": "1.2.3-ci.5",
18-
"InformationalVersion": "1.2.3-ci.5+Branch.develop.Sha.commitSha",
19-
"BranchName": "develop",
20-
"EscapedBranchName": "develop",
2122
"Sha": "commitSha",
2223
"ShortSha": "commitShortSha",
24+
"UncommittedChanges": 0,
2325
"VersionSourceSha": "versionSourceSha",
24-
"CommitsSinceVersionSource": 5,
25-
"CommitDate": "2014-03-06",
26-
"UncommittedChanges": 0
26+
"WeightedPreReleaseNumber": 5
2727
}

‎src/GitVersion.Core.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
2+
"AssemblySemFileVer": "1.2.3.0",
3+
"AssemblySemVer": "1.2.3.0",
4+
"BranchName": "",
5+
"BuildMetaData": 5,
6+
"CommitDate": "2014-03-06",
7+
"CommitsSinceVersionSource": 5,
8+
"EscapedBranchName": "",
9+
"FullBuildMetaData": "5.Sha.commitSha",
10+
"FullSemVer": "1.2.3+5",
11+
"InformationalVersion": "1.2.3+5.Sha.commitSha",
212
"Major": 1,
13+
"MajorMinorPatch": "1.2.3",
314
"Minor": 2,
415
"Patch": 3,
5-
"PreReleaseTag": "",
6-
"PreReleaseTagWithDash": "",
716
"PreReleaseLabel": "",
817
"PreReleaseLabelWithDash": "",
918
"PreReleaseNumber": null,
10-
"WeightedPreReleaseNumber": 0,
11-
"BuildMetaData": 5,
12-
"FullBuildMetaData": "5.Sha.commitSha",
13-
"MajorMinorPatch": "1.2.3",
19+
"PreReleaseTag": "",
20+
"PreReleaseTagWithDash": "",
1421
"SemVer": "1.2.3",
15-
"AssemblySemVer": "1.2.3.0",
16-
"AssemblySemFileVer": "1.2.3.0",
17-
"FullSemVer": "1.2.3+5",
18-
"InformationalVersion": "1.2.3+5.Sha.commitSha",
19-
"BranchName": "",
20-
"EscapedBranchName": "",
2122
"Sha": "commitSha",
2223
"ShortSha": "commitShortSha",
24+
"UncommittedChanges": 0,
2325
"VersionSourceSha": "versionSourceSha",
24-
"CommitsSinceVersionSource": 5,
25-
"CommitDate": "2014-03-06",
26-
"UncommittedChanges": 0
26+
"WeightedPreReleaseNumber": 0
2727
}

‎src/GitVersion.Core/OutputVariables/VersionVariablesHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static string ToJsonString(this GitVersionVariables gitVersionVariables)
3838
var variablesType = typeof(VersionVariablesJsonModel);
3939
var variables = new VersionVariablesJsonModel();
4040

41-
foreach (var (key, value) in gitVersionVariables.GetProperties())
41+
foreach (var (key, value) in gitVersionVariables.OrderBy(x => x.Key))
4242
{
4343
var propertyInfo = variablesType.GetProperty(key);
4444
propertyInfo?.SetValue(variables, ChangeType(value, propertyInfo.PropertyType));

0 commit comments

Comments
 (0)