Ensure all evaluation data are in binlogs from file-based apps

Author: jjonescz

src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs

@@ -201,7 +201,6 @@ public override int Execute()
         }
 
         Dictionary<string, string?> savedEnvironmentVariables = [];
-        ProjectCollection? projectCollection = null;
         try
         {
             // Set environment variables.
@@ -213,7 +212,7 @@ public override int Execute()
 
             // Set up MSBuild.
             ReadOnlySpan<ILogger> binaryLoggers = binaryLogger is null ? [] : [binaryLogger];
-            projectCollection = new ProjectCollection(
+            var projectCollection = new ProjectCollection(
                 MSBuildArgs.GlobalProperties,
                 [.. binaryLoggers, consoleLogger],
                 ToolsetDefinitionLocations.Default);
@@ -223,19 +222,23 @@ public override int Execute()
                 LogTaskInputs = binaryLoggers.Length != 0,
             };
 
+            // Projects need to be created before BeginBuild is called, otherwise binlog doesn't contain evaluation data.
+            var restoreProject = NoRestore ? null : CreateProjectInstance(projectCollection, addGlobalProperties: AddRestoreGlobalProperties(MSBuildArgs.RestoreGlobalProperties));
+            var buildProject = NoBuild ? null : CreateProjectInstance(projectCollection);
+
+            BuildManager.DefaultBuildManager.BeginBuild(parameters);
+
             // Do a restore first (equivalent to MSBuild's "implicit restore", i.e., `/restore`).
             // See https://github.com/dotnet/msbuild/blob/a1c2e7402ef0abe36bf493e395b04dd2cb1b3540/src/MSBuild/XMake.cs#L1838
             // and https://github.com/dotnet/msbuild/issues/11519.
-            if (!NoRestore)
+            if (restoreProject != null)
             {
                 var restoreRequest = new BuildRequestData(
-                    CreateProjectInstance(projectCollection, addGlobalProperties: AddRestoreGlobalProperties(MSBuildArgs.RestoreGlobalProperties)),
+                    restoreProject,
                     targetsToBuild: ["Restore"],
                     hostServices: null,
                     BuildRequestDataFlags.ClearCachesAfterBuild | BuildRequestDataFlags.SkipNonexistentTargets | BuildRequestDataFlags.IgnoreMissingEmptyAndInvalidImports | BuildRequestDataFlags.FailOnUnresolvedSdk);
 
-                BuildManager.DefaultBuildManager.BeginBuild(parameters);
-
                 var restoreResult = BuildManager.DefaultBuildManager.BuildRequest(restoreRequest);
                 if (restoreResult.OverallResult != BuildResultCode.Success)
                 {
@@ -244,18 +247,12 @@ public override int Execute()
             }
 
             // Then do a build.
-            if (!NoBuild)
+            if (buildProject != null)
             {
                 var buildRequest = new BuildRequestData(
-                    CreateProjectInstance(projectCollection),
+                    buildProject,
                     targetsToBuild: MSBuildArgs.RequestedTargets ?? ["Build"]);
 
-                // For some reason we need to BeginBuild after creating BuildRequestData otherwise the binlog doesn't contain Evaluation.
-                if (NoRestore)
-                {
-                    BuildManager.DefaultBuildManager.BeginBuild(parameters);
-                }
-
                 var buildResult = BuildManager.DefaultBuildManager.BuildRequest(buildRequest);
                 if (buildResult.OverallResult != BuildResultCode.Success)
                 {

test/dotnet.Tests/CommandTests/Run/RunFileTests.cs

@@ -939,8 +939,8 @@ public void BinaryLog_EvaluationData()
         new FileInfo(binaryLogPath).Should().Exist();
 
         var records = BinaryLog.ReadRecords(binaryLogPath).ToList();
-        records.Any(static r => r.Args is ProjectEvaluationStartedEventArgs).Should().BeTrue();
-        records.Any(static r => r.Args is ProjectEvaluationFinishedEventArgs).Should().BeTrue();
+        records.Count(static r => r.Args is ProjectEvaluationStartedEventArgs).Should().Be(2);
+        records.Count(static r => r.Args is ProjectEvaluationFinishedEventArgs).Should().Be(2);
     }
 
     /// <summary>