Find test-only prebuilts with simple path patterns (#787)

Also, write usage reports before baseline validation to make sure info is always generated.

Author: dagood

repos/dir.targets

@@ -419,6 +419,16 @@
       <FailOnPrebuiltBaselineError Condition="'$(FailOnPrebuiltBaselineError)' == ''">false</FailOnPrebuiltBaselineError>
     </PropertyGroup>
 
+    <ItemGroup>
+      <PackageVersionPropsSavedSnapshotFiles Include="$(PackageReportDir)snapshots/PackageVersions.props.pre.*.xml" />
+    </ItemGroup>
+
+    <WriteUsageReports DataFile="$(PackageReportDataFile)"
+                       PackageVersionPropsSnapshots="@(PackageVersionPropsSavedSnapshotFiles)"
+                       ProdConBuildManifestFile="$(ProdConManifestFile)"
+                       PoisonedReportFile="$(PoisonedReportFile)"
+                       OutputDirectory="$(PackageReportDir)" />
+
     <PropertyGroup Condition="'$(ContinueOnPrebuiltBaselineError)' == ''">
       <ContinueOnPrebuiltBaselineError>false</ContinueOnPrebuiltBaselineError>
       <ContinueOnPrebuiltBaselineError Condition="'$(FailOnPrebuiltBaselineError)' != 'true'">true</ContinueOnPrebuiltBaselineError>
@@ -430,16 +440,6 @@
       OutputBaselineFile="$(PackageReportDir)generated-new-baseline.xml"
       OutputReportFile="$(PackageReportDir)baseline-comparison.xml"
       ContinueOnError="$(ContinueOnPrebuiltBaselineError)" />
-
-    <ItemGroup>
-      <PackageVersionPropsSavedSnapshotFiles Include="$(PackageReportDir)snapshots/PackageVersions.props.pre.*.xml" />
-    </ItemGroup>
-
-    <WriteUsageReports DataFile="$(PackageReportDataFile)"
-                       PackageVersionPropsSnapshots="@(PackageVersionPropsSavedSnapshotFiles)"
-                       ProdConBuildManifestFile="$(ProdConManifestFile)"
-                       PoisonedReportFile="$(PoisonedReportFile)"
-                       OutputDirectory="$(PackageReportDir)" />
   </Target>
 
   <Target Name="GetProjectDirectory" Outputs="$(ProjectDirectory)" />

tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks/UsageReport/AnnotatedUsage.cs

@@ -14,13 +14,17 @@ public class AnnotatedUsage
         public string SourceBuildPackageIdCreator { get; set; }
         public string ProdConPackageIdCreator { get; set; }
         public bool EndsUpInOutput { get; set; }
+        public bool TestProjectByHeuristic { get; set; }
+        public bool TestProjectOnlyByHeuristic { get; set; }
 
         public XElement ToXml() => new XElement(
             nameof(AnnotatedUsage),
             Usage.ToXml().Attributes(),
             Project.ToXAttributeIfNotNull(nameof(Project)),
             SourceBuildPackageIdCreator.ToXAttributeIfNotNull(nameof(SourceBuildPackageIdCreator)),
             ProdConPackageIdCreator.ToXAttributeIfNotNull(nameof(ProdConPackageIdCreator)),
+            TestProjectByHeuristic.ToXAttributeIfTrue(nameof(TestProjectByHeuristic)),
+            TestProjectOnlyByHeuristic.ToXAttributeIfTrue(nameof(TestProjectOnlyByHeuristic)),
             EndsUpInOutput.ToXAttributeIfTrue(nameof(EndsUpInOutput)));
     }
 }

tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks/UsageReport/WriteUsageReports.cs

@@ -108,54 +108,66 @@ public override bool Execute()
 
             var report = new XElement("AnnotatedUsages");
 
