Skip to content

Commit 4249f04

Browse files
JakeGinnivanJakeGinnivan
committed
Merge pull request #623 from onovotny/padding-config
Make padding configurable and add padded BuildMetaData
2 parents 07e0be4 + 7174c29 commit 4249f04

File tree

35 files changed

+201
-41
lines changed

35 files changed

+201
-41
lines changed

‎docs/more-info/variables.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ For the `release/3.0.0` branch of GitVersion it shows:
1010
"PreReleaseTag":"beta.1",
1111
"PreReleaseTagWithDash":"-beta.1",
1212
"BuildMetaData":1,
13+
"BuildMetaDataPadded": "0001",
1314
"FullBuildMetaData":"1.Branch.release/3.0.0.Sha.28c853159a46b5a87e6cc9c4f6e940c59d6bc68a",
1415
"MajorMinorPatch":"3.0.0",
1516
"SemVer":"3.0.0-beta.1",

‎src/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using GitVersion;
4+
using GitVersionCore.Tests;
45
using NUnit.Framework;
56
using Shouldly;
67

@@ -22,7 +23,10 @@ public void BuildNumberIsFullSemVer()
2223

2324
semanticVersion.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
2425
semanticVersion.BuildMetaData.Sha = "commitSha";
25-
var variables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
26+
27+
var config = new TestEffectiveConfiguration();
28+
29+
var variables = VariableProvider.GetVariablesFor(semanticVersion, config, false);
2630
new BuildServer().WriteIntegration(writes.Add, variables);
2731

2832
writes[1].ShouldBe("1.2.3-beta.1+5");

‎src/GitVersionCore.Tests/BuildServers/JenkinsMessageGenerationTests.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using GitVersion;
5+
using GitVersionCore.Tests;
56
using NUnit.Framework;
67
using Shouldly;
78

@@ -54,7 +55,10 @@ static void AssertVariablesAreWrittenToFile(string f)
5455

5556
semanticVersion.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
5657
semanticVersion.BuildMetaData.Sha = "commitSha";
57-
var variables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
58+
59+
var config = new TestEffectiveConfiguration();
60+
61+
var variables = VariableProvider.GetVariablesFor(semanticVersion, config, false);
5862

5963
var j = new Jenkins(f);
6064

‎src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ continuous-delivery-fallback-tag: ci
55
major-version-bump-message: '\+semver:\s?(breaking|major)'
66
minor-version-bump-message: '\+semver:\s?(feature|minor)'
77
patch-version-bump-message: '\+semver:\s?(fix|patch)'
8+
legacy-semver-padding: 4
9+
build-metadata-padding: 4
810
commit-message-incrementing: Enabled
911
branches:
1012
master:

