Skip to content

Commit a7b3351

Browse files
committed
Fixing unit tests
1 parent 39fdff3 commit a7b3351

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Source/UnitTests/Tests.Orts/Common/Info/VersionInfoTests.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ public void AvailableVersionCompareCurrentTest()
5252
VersionInfo.CurrentVersion.Minor,
5353
VersionInfo.CurrentVersion.Patch,
5454
VersionInfo.CurrentVersion.Revision,
55+
#pragma warning disable CS0436 // Type conflicts with imported type
56+
ThisAssembly.IsPublicRelease ? VersionInfo.CurrentVersion.ReleaseLabels :
57+
#pragma warning restore CS0436 // Type conflicts with imported type
5558
VersionInfo.CurrentVersion.ReleaseLabels.Concat(new string[] { "g" + VersionInfo.CurrentVersion.Metadata }), string.Empty);
5659
Assert.IsNull(VersionInfo.GetBestAvailableVersion(new NuGetVersion[] { currentVersion }, true));
5760
}
@@ -64,6 +67,9 @@ public void AvailableVersionCompareNextTest()
6467
VersionInfo.CurrentVersion.Minor,
6568
VersionInfo.CurrentVersion.Patch,
6669
VersionInfo.CurrentVersion.Revision + 1,
70+
#pragma warning disable CS0436 // Type conflicts with imported type
71+
ThisAssembly.IsPublicRelease ? VersionInfo.CurrentVersion.ReleaseLabels :
72+
#pragma warning restore CS0436 // Type conflicts with imported type
6773
VersionInfo.CurrentVersion.ReleaseLabels.Concat(new string[] { "g" + VersionInfo.CurrentVersion.Metadata }), string.Empty);
6874
NuGetVersion available = VersionInfo.GetBestAvailableVersion(new NuGetVersion[] { currentVersion }, true);
6975
Assert.IsNotNull(available);

0 commit comments

Comments
 (0)