-            foreach (Usage usage in data.Usages.NullAsEmpty())
-            {
-                string id = usage.PackageIdentity.Id;
-                string version = usage.PackageIdentity.Version.OriginalVersion;
+            var annotatedUsages = data.Usages.NullAsEmpty()
+                .Select(usage =>
+                {
+                    string id = usage.PackageIdentity.Id;
+                    string version = usage.PackageIdentity.Version.OriginalVersion;
 
-                string pvpIdent = WriteBuildOutputProps.GetPropertyName(id);
+                    string pvpIdent = WriteBuildOutputProps.GetPropertyName(id);
 
-                var sourceBuildCreator = new StringBuilder();
-                foreach (RepoOutput output in sourceBuildRepoOutputs)
-                {
-                    foreach (PackageVersionPropsElement p in output.Built)
+                    var sourceBuildCreator = new StringBuilder();
+                    foreach (RepoOutput output in sourceBuildRepoOutputs)
                     {
-                        if (p.Name.Equals(pvpIdent, StringComparison.OrdinalIgnoreCase))
+                        foreach (PackageVersionPropsElement p in output.Built)
                         {
-                            if (sourceBuildCreator.Length != 0)
+                            if (p.Name.Equals(pvpIdent, StringComparison.OrdinalIgnoreCase))
                             {
+                                if (sourceBuildCreator.Length != 0)
+                                {
+                                    sourceBuildCreator.Append(" ");
+                                }
+                                sourceBuildCreator.Append(output.Repo);
                                 sourceBuildCreator.Append(" ");
+                                sourceBuildCreator.Append(p.Name);
+                                sourceBuildCreator.Append("/");
+                                sourceBuildCreator.Append(p.Version);
                             }
-                            sourceBuildCreator.Append(output.Repo);
-                            sourceBuildCreator.Append(" ");
-                            sourceBuildCreator.Append(p.Name);
-                            sourceBuildCreator.Append("/");
-                            sourceBuildCreator.Append(p.Version);
                         }
                     }
-                }
 
-                prodConPackageOrigin.TryGetValue(id, out string prodConCreator);
+                    prodConPackageOrigin.TryGetValue(id, out string prodConCreator);
 
-                var annotated = new AnnotatedUsage
-                {
-                    Usage = usage,
+                    return new AnnotatedUsage
+                    {
+                        Usage = usage,
 
-                    Project = data.ProjectDirectories
-                        ?.FirstOrDefault(p => usage.AssetsFile?.StartsWith(p) ?? false),
+                        Project = data.ProjectDirectories
+                            ?.FirstOrDefault(p => usage.AssetsFile?.StartsWith(p) ?? false),
 
-                    SourceBuildPackageIdCreator = sourceBuildCreator.Length == 0
-                        ? null
-                        : sourceBuildCreator.ToString(),
+                        SourceBuildPackageIdCreator = sourceBuildCreator.Length == 0
+                            ? null
+                            : sourceBuildCreator.ToString(),
 
-                    ProdConPackageIdCreator = prodConCreator,
+                        ProdConPackageIdCreator = prodConCreator,
 
-                    EndsUpInOutput = poisonNupkgFilenames.Contains($"{id}.{version}")
-                };
+                        TestProjectByHeuristic = IsTestUsageByHeuristic(usage),
 
-                report.Add(annotated.ToXml());
+                        EndsUpInOutput = poisonNupkgFilenames.Contains($"{id}.{version}")
+                    };
+                })
+                .ToArray();
+
+            foreach (var onlyTestProjectUsage in annotatedUsages
+                .GroupBy(u => u.Usage.PackageIdentity)
+                .Where(g => g.All(u => u.TestProjectByHeuristic))
+                .SelectMany(g => g))
+            {
+                onlyTestProjectUsage.TestProjectOnlyByHeuristic = true;
             }
 
+            report.Add(annotatedUsages.Select(u => u.ToXml()));
+
             Directory.CreateDirectory(OutputDirectory);
 
             File.WriteAllText(
@@ -233,6 +245,29 @@ private void AddProdConPackage(
             }
         }
 
+        public static bool IsTestUsageByHeuristic(Usage usage)
+        {
+            string[] assetsFileParts = usage.AssetsFile?.Split('/', '\\');
+
+            // If the dir name ends in Test(s), it's probably a test project.
+            // Ignore the first two segments to avoid classifying everything in "src/vstest".
+            // This also catches "test" dirs that contain many test projects.
+            if (assetsFileParts?.Skip(2).Any(p =>
+                p.EndsWith("Tests", StringComparison.OrdinalIgnoreCase) ||
+                p.EndsWith("Test", StringComparison.OrdinalIgnoreCase)) == true)
+            {
+                return true;
+            }
+
+            // CoreFX restores test dependencies during this sync project.
+            if (assetsFileParts?.Contains("XUnit.Runtime") == true)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
         private class RepoOutput
         {
             public string Repo { get; set; }