‎src/GitVersionCore.Tests/Fixtures/RepositoryFixtureBase.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,7 @@ VersionVariables GetVersion(IRepository repository = null, string commitId = nul
152152
{
153153
var gitVersionContext = new GitVersionContext(repository ?? Repository, configuration, IsForTrackedBranchOnly, commitId);
154154
var executeGitVersion = ExecuteGitVersion(gitVersionContext);
155-
var variables = VariableProvider.GetVariablesFor(executeGitVersion,
156-
gitVersionContext.Configuration.AssemblyVersioningScheme,
157-
gitVersionContext.Configuration.VersioningMode,
158-
gitVersionContext.Configuration.ContinuousDeploymentFallbackTag,
159-
gitVersionContext.IsCurrentCommitTagged);
155+
var variables = VariableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
160156
try
161157
{
162158
return variables;

‎src/GitVersionCore.Tests/JsonVersionBuilderTests.Json.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"PreReleaseTag":"unstable.4",
66
"PreReleaseTagWithDash":"-unstable.4",
77
"BuildMetaData":5,
8+
"BuildMetaDataPadded":"0005",
89
"FullBuildMetaData":"5.Branch.feature1.Sha.commitSha",
910
"MajorMinorPatch":"1.2.3",
1011
"SemVer":"1.2.3-unstable.4",

‎src/GitVersionCore.Tests/JsonVersionBuilderTests.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using ApprovalTests;
33
using GitVersion;
4+
using GitVersionCore.Tests;
45
using NUnit.Framework;
56

67
[TestFixture]
@@ -17,7 +18,10 @@ public void Json()
1718
PreReleaseTag = "unstable4",
1819
BuildMetaData = new SemanticVersionBuildMetaData(5, "feature1", "commitSha",DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
1920
};
20-
var variables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
21+
22+
var config = new TestEffectiveConfiguration();
23+
24+
var variables = VariableProvider.GetVariablesFor(semanticVersion, config, false);
2125
var json = JsonOutputFormatter.ToJson(variables);
2226
Approvals.Verify(json);
2327
}

‎src/GitVersionCore.Tests/TestEffectiveConfiguration.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ public TestEffectiveConfiguration(
1818
string majorMessage = null,
1919
string minorMessage = null,
2020
string patchMessage = null,
21-
CommitMessageIncrementMode commitMessageMode = CommitMessageIncrementMode.Enabled) :
21+
CommitMessageIncrementMode commitMessageMode = CommitMessageIncrementMode.Enabled,
22+
int legacySemVerPadding = 4,
23+
int buildMetaDataPadding = 4) :
2224
base(assemblyVersioningScheme, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch,
2325
branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,
2426
trackMergeTarget,
2527
majorMessage, minorMessage, patchMessage,
26-
commitMessageMode)
28+
commitMessageMode, legacySemVerPadding, buildMetaDataPadding)
2729
{
2830
}
2931
}

‎src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"PreReleaseTag":"unstable.4",
66
"PreReleaseTagWithDash":"-unstable.4",
77
"BuildMetaData":5,
8+
"BuildMetaDataPadded":"0005",
89
"FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
910
"MajorMinorPatch":"1.2.3",
1011
"SemVer":"1.2.3-unstable.4",

‎src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"Major":1,
3+
"Minor":2,
4+
"Patch":3,
5+
"PreReleaseTag":"unstable.4",
6+
"PreReleaseTagWithDash":"-unstable.4",
7+
"BuildMetaData":5,
8+
"BuildMetaDataPadded":"05",
9+
"FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
10+
"MajorMinorPatch":"1.2.3",
11+
"SemVer":"1.2.3-unstable.4",
12+
"LegacySemVer":"1.2.3-unstable4",
13+
"LegacySemVerPadded":"1.2.3-unstable00004",
14+
"AssemblySemVer":"1.2.3.0",
15+
"FullSemVer":"1.2.3-unstable.4+5",
16+
"InformationalVersion":"1.2.3-unstable.4+5.Branch.develop.Sha.commitSha",
17+
"BranchName":"develop",
18+
"Sha":"commitSha",
19+
"NuGetVersionV2":"1.2.3-unstable00004",
20+
"NuGetVersion":"1.2.3-unstable00004",
21+
"CommitDate":"2014-03-06"
22+
}

‎src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"PreReleaseTag":"",
66
"PreReleaseTagWithDash":"",
77
"BuildMetaData":5,
8+
"BuildMetaDataPadded":"0005",
89
"FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
910
"MajorMinorPatch":"1.2.3",
1011
"SemVer":"1.2.3",

‎src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"PreReleaseTag":"unstable.5",
66
"PreReleaseTagWithDash":"-unstable.5",
77
"BuildMetaData":"",
8+
"BuildMetaDataPadded":"",
89
"FullBuildMetaData":"Branch.develop.Sha.commitSha",
910
"MajorMinorPatch":"1.2.3",
1011
"SemVer":"1.2.3-unstable.5",

