Skip to content

Commit df76769

Browse files
committed
Add and fix a couple of test cases
1 parent 6fc1391 commit df76769

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/NerdBank.GitVersioning.Tests/BuildIntegrationTests.cs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ public async Task GetBuildVersion_CustomAssemblyVersion()
295295
}
296296

297297
[Theory]
298+
[InlineData(VersionOptions.VersionPrecision.Major)]
298299
[InlineData(VersionOptions.VersionPrecision.Build)]
299300
[InlineData(VersionOptions.VersionPrecision.Revision)]
300301
public async Task GetBuildVersion_CustomAssemblyVersionWithPrecision(VersionOptions.VersionPrecision precision)
@@ -315,6 +316,7 @@ public async Task GetBuildVersion_CustomAssemblyVersionWithPrecision(VersionOpti
315316
}
316317

317318
[Theory]
319+
[InlineData(VersionOptions.VersionPrecision.Major)]
318320
[InlineData(VersionOptions.VersionPrecision.Build)]
319321
[InlineData(VersionOptions.VersionPrecision.Revision)]
320322
public async Task GetBuildVersion_CustomAssemblyVersionPrecision(VersionOptions.VersionPrecision precision)
@@ -719,11 +721,15 @@ public async Task AssemblyInfo_SuppressedImplicitlyByTargetExt()
719721

720722
private static Version GetExpectedAssemblyVersion(VersionOptions versionOptions, Version version)
721723
{
722-
var assemblyVersionPrecision = versionOptions.AssemblyVersion?.Precision ?? VersionOptions.VersionPrecision.Minor;
723-
int assemblyVersionBuild = assemblyVersionPrecision >= VersionOptions.VersionPrecision.Build ? version.Build : 0;
724-
int assemblyVersionRevision = assemblyVersionPrecision >= VersionOptions.VersionPrecision.Revision ? version.Revision : 0;
725-
Version assemblyVersion = (versionOptions.AssemblyVersion?.Version ?? versionOptions.Version.Version).EnsureNonNegativeComponents();
726-
assemblyVersion = new Version(assemblyVersion.Major, assemblyVersion.Minor, assemblyVersionBuild, assemblyVersionRevision);
724+
// Function should be very similar to VersionOracle.GetAssemblyVersion()
725+
var assemblyVersion = (versionOptions?.AssemblyVersion?.Version ?? versionOptions.Version.Version).EnsureNonNegativeComponents();
726+
var precision = versionOptions?.AssemblyVersion?.Precision ?? VersionOptions.DefaultVersionPrecision;
727+
728+
assemblyVersion = new System.Version(
729+
assemblyVersion.Major,
730+
precision >= VersionOptions.VersionPrecision.Minor ? assemblyVersion.Minor : 0,
731+
precision >= VersionOptions.VersionPrecision.Build ? version.Build : 0,
732+
precision >= VersionOptions.VersionPrecision.Revision ? version.Revision : 0);
727733
return assemblyVersion;
728734
}
729735

0 commit comments

Comments
 (0)