Skip to content

Commit d3cbb70

Browse files
committed
Use float instead of int for semver version
This prepares us in the event that 2.1 is introduced so we don't have to take a breaking change to accomodate it. I also remove the special constructor so that it versions better as more properties are added and it aligns more with the other option detail nested classes.
1 parent a7ccc3c commit d3cbb70

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

src/NerdBank.GitVersioning.Tests/VersionOracleTests.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,10 @@ public void CanSetSemVer2ForNuGetPackageVersionPublicRelease()
204204
VersionOptions workingCopyVersion = new VersionOptions
205205
{
206206
Version = SemanticVersion.Parse("7.8.9-foo.25"),
207-
NuGetPackageVersion = new VersionOptions.NuGetPackageVersionOptions(2)
207+
NuGetPackageVersion = new VersionOptions.NuGetPackageVersionOptions
208+
{
209+
SemVer = 2,
210+
}
208211
};
209212
this.WriteVersionFile(workingCopyVersion);
210213
this.InitializeSourceControl();
@@ -219,7 +222,10 @@ public void CanSetSemVer2ForNuGetPackageVersionNonPublicRelease()
219222
VersionOptions workingCopyVersion = new VersionOptions
220223
{
221224
Version = SemanticVersion.Parse("7.8.9-foo.25"),
222-
NuGetPackageVersion = new VersionOptions.NuGetPackageVersionOptions(2)
225+
NuGetPackageVersion = new VersionOptions.NuGetPackageVersionOptions
226+
{
227+
SemVer = 2,
228+
}
223229
};
224230
this.WriteVersionFile(workingCopyVersion);
225231
this.InitializeSourceControl();

src/NerdBank.GitVersioning/VersionOptions.cs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public class NuGetPackageVersionOptions : IEquatable<NuGetPackageVersionOptions>
169169
/// <summary>
170170
/// Default value for <see cref="SemVer"/>
171171
/// </summary>
172-
private const int DefaultNuGetPackageVersion = 1;
172+
private const float DefaultNuGetPackageVersion = 1.0f;
173173

174174
/// <summary>
175175
/// The default (uninitialized) instance.
@@ -179,25 +179,16 @@ public class NuGetPackageVersionOptions : IEquatable<NuGetPackageVersionOptions>
179179
/// <summary>
180180
/// Initializes a new instance of the <see cref="NuGetPackageVersionOptions" /> class.
181181
/// </summary>
182-
public NuGetPackageVersionOptions() : this(DefaultNuGetPackageVersion)
182+
public NuGetPackageVersionOptions()
183183
{
184184
}
185185

186-
/// <summary>
187-
/// Initializes a new instance of the <see cref="NuGetPackageVersionOptions"/> class
188-
/// </summary>
189-
/// <param name="semVer">Semantic Version Level</param>
190-
public NuGetPackageVersionOptions(int semVer)
191-
{
192-
this.SemVer = semVer;
193-
}
194-
195186
/// <summary>
196187
/// Gets or sets the version of SemVer (e.g. 1 or 2) that should be used when generating the package version.
197188
/// </summary>
198189
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
199190
[DefaultValue(DefaultNuGetPackageVersion)]
200-
public int SemVer { get; set; }
191+
public float SemVer { get; set; } = DefaultNuGetPackageVersion;
201192

202193
/// <inheritdoc />
203194
public override bool Equals(object obj) => this.Equals(obj as NuGetPackageVersionOptions);

0 commit comments

Comments
 (0)