‎src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"PreReleaseTag":"ci.5",
66
"PreReleaseTagWithDash":"-ci.5",
77
"BuildMetaData":"",
8+
"BuildMetaDataPadded":"",
89
"FullBuildMetaData":"Branch.develop.Sha.commitSha",
910
"MajorMinorPatch":"1.2.3",
1011
"SemVer":"1.2.3-ci.5",

‎src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"PreReleaseTag":"",
66
"PreReleaseTagWithDash":"",
77
"BuildMetaData":5,
8+
"BuildMetaDataPadded":"0005",
89
"FullBuildMetaData":"5.Sha.commitSha",
910
"MajorMinorPatch":"1.2.3",
1011
"SemVer":"1.2.3",

‎src/GitVersionCore.Tests/VariableProviderTests.cs

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using ApprovalTests;
33
using GitVersion;
4+
using GitVersionCore.Tests;
45
using NUnit.Framework;
56

67
[TestFixture]
@@ -21,7 +22,33 @@ public void ProvidesVariablesInContinuousDeliveryModeForPreRelease()
2122
semVer.BuildMetaData.Sha = "commitSha";
2223
semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
2324

24-
var vars = VariableProvider.GetVariablesFor(semVer, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
25+
26+
var config = new TestEffectiveConfiguration();
27+
28+
var vars = VariableProvider.GetVariablesFor(semVer, config, false);
29+
30+
Approvals.Verify(JsonOutputFormatter.ToJson(vars));
31+
}
32+
33+
[Test]
34+
public void ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding()
35+
{
36+
var semVer = new SemanticVersion
37+
{
38+
Major = 1,
39+
Minor = 2,
40+
Patch = 3,
41+
PreReleaseTag = "unstable.4",
42+
BuildMetaData = "5.Branch.develop"
43+
};
44+
45+
semVer.BuildMetaData.Sha = "commitSha";
46+
semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
47+
48+
49+
var config = new TestEffectiveConfiguration(buildMetaDataPadding: 2, legacySemVerPadding: 5);
50+
51+
var vars = VariableProvider.GetVariablesFor(semVer, config, false);
2552

2653
Approvals.Verify(JsonOutputFormatter.ToJson(vars));
2754
}
@@ -41,7 +68,9 @@ public void ProvidesVariablesInContinuousDeploymentModeForPreRelease()
4168
semVer.BuildMetaData.Sha = "commitSha";
4269
semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
4370

44-
var vars = VariableProvider.GetVariablesFor(semVer, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDeployment, "ci", false);
71+
var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment);
72+
73+
var vars = VariableProvider.GetVariablesFor(semVer, config, false);
4574

4675
Approvals.Verify(JsonOutputFormatter.ToJson(vars));
4776
}
@@ -60,7 +89,9 @@ public void ProvidesVariablesInContinuousDeliveryModeForStable()
6089
semVer.BuildMetaData.Sha = "commitSha";
6190
semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
6291

63-
var vars = VariableProvider.GetVariablesFor(semVer, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
92+
var config = new TestEffectiveConfiguration();
93+
94+
var vars = VariableProvider.GetVariablesFor(semVer, config, false);
6495

6596
Approvals.Verify(JsonOutputFormatter.ToJson(vars));
6697
}
@@ -79,7 +110,9 @@ public void ProvidesVariablesInContinuousDeploymentModeForStable()
79110
semVer.BuildMetaData.Sha = "commitSha";
80111
semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
81112

82-
var vars = VariableProvider.GetVariablesFor(semVer, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDeployment, "ci", false);
113+
var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment);
114+
115+
var vars = VariableProvider.GetVariablesFor(semVer, config, false);
83116

84117
Approvals.Verify(JsonOutputFormatter.ToJson(vars));
85118
}
@@ -100,8 +133,9 @@ public void ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommi
100133
}
101134
};
102135

136+
var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment);
103137

104-
var vars = VariableProvider.GetVariablesFor(semVer, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDeployment, "ci", true);
138+
var vars = VariableProvider.GetVariablesFor(semVer, config, true);
105139

