diff options
| author | Doug Bunting <6431421+dougbu@users.noreply.github.com> | 2022-08-20 00:12:02 +0300 |
|---|---|---|
| committer | Doug Bunting <6431421+dougbu@users.noreply.github.com> | 2022-08-20 00:14:32 +0300 |
| commit | 309f7e82bf0a654de9b71a2c35f60e572baa7c12 (patch) | |
| tree | 1acbbc73f5fceafbbddea1aecf3a0c1d625b5067 | |
| parent | 06c7d40d8e1fb6c79721ec5846f1940b4221f38b (diff) | |
Provide fallbacks for assembly version checksdarc-main-c2e4f31a-18e6-44f4-82ae-9850a1a9705d
- runtime does assembly version updates slightly later
| -rw-r--r-- | src/Framework/test/SharedFxTests.cs | 14 | ||||
| -rw-r--r-- | src/Framework/test/TargetingPackTests.cs | 15 |
2 files changed, 28 insertions, 1 deletions
diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs index ac242e0067..1af746d338 100644 --- a/src/Framework/test/SharedFxTests.cs +++ b/src/Framework/test/SharedFxTests.cs @@ -190,6 +190,20 @@ public class SharedFxTests var assemblyDefinition = reader.GetAssemblyDefinition(); // Assembly versions should all match Major.Minor.0.0 + if (repoAssemblies.Contains(name)) + { + // We always align major.minor in assemblies and packages. + Assert.Equal(expectedVersion.Major, assemblyDefinition.Version.Major); + } + else + { + // ... but dotnet/runtime has a window between package version and (then) assembly version updates. + Assert.True(expectedVersion.Major == assemblyDefinition.Version.Major || + expectedVersion.Major - 1 == assemblyDefinition.Version.Major, + $"Unexpected Major assembly version '{assemblyDefinition.Version.Major}' is neither " + + $"{expectedVersion.Major - 1}' nor '{expectedVersion.Major}'."); + } + Assert.Equal(expectedVersion.Major, assemblyDefinition.Version.Major); Assert.Equal(expectedVersion.Minor, assemblyDefinition.Version.Minor); Assert.Equal(0, assemblyDefinition.Version.Build); diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs index 76be10479a..f531743716 100644 --- a/src/Framework/test/TargetingPackTests.cs +++ b/src/Framework/test/TargetingPackTests.cs @@ -87,7 +87,20 @@ public class TargetingPackTests var assemblyDefinition = reader.GetAssemblyDefinition(); // Assembly versions should all match Major.Minor.0.0 - Assert.Equal(expectedVersion.Major, assemblyDefinition.Version.Major); + if (repoAssemblies.Contains(Path.GetFileNameWithoutExtension(path))) + { + // We always align major.minor in assemblies and packages. + Assert.Equal(expectedVersion.Major, assemblyDefinition.Version.Major); + } + else + { + // ... but dotnet/runtime has a window between package version and (then) assembly version updates. + Assert.True(expectedVersion.Major == assemblyDefinition.Version.Major || + expectedVersion.Major - 1 == assemblyDefinition.Version.Major, + $"Unexpected Major assembly version '{assemblyDefinition.Version.Major}' is neither " + + $"{expectedVersion.Major - 1}' nor '{expectedVersion.Major}'."); + } + Assert.Equal(expectedVersion.Minor, assemblyDefinition.Version.Minor); Assert.Equal(0, assemblyDefinition.Version.Build); Assert.Equal(0, assemblyDefinition.Version.Revision); |