fix(manifest): keep MSBuild error codes in .NET evaluation failures

MSBuild keeps an evaluation error's code out of the exception message, so
evaluation and solution-parse failures reached the resolution report without
it and were grouped as other failures. Prefix the code so they group as
project configuration problems.

Inner builds now come from TargetFrameworks, split as the cross-targeting
targets do, rather than from restore's list, which only mattered while the
tool built projects. Also tidies helpers and tests the evaluation-only change
left with one caller.

Author: jfblaa

src/commands/manifest/scripts/assemble.test.mts

@@ -658,7 +658,7 @@ describe('dotnet records → per-framework sidecar', () => {
     'projectSrc\tLib.csproj\t/abs/Legacy.cs\tnetstandard2.0',
     'projectTgt\tLib.csproj\t/abs/bin/net8.0/Lib.dll\tnet8.0',
     'projectInfo\tLib.csproj\tnet8.0\tTargetFrameworkMoniker\t.NETCoreApp,Version=v8.0',
-    'projectInfo\tLib.csproj\tnet8.0\tDefineConstant\tNET8_0_OR_GREATER',
+    'projectInfo\tLib.csproj\tnet8.0\tDefineConstant\tDEBUG',
     'projectInfo\tLib.csproj\tnet8.0\tFrameworkReference\tMicrosoft.NETCore.App',
     'projectInfo\tLib.csproj\tnet8.0\tNullable\tenable',
     'projectUsing\tLib.csproj\tnet8.0\tSystem.Linq\t\t0',
@@ -696,7 +696,7 @@ describe('dotnet records → per-framework sidecar', () => {
         nullable: 'enable',
         assemblyName: undefined,
         frameworkReferences: ['Microsoft.NETCore.App'],
-        defineConstants: ['NET8_0_OR_GREATER'],
+        defineConstants: ['DEBUG'],
         usings: [
           { namespace: 'System.Linq' },
           { namespace: 'System.Math', static: true },

src/commands/manifest/scripts/dotnet-tool/FactsRunner.cs

@@ -155,7 +155,7 @@ private bool IsExcludedProject(string path) {
       _solution = new SolutionContext(entry, _opts.GlobalProperties);
       return _solution.Members.Keys.OrderBy(p => p, StringComparer.Ordinal).ToList();
     } catch (Exception e) when (e is InvalidProjectFileException or IOException or JsonException) {
-      _records.Failure(Rel(entry), $"could not read the solution: {Text.FirstLine(e.Message)}", "");
+      _records.Failure(Rel(entry), $"could not read the solution: {ErrorText(e)}", "");
       return null;
     }
   }
@@ -211,13 +211,7 @@ private IEnumerable<string> ProjectReferences(Project project, bool innerBuilds)
         }
       }
     }
-    return builds
-      .SelectMany(b => b.GetItems("ProjectReference"))
-      .Select(item => item.GetMetadataValue("FullPath"))
-      .Where(full => !string.IsNullOrEmpty(full) && File.Exists(full))
-      .Select(full => Path.GetFullPath(full))
-      .Distinct(StringComparer.Ordinal)
-      .ToList();
+    return FullPaths(builds.SelectMany(b => b.GetItems("ProjectReference"))).Where(File.Exists).ToList();
   }
 
   private void RunRestore() {
@@ -281,12 +275,18 @@ private Project LoadInnerBuild(Project project, string targetFramework) {
       return Load(collection, info.FullPath, info.GlobalProperties);
     } catch (InvalidProjectFileException e) {
       if (!info.Excluded) {
-        _records.Unscannable("", $"could not evaluate the project: {Text.FirstLine(e.Message)}", info.Key);
+        _records.Unscannable("", $"could not evaluate the project: {ErrorText(e)}", info.Key);
       }
       return null;
     }
   }
 