106140
Approvals.Verify(JsonOutputFormatter.ToJson(vars));
107141
}

‎src/GitVersionCore/Configuration/Config.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ public class Config
3232
[YamlMember(Alias = "patch-version-bump-message")]
3333
public string PatchVersionBumpMessage { get; set; }
3434

35+
[YamlMember(Alias = "legacy-semver-padding")]
36+
public int? LegacySemVerPadding { get; set; }
37+
38+
[YamlMember(Alias = "build-metadata-padding")]
39+
public int? BuildMetaDataPadding { get; set; }
40+
3541
[YamlMember(Alias = "commit-message-incrementing")]
3642
public CommitMessageIncrementMode? CommitMessageIncrementing { get; set; }
3743

‎src/GitVersionCore/Configuration/ConfigurationProvider.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ public static void ApplyDefaultsTo(Config config)
3131
config.MinorVersionBumpMessage = config.MinorVersionBumpMessage ?? IncrementStrategyFinder.DefaultMinorPattern;
3232
config.PatchVersionBumpMessage = config.PatchVersionBumpMessage ?? IncrementStrategyFinder.DefaultPatchPattern;
3333
config.CommitMessageIncrementing = config.CommitMessageIncrementing ?? CommitMessageIncrementMode.Enabled;
34+
config.LegacySemVerPadding = config.LegacySemVerPadding ?? 4;
35+
config.BuildMetaDataPadding = config.BuildMetaDataPadding ?? 4;
36+
3437
var configBranches = config.Branches.ToList();
3538

3639
ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "master"), defaultTag: string.Empty, defaultPreventIncrement: true);

‎src/GitVersionCore/EffectiveConfiguration.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ public EffectiveConfiguration(
1717
string majorVersionBumpMessage,
1818
string minorVersionBumpMessage,
1919
string patchVersionBumpMessage,
20-
CommitMessageIncrementMode commitMessageIncrementing)
20+
CommitMessageIncrementMode commitMessageIncrementing,
21+
int legacySemVerPaddding,
22+
int buildMetaDataPadding
23+
)
2124
{
2225
AssemblyVersioningScheme = assemblyVersioningScheme;
2326
VersioningMode = versioningMode;
@@ -34,6 +37,8 @@ public EffectiveConfiguration(
3437
MinorVersionBumpMessage = minorVersionBumpMessage;
3538
PatchVersionBumpMessage = patchVersionBumpMessage;
3639
CommitMessageIncrementing = commitMessageIncrementing;
40+
LegacySemVerPadding = legacySemVerPaddding;
41+
BuildMetaDataPadding = buildMetaDataPadding;
3742
}
3843

3944
public VersioningMode VersioningMode { get; private set; }
@@ -70,6 +75,9 @@ public EffectiveConfiguration(
7075

7176
public string PatchVersionBumpMessage { get; private set; }
7277

78+
public int LegacySemVerPadding { get; private set; }
79+
public int BuildMetaDataPadding { get; private set; }
80+
7381
public CommitMessageIncrementMode CommitMessageIncrementing { get; private set; }
7482
}
7583
}

‎src/GitVersionCore/ExecuteCore.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ public static VersionVariables ExecuteGitVersion(IFileSystem fileSystem, string
3131
{
3232
var gitVersionContext = new GitVersionContext(repo, configuration, commitId: commitId);
3333
var semanticVersion = versionFinder.FindVersion(gitVersionContext);
34-
var config = gitVersionContext.Configuration;
35-
variables = VariableProvider.GetVariablesFor(semanticVersion, config.AssemblyVersioningScheme, config.VersioningMode, config.ContinuousDeploymentFallbackTag, gitVersionContext.IsCurrentCommitTagged);
34+
variables = VariableProvider.GetVariablesFor(semanticVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
3635
}
3736

3837
return variables;

‎src/GitVersionCore/GitVersionContext.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ void CalculateEffectiveConfiguration()
117117
tagNumberPattern, configuration.ContinuousDeploymentFallbackTag,
118118
trackMergeTarget,
119119
majorMessage, minorMessage, patchMessage,
120-
commitMessageVersionBump);
120+
commitMessageVersionBump,
121+
configuration.LegacySemVerPadding.Value,
122+
configuration.BuildMetaDataPadding.Value);
121123
}
122124
}
123125
}

