From 0c8aa6d7a9eed0a3f39750257d02c8740ce12344 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 14 Dec 2021 19:23:15 -0600 Subject: [PATCH] Clean prebuilt baseline (#12816) * Remove prebuilt baseline * Make prebuilt baseline file optional --- .../content/tools-local/prebuilt-baseline.xml | 168 ------------------ .../ValidateUsageAgainstBaseline.cs | 18 +- 2 files changed, 13 insertions(+), 173 deletions(-) delete mode 100755 src/SourceBuild/tarball/content/tools-local/prebuilt-baseline.xml diff --git a/src/SourceBuild/tarball/content/tools-local/prebuilt-baseline.xml b/src/SourceBuild/tarball/content/tools-local/prebuilt-baseline.xml deleted file mode 100755 index da166e4f7..000000000 --- a/src/SourceBuild/tarball/content/tools-local/prebuilt-baseline.xml +++ /dev/null @@ -1,168 +0,0 @@ - - fedora.33-x64 - - src/arcade.a3377cccde8639089f99107e2ba5df2c8cbe6394/ - src/aspnetcore./ - src/clicommandlineparser.3198bf5660cad3dab85f5475bf1fda9688146e3f/ - src/command-line-api.5e855e911de7c56fe28400c4500e888fe2a3da8e/ - src/diagnostics.6f48c2ae749c29b687af0353e6c2a9590d7e3d22/ - src/fsharp./ - src/installer.c6ec4363003b18d8e587620baa36205b80ee3074/ - src/known-good-tests./ - src/known-good./ - src/linker.f2588193553431636b9853b0f87209fa395a72c5/ - src/msbuild./ - src/nuget.client./ - src/package-source-build/ - src/roslyn-analyzers./ - src/roslyn./ - src/runtime./ - src/runtime./ - src/sdk./ - src/source-build-reference-packages.36fb56afdf0ee2fb2e0833bdef98dfde12a0837b/ - src/source-build.3fb25b8db3bec654e37e71a5b2b7fde14444bc2f/ - src/sourcelink.4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc/ - src/symreader.1968a003d845d119a9d38ac4daaeea22897f7daf/ - src/templating.3bc0d90f3e450f3e4ebda128081d091fb42968e3/ - src/test-templates.6898c1c70c2d14e9725ddab6e1ebe8084c4d7e27/ - src/vstest./ - src/xdt.6a46e7c886cdf499ba3433f665ab417be814135e/ - src/xliff-tasks.71c811561ad4dcf46825a5077fbcc668ab74754f/ - Tools/ - tools-local/tasks/ - artifacts/obj/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs index d96dbf8d0..6c80f2756 100644 --- a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs +++ b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs @@ -17,9 +17,6 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport [Required] public string DataFile { get; set; } - [Required] - public string BaselineDataFile { get; set; } - [Required] public string OutputBaselineFile { get; set; } @@ -28,14 +25,25 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport public bool AllowTestProjectUsage { get; set; } + public string BaselineDataFile { get; set; } + public override bool Execute() { var used = UsageData.Parse(XElement.Parse(File.ReadAllText(DataFile))); - var baseline = UsageData.Parse(XElement.Parse(File.ReadAllText(BaselineDataFile))); + + IEnumerable baselineUsages; + if (File.Exists(BaselineDataFile)) + { + baselineUsages = UsageData.Parse(XElement.Parse(File.ReadAllText(BaselineDataFile))).Usages; + } + else + { + baselineUsages = Enumerable.Empty(); + } Comparison diff = Compare( used.Usages.Select(u => u.GetIdentityWithoutRid()).Distinct(), - baseline.Usages.Select(u => u.GetIdentityWithoutRid()).Distinct()); + baselineUsages.Select(u => u.GetIdentityWithoutRid()).Distinct()); var report = new XElement("BaselineComparison");