diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs index 5c9a3d1f8..cf5e8dfd4 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs @@ -20,7 +20,6 @@ public class ArtifactsSizeTest : SmokeTests { private static readonly string BaselineFilePath = BaselineHelper.GetBaselineFilePath($"ArtifactsSizes/{Config.TargetRid}.txt"); private static readonly Dictionary BaselineFileContent = new Dictionary(); - private static readonly Regex BuildVersionPattern = new(@"\b\d+\.\d+\.\d+[-@](alpha|preview|rc|rtm)\.\d(\.\d+\.\d+)?\b"); private const int SizeThresholdPercentage = 25; @@ -52,8 +51,7 @@ public class ArtifactsSizeTest : SmokeTests .Where(entry => entry.EntryType == TarEntryType.RegularFile) .Where(entry => !entry.Name.Contains("SourceBuildReferencePackages")); IEnumerable sdkTarEntries = Utilities.GetTarballContent(Config.SdkTarballPath) - .Where(entry => entry.EntryType == TarEntryType.RegularFile) - .Where(entry => !entry.Name.Contains("SourceBuildReferencePackages")); + .Where(entry => entry.EntryType == TarEntryType.RegularFile); Dictionary fileNameCountMap = new Dictionary(); (string FilePath, long Bytes)[] tarEntries = sdkTarEntries.Concat(artifactsTarEntries) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs index 405bf7142..cd4a89cfd 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs @@ -116,9 +116,7 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests $"(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)" + $"(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))" + $"?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?"); - result = semanticVersionRegex.Replace(result, VersionPlaceholder); - - return result; + return semanticVersionRegex.Replace(result, VersionPlaceholder); } ///