‎src/GitVersionCore/OutputFormatters/JsonOutputFormatter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static string ToJson(VersionVariables variables)
1414
{
1515
var isLast = (variable.Key == last);
1616
int value;
17-
if (int.TryParse(variable.Value, out value))
17+
if (int.TryParse(variable.Value, out value) && variable.Value[0] != '0') // preserve leading zeros for padding
1818
builder.AppendLineFormat(" \"{0}\":{1}{2}", variable.Key, value, isLast ? string.Empty : ",");
1919
else
2020
builder.AppendLineFormat(" \"{0}\":\"{1}\"{2}", variable.Key, variable.Value, isLast ? string.Empty : ",");

‎src/GitVersionCore/OutputVariables/VariableProvider.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22
{
33
public static class VariableProvider
44
{
5-
public static VersionVariables GetVariablesFor(
6-
SemanticVersion semanticVersion, AssemblyVersioningScheme assemblyVersioningScheme,
7-
VersioningMode mode, string continuousDeploymentFallbackTag,
8-
bool currentCommitIsTagged)
5+
public static VersionVariables GetVariablesFor(SemanticVersion semanticVersion, EffectiveConfiguration config, bool isCurrentCommitTagged)
96
{
10-
if (mode == VersioningMode.ContinuousDeployment && !currentCommitIsTagged)
7+
if (config.VersioningMode == VersioningMode.ContinuousDeployment && !isCurrentCommitTagged)
118
{
129
semanticVersion = new SemanticVersion(semanticVersion);
1310
// Continuous Deployment always requires a pre-release tag unless the commit is tagged
1411
if (!semanticVersion.PreReleaseTag.HasTag())
1512
{
16-
semanticVersion.PreReleaseTag.Name = continuousDeploymentFallbackTag;
13+
semanticVersion.PreReleaseTag.Name = config.ContinuousDeploymentFallbackTag;
1714
}
1815

1916
// For continuous deployment the commits since tag gets promoted to the pre-release number
@@ -28,12 +25,13 @@ public static VersionVariables GetVariablesFor(
2825
preReleaseTag: semanticVersion.PreReleaseTag,
2926
preReleaseTagWithDash: semanticVersion.PreReleaseTag.HasTag() ? "-" + semanticVersion.PreReleaseTag : null,
3027
buildMetaData: semanticVersion.BuildMetaData,
28+
buildMetaDataPadded: semanticVersion.BuildMetaData.ToString("p" + config.BuildMetaDataPadding),
3129
fullBuildMetaData: semanticVersion.BuildMetaData.ToString("f"),
3230
majorMinorPatch: string.Format("{0}.{1}.{2}", semanticVersion.Major, semanticVersion.Minor, semanticVersion.Patch),
3331
semVer: semanticVersion.ToString(),
3432
legacySemVer: semanticVersion.ToString("l"),
35-
legacySemVerPadded: semanticVersion.ToString("lp"),
36-
assemblySemVer: semanticVersion.GetAssemblyVersion(assemblyVersioningScheme),
33+
legacySemVerPadded: semanticVersion.ToString("lp" + config.LegacySemVerPadding),
34+
assemblySemVer: semanticVersion.GetAssemblyVersion(config.AssemblyVersioningScheme),
3735
fullSemVer: semanticVersion.ToString("f"),
3836
informationalVersion: semanticVersion.ToString("i"),
3937
branchName: semanticVersion.BuildMetaData.Branch,

0 commit comments

Comments
 (0)