From 2dd6cd4ef3735e0e88f29605a5aa5ddfa4859107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= <1175054+carlossanlop@users.noreply.github.com> Date: Tue, 15 Oct 2024 16:17:31 -0700 Subject: [PATCH] Make VerifyFrameworkDescriptionContainsCorrectVersion test more specific in its checks when stable. --- .../DescriptionNameTests.cs | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/DescriptionNameTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/DescriptionNameTests.cs index 335c9c001deeee..9381f10a87cada 100644 --- a/src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/DescriptionNameTests.cs +++ b/src/libraries/System.Runtime/tests/System.Runtime.InteropServices.RuntimeInformation.Tests/DescriptionNameTests.cs @@ -198,11 +198,21 @@ public void VerifyFrameworkDescriptionContainsCorrectVersion() Assert.DoesNotContain("+", version); // no git hash #if STABILIZE_PACKAGE_VERSION - // a stabilized version looks like 8.0.0 - Assert.DoesNotContain("-", version); - Assert.True(Version.TryParse(version, out Version _)); + // A stabilized version looks like 9.0.0 + // In local builds, the version looks like 9.0.0-dev, and in PRs CI, the version looks like 9.0.0-ci. + // Both are acceptable. + if (!version.Contains("-dev") && !version.Contains("-ci")) + { + Assert.DoesNotContain("-", version); + } + else + { + version = version.Substring(0, version.IndexOf("-")); // remove -dev or -ci + } + Assert.True(Version.TryParse(version, out Version _), $"Version could not be parsed: {version}"); #else - // a non-stabilized version looks like 8.0.0-preview.5.23280.8 or 8.0.0-dev + // a non-stabilized version looks like 9.0.0-preview.5.12345.1, 9.0.0-rc.1.12345.1 or 9.0.0-rtm.1.12345.1 + // -dev always shows up in local buids, and -ci always shows up in the CI of PRs. Assert.Contains("-", version); var versionNumber = version.Substring(0, version.IndexOf("-")); Assert.True(Version.TryParse(versionNumber, out Version _));