+  // MSBuild keeps an error's code out of its message.
+  private static string ErrorText(Exception e) {
+    var line = Text.FirstLine(e.Message);
+    return e is InvalidProjectFileException { ErrorCode: { Length: > 0 } code } ? $"{code}: {line}" : line;
+  }
+
   // Restore errors not already reported from an assets file, then the projects
   // left without current assets and without errors of their own.
   private void ReportRestoreErrors() {

src/commands/manifest/scripts/dotnet-tool/Patterns.cs

@@ -22,6 +22,8 @@ public bool Matches(IReadOnlyCollection<string> names) {
     return _includes.Count == 0 || _includes.Any(p => names.Any(p.IsMatch));
   }
 
+  public bool Matches(string name) => Matches(new[] { name });
+
   private static List<Regex> Parse(string csv) {
     return csv
       .Split(',')

src/commands/manifest/scripts/dotnet-tool/Reader.cs

@@ -162,12 +162,10 @@ string[] Unscannable(string? detail) {
     var assets = new Assets(PackageResolver(lockFile), libraries, projectKeys, projectNames);
 
     var isTest = IsTestProject(project);
-    var frameworks = new List<string>();
     foreach (var target in NuGetShim.Seq<LockFileTarget>(lockFile, "Targets")) {
-      var alias = EmitTarget(info, spec, target, assets, isTest);
-      if (alias != null && string.IsNullOrEmpty(target.RuntimeIdentifier)) frameworks.Add(alias);
+      EmitTarget(info, spec, target, assets, isTest);
     }
-    if (_opts.WithFiles) EmitPaths(info, project, frameworks);
+    if (_opts.WithFiles) EmitPaths(info, project);
     return references;
   }
 
@@ -227,9 +225,8 @@ private static bool IsTestProject(Project project) {
       || project.GetPropertyValue("ProjectTypeGuids").Contains(TestProjectTypeGuid, StringComparison.OrdinalIgnoreCase);
   }
 
-  // One resolution root per (target framework [/ runtime], prod|dev). Returns
-  // the target framework alias when the target was read.
-  private string? EmitTarget(ProjectInfo info, PackageSpec spec, LockFileTarget target, Assets assets, bool isTest) {
+  // One resolution root per (target framework [/ runtime], prod|dev).
+  private void EmitTarget(ProjectInfo info, PackageSpec spec, LockFileTarget target, Assets assets, bool isTest) {
     var framework = NuGetShim.Seq<TargetFrameworkInformation>(spec, "TargetFrameworks")
       .FirstOrDefault(f => f.FrameworkName.Equals(target.TargetFramework));
     var alias = framework?.TargetAlias;
@@ -239,7 +236,7 @@ private static bool IsTestProject(Project project) {
     // A runtime-specific target also answers to its framework's name, so a
     // filter on `net8.0` covers `net8.0/win-x64`.
     var names = string.IsNullOrEmpty(rid) ? new[] { config } : new[] { config, alias };
-    if (!_configs.Matches(names)) return null;
+    if (!_configs.Matches(names)) return;
     if (_scanned.Add(config)) _records.Scanned(config);
 
     var libraries = new Dictionary<string, LockFileTargetLibrary>(StringComparer.Ordinal);
@@ -331,7 +328,6 @@ void EmitRoot(string kind, bool prod, HashSet<string> ids, bool withFiles) {
     // project resolves is dev.
     EmitRoot("all", false, reached, _opts.WithFiles);
     if (!isTest) EmitRoot("prod", true, shipped, false);
-    return alias;
   }
 
   // Runtime assemblies (lib/, runtimes/<rid>/lib/) carry the method bodies an
@@ -454,7 +450,7 @@ private void ReadPackagesConfig(ProjectInfo info, Project project, string packag
     }
     if (packages.Count == 0) return;
     var config = LegacyFrameworkName(project);
-    if (!_configs.Matches(new[] { config })) return;
+    if (!_configs.Matches(config)) return;
     if (_scanned.Add(config)) _records.Scanned(config);
 
     var isTest = IsTestProject(project);
@@ -528,13 +524,11 @@ private static string NormalizeSlashes(string path) {
 
   // NuGet's short folder name of a build's framework, as restore derives it
   // from the two monikers; null when unrecognized.
-  private static string? ShortFrameworkName(Project build) =>
-    ShortFrameworkName(build.GetPropertyValue("TargetFrameworkMoniker"), build.GetPropertyValue("TargetPlatformMoniker"));
-
-  private static string? ShortFrameworkName(string moniker, string platformMoniker) {
+  private static string? ShortFrameworkName(Project build) {
+    var moniker = build.GetPropertyValue("TargetFrameworkMoniker");
     if (string.IsNullOrEmpty(moniker)) return null;
     try {
-      return NuGetFramework.ParseComponents(moniker, platformMoniker).GetShortFolderName();
+      return NuGetFramework.ParseComponents(moniker, build.GetPropertyValue("TargetPlatformMoniker")).GetShortFolderName();
     } catch (ArgumentException) {
       return null;
     }
@@ -547,41 +541,39 @@ private static string LegacyFrameworkName(Project project) {
     return string.IsNullOrEmpty(version) ? "unknown" : $"net{version.TrimStart('v').Replace(".", "")}";
   }
 
-  // The inner builds of a multi-targeting project, by target framework; none
-  // for a project with a single framework.
+  // Split as Microsoft.Common.CrossTargeting.targets does: trimmed, distinct
+  // ignoring case. Empty for a single-framework project.
   private static List<string> Frameworks(Project project) {
     var multi = project.GetPropertyValue("TargetFrameworks");
     if (string.IsNullOrEmpty(project.GetPropertyValue("TargetFramework")) && !string.IsNullOrEmpty(multi)) {
-      return multi.Split(';').Select(f => f.Trim()).Where(f => f.Length > 0).Distinct().ToList();
+      return multi.Split(';').Select(f => f.Trim()).Where(f => f.Length > 0).Distinct(StringComparer.OrdinalIgnoreCase).ToList();
     }
     return new List<string>();
   }
 
   // Per inner build of a multi-targeting project, whose outer evaluation has
   // no Compile items or TargetPath, or of the project's single framework.
-  // `frameworks`: the inner builds to read, when restore names them.
-  private void EmitPaths(ProjectInfo info, Project project, List<string>? frameworks = null) {
+  private void EmitPaths(ProjectInfo info, Project project) {
     var multi = Frameworks(project);
     if (multi.Count == 0) {
       var single = project.GetPropertyValue("TargetFramework");
       var config = string.IsNullOrEmpty(single) ? LegacyFrameworkName(project) : single;
-      if (_configs.Matches(new[] { config })) EmitBuild(info, project, config);
+      if (_configs.Matches(config)) EmitBuild(info, project, config);
       return;
     }
-    foreach (var tfm in (frameworks ?? multi).Where(f => _configs.Matches(new[] { f }))) {
+    foreach (var tfm in multi.Where(_configs.Matches)) {
       Project build;
       try {
         build = LoadInnerBuild(project, tfm);
       } catch (InvalidProjectFileException e) {
-        _records.Unscannable(tfm, $"could not evaluate the {tfm} build: {Text.FirstLine(e.Message)}", info.Key);
+        _records.Unscannable(tfm, $"could not evaluate the {tfm} build: {ErrorText(e)}", info.Key);
         continue;
       }
       EmitBuild(info, build, tfm);
     }
   }
 
-  // As evaluation leaves it: no target runs, so neither the sources targets
-  // generate nor the references and analyzers they resolve are known.
+  // As evaluation leaves it: sources that targets generate are absent.
   private void EmitBuild(ProjectInfo info, Project build, string config) {
     var language = build.GetPropertyValue("Language");
     var isFSharp = string.Equals(language, "F#", StringComparison.OrdinalIgnoreCase);

src/commands/manifest/scripts/resolution-report-nuget.mts

@@ -11,8 +11,8 @@ const NOT_FOUND_CODES = new Set(['NU1100', 'NU1101', 'NU1102', 'NU1103'])
 const SOURCE_CODES = new Set(['NU1301', 'NU1302'])
 
 // The socket-facts-dotnet tool reports restore errors as `<code>: <message>`,
-// and some findings as `<finding>: <code>: <message>`; its findings without a
-// code count as other failures.
+// and evaluation errors as `<finding>: <code>: <message>`; its findings
+// without a code count as other failures.
 export function classifyNugetFailure(detail: string): FailureCategory {
   const code = /(?:^|: )(NU\d{4}|NETSDK\d{4}|MSB\d{4}):/.exec(detail || '')?.[1]
   if (!code) {

src/commands/manifest/scripts/resolution-report-nuget.test.mts

@@ -12,13 +12,13 @@ const DETAILS_BY_CATEGORY = {
     'NETSDK1147: To build this project, the following workloads must be installed: maui',
     "MSB4236: The SDK 'Microsoft.Build.Traversal/2.0.24' specified could not be found.",
     'could not read the solution: MSB5009: Error parsing the nested project section in solution file.',
+    'could not evaluate the project: MSB4019: The imported project "/repo/x.props" was not found.  /repo/App.csproj',
   ],
   'not-found': [
     'NU1101: Unable to find package Foo. No packages exist with this id in source(s): nuget.org',
     'NU1102: Unable to find package Foo with version (>= 9.0.0)',
   ],
   other: [
-    'could not evaluate the project: The imported project "x.props" was not found.',
     'obj/project.assets.json belongs to B.csproj: the projects share an intermediate output directory, so restore output cannot be attributed',
     'runtime assemblies restore listed are missing from the package folders (lib/net8.0/Foo.dll); re-run `dotnet restore`',
   ],

src/commands/manifest/scripts/test/dotnet-compat/assert-facts.py

@@ -7,6 +7,7 @@
 """
 import json
 import os
+import re
 import sys
 
 WORK, SDK, CPM_ENTRY = sys.argv[1], sys.argv[2], sys.argv[3]
@@ -129,7 +130,7 @@ def default_phase():
     check('Demo.Ext.DoesNotExist' in log and 'NU1101' in log, 'missing package reported')
     with open(os.path.join(WORK, 'broken.log')) as f:
         log = f.read()
-    check('could not evaluate the project' in log, 'evaluation failure reported')
+    check(re.search(r'could not evaluate the project: MSB\d{4}: ', log), 'evaluation failure reported with its code')
 
 
 def records(name):
@@ -144,10 +145,6 @@ def failures(rows):
     return [r for r in rows if r[0] == 'failure']
 
 
-def info_rows(rows, project, name):
-    return [r for r in rows if r[0] == 'projectInfo' and r[1] == project and r[3] == name]
-
-
 def records_phase():
     basic = records('basic.tsv')
     check(not failures(basic), f'basic failures {failures(basic)}')
@@ -179,14 +176,14 @@ def records_phase():
     check({'src/App/App.csproj', 'src/Extra/Extra.csproj', 'src/Lib/Lib.csproj'} <= unknown, f'unrestored projects reported {sorted(unknown)}')
 
     evaluation = records('evaluation.tsv')
-    problems = [r for r in evaluation if r[0] in ('failure', 'unscannable')]
-    check(not problems, f'evaluation problems {problems}')
+    faults = [r for r in evaluation if r[0] in ('failure', 'unscannable')]
+    check(not faults, f'evaluation faults {faults}')
     lib = [r[2] for r in evaluation if r[0] == 'projectSrc' and r[1] == 'Lib/Lib.csproj']
     check(len(lib) == 1 and lib[0].endswith('/Lib/Class.cs'), f'sources of a project failing any target run {lib}')
     check(any(r[0] == 'project' and r[1] == 'Build.csproj' for r in evaluation), 'compiler-less aggregator recorded')
 
     langs = records('langs.tsv')
-    vb = {r[4] for r in info_rows(langs, 'Vb.vbproj', 'DefineConstant')}
+    vb = {r[4] for r in langs if r[0] == 'projectInfo' and r[1] == 'Vb.vbproj' and r[3] == 'DefineConstant'}
     check({'DEBUG=-1', 'TRACE=-1'} <= vb, f'VB compiler constants {vb}')
     fs = [r[2] for r in langs if r[0] == 'projectSrc' and r[1] == '../Fs/Fs.fsproj']
     check([os.path.basename(f) for f in fs] == ['First.fs', 'Library.fs'], f'F# sources in compile order {fs}')