WIP working end-to-end

Author: jonathanpeppers

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

@@ -149,20 +149,15 @@ public int Execute()
             ? LoggerUtility.DetermineBinlogger([.. MSBuildArgs.OtherMSBuildArgs], "dotnet-run")
             : null;
 
-        // Create selector for project-based runs to handle framework/device selection and deploy
-        using var selector = ProjectFileFullPath is not null
-            ? new RunCommandSelector(
-                ProjectFileFullPath,
-                MSBuildArgs,
-                Interactive,
-                logger)
-            : null;
-
         try
         {
             // Pre-run evaluation: Handle target framework and device selection for project-based scenarios
-            if (selector is not null && !TrySelectTargetFrameworkAndDeviceIfNeeded(selector))
+            // This must happen before build so the selected framework/device are used during build
+            // The method will run restore first (if needed) then create and return a selector
+            RunCommandSelector? selector = null;
+            if (ProjectFileFullPath is not null && !TrySelectTargetFrameworkAndDeviceIfNeeded(logger, out selector))
             {
+                selector?.Dispose();
                 // If --list-devices was specified, this is a successful exit
                 return ListDevices ? 0 : 1;
             }
@@ -206,13 +201,17 @@ public int Execute()
 
             // Deploy step: Call DeployToDevice target if available
             // This must run even with --no-build, as the user may have selected a different device
-            if (selector is not null && !selector.TryDeployToDevice())
+            if (selector is not null)
             {
-                // Only error if we have a valid project (not a .sln file, etc.)
-                if (selector.HasValidProject)
+                if (!selector.TryDeployToDevice())
                 {
-                    throw new GracefulException(CliCommandStrings.RunCommandDeployFailed);
+                    // Only error if we have a valid project (not a .sln file, etc.)
+                    if (selector.HasValidProject)
+                    {
+                        throw new GracefulException(CliCommandStrings.RunCommandDeployFailed);
+                    }
                 }
+                selector.Dispose();
             }
 
             ICommand targetCommand = GetTargetCommand(projectFactory, cachedRunProperties, logger);
@@ -246,14 +245,22 @@ public int Execute()
 
     /// <summary>
     /// Checks if target framework selection and device selection are needed.
-    /// Uses a single RunCommandSelector instance for both operations, re-evaluating
-    /// the project after framework selection to get the correct device list.
+    /// Creates a RunCommandSelector for framework and device selection.
+    /// Note: Project evaluation requires restore to have completed first.
     /// </summary>
-    /// <param name="selector">The selector to use for framework and device selection</param>
+    /// <param name="logger">Optional logger for MSBuild operations</param>
+    /// <param name="selector">Output parameter for the created selector, needed for later deployment</param>
     /// <returns>True if we can continue, false if we should exit</returns>
-    private bool TrySelectTargetFrameworkAndDeviceIfNeeded(RunCommandSelector selector)
+    private bool TrySelectTargetFrameworkAndDeviceIfNeeded(FacadeLogger? logger, out RunCommandSelector? selector)
     {
-        Debug.Assert(selector is not null);
+        Debug.Assert(ProjectFileFullPath is not null);
+
+        // Create the selector - note that project evaluation happens lazily, not here
+        selector = new RunCommandSelector(
+            ProjectFileFullPath,
+            MSBuildArgs,
+            Interactive,
+            logger);
 
         var globalProperties = CommonRunHelpers.GetGlobalPropertiesFromArgs(MSBuildArgs);
 

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

@@ -26,7 +26,7 @@ internal sealed class RunCommandSelector : IDisposable
     private readonly string _projectFilePath;
     private readonly Dictionary<string, string> _globalProperties;
     private readonly FacadeLogger? _binaryLogger;
-    private readonly ILogger? _consoleLogger;
+    private readonly MSBuildArgs _msbuildArgs;
     private readonly bool _isInteractive;
 
     private ProjectCollection? _collection;
@@ -53,7 +53,7 @@ public RunCommandSelector(
         _globalProperties = CommonRunHelpers.GetGlobalPropertiesFromArgs(msbuildArgs);
         _isInteractive = isInteractive;
         _binaryLogger = binaryLogger;
-        _consoleLogger = CommonRunHelpers.GetConsoleLogger(msbuildArgs);
+        _msbuildArgs = msbuildArgs;
     }
 
     /// <summary>
@@ -120,8 +120,9 @@ private bool OpenProjectIfNeeded([NotNullWhen(true)] out ProjectInstance? projec
     {
         if (_project is not null)
         {
-            Debug.Assert(_projectInstance is not null);
-            projectInstance = _projectInstance;
+            // Create a fresh ProjectInstance for each build operation
+            // to avoid accumulating state from previous builds
+            projectInstance = _project.CreateProjectInstance();
             return true;
         }
 
@@ -478,12 +479,12 @@ public bool TryDeployToDevice()
 
     /// <summary>
     /// Gets the list of loggers to use for MSBuild operations.
+    /// Creates a fresh console logger each time to avoid disposal issues when calling Build() multiple times.
     /// </summary>
     private IEnumerable<ILogger> GetLoggers()
     {
         if (_binaryLogger is not null)
             yield return _binaryLogger;
-        if (_consoleLogger is not null)
-            yield return _consoleLogger;
+        yield return CommonRunHelpers.GetConsoleLogger(_msbuildArgs);
     }
 }