Extend dotnet run to invoke a run-command-producing Target

.gitignore

@@ -42,3 +42,6 @@ cmake/
 
 # MSBuild Logs
 **/MSBuild_Logs/MSBuild_pid-*.failure.txt
+
+# Test results
+**/*.trx

src/Cli/dotnet/CommonOptions.cs

@@ -129,7 +129,7 @@ public static CliArgument<string> DefaultToCurrentDirectory(this CliArgument<str
             {
                 Description = CommonLocalizableStrings.DisableBuildServersOptionDescription
             }
-            .ForwardAsMany(_ => new string[] { "-p:UseRazorBuildServer=false", "-p:UseSharedCompilation=false", "/nodeReuse:false" });
+            .ForwardAsMany(_ => ["--property:UseRazorBuildServer=false", "--property:UseSharedCompilation=false", "/nodeReuse:false"]);
 
         public static CliOption<string> ArchitectureOption =
             new ForwardedOption<string>("--arch", "-a")

src/Cli/dotnet/OptionForwardingExtensions.cs

@@ -44,7 +44,7 @@ public static ForwardedOption<string[]> ForwardAsProperty(this ForwardedOption<s
             .SetForwardingFunction((optionVals) =>
                 optionVals
                     .SelectMany(Utils.MSBuildPropertyParser.ParseProperties)
-                    .Select(keyValue => $"{option.Name}:{keyValue.key}={keyValue.value}")
+                    .Select(keyValue => keyValue.value == "" ? $"{option.Name}:{keyValue.key}" : $"{option.Name}:{keyValue.key}={keyValue.value}")
                 );
 
         public static CliOption<T> ForwardAsMany<T>(this ForwardedOption<T> option, Func<T, IEnumerable<string>> format) => option.SetForwardingFunction(format);

src/Cli/dotnet/ParseResultExtensions.cs

@@ -54,7 +54,7 @@ public static void ShowHelpOrErrorIfAppropriate(this ParseResult parseResult)
                 }
             }
 
-            ///<summary>Splits a .NET format string by the format placeholders (the {N} parts) to get an array of the literal parts, to be used in message-checking</summary> 
+            ///<summary>Splits a .NET format string by the format placeholders (the {N} parts) to get an array of the literal parts, to be used in message-checking</summary>
             static string[] DistinctFormatStringParts(string formatString)
             {
                 return Regex.Split(formatString, @"{[0-9]+}"); // match the literal '{', followed by any of 0-9 one or more times, followed by the literal '}'
@@ -173,8 +173,8 @@ public static bool BothArchAndOsOptionsSpecified(this ParseResult parseResult) =
 
         internal static string GetCommandLineRuntimeIdentifier(this ParseResult parseResult)
         {
-            return parseResult.HasOption(RunCommandParser.RuntimeOption) ?
-                parseResult.GetValue(RunCommandParser.RuntimeOption) :
+            return parseResult.HasOption(CommonOptions.RuntimeOption) ?
+                parseResult.GetValue(CommonOptions.RuntimeOption) :
                 parseResult.HasOption(CommonOptions.OperatingSystemOption) ||
                 parseResult.HasOption(CommonOptions.ArchitectureOption) ||
                 parseResult.HasOption(CommonOptions.LongFormArchitectureOption) ?

src/Cli/dotnet/commands/dotnet-run/LocalizableStrings.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -180,6 +180,10 @@ The current {1} is '{2}'.</value>
     <value>The launch profile "{0}" could not be applied.
 {1}</value>
   </data>
+  <data name="RunCommandEvaluationExceptionBuildFailed" xml:space="preserve">
+    <value>Running the {0} target to discover run commands failed for this project. Fix the errors and warnings and run again.</value>
+    <comment>{0} is the name of an MSBuild target</comment>
+  </data>
   <data name="DefaultLaunchProfileDisplayName" xml:space="preserve">
     <value>(Default)</value>
   </data>
@@ -206,7 +210,7 @@ The current {1} is '{2}'.</value>
     <value>An error was encountered when reading launchSettings.json.
 {0}</value>
   </data>
-  <data name="RunCommandSpecifiecFileIsNotAValidProject" xml:space="preserve">
+  <data name="RunCommandSpecifiedFileIsNotAValidProject" xml:space="preserve">
     <value>'{0}' is not a valid project file.</value>
   </data>
   <data name="CouldNotConvertToBoolean" xml:space="preserve">

src/Cli/dotnet/commands/dotnet-run/Program.cs

@@ -18,24 +18,21 @@ public static RunCommand FromArgs(string[] args)
 
         public static RunCommand FromParseResult(ParseResult parseResult)
         {
-            var project = parseResult.GetValue(RunCommandParser.ProjectOption);
             if (parseResult.UsingRunCommandShorthandProjectOption())
             {
                 Reporter.Output.WriteLine(LocalizableStrings.RunCommandProjectAbbreviationDeprecated.Yellow());
-                project = parseResult.GetRunCommandShorthandProjectValues().FirstOrDefault();
+                parseResult = ModifyParseResultForShorthandProjectOption(parseResult);
             }
 
             var command = new RunCommand(
-                configuration: parseResult.GetValue(RunCommandParser.ConfigurationOption),
-                framework: parseResult.GetValue(RunCommandParser.FrameworkOption),
-                runtime: parseResult.GetCommandLineRuntimeIdentifier(),
                 noBuild: parseResult.HasOption(RunCommandParser.NoBuildOption),
-                project: project,
+                projectFileOrDirectory: parseResult.GetValue(RunCommandParser.ProjectOption),
                 launchProfile: parseResult.GetValue(RunCommandParser.LaunchProfileOption),
                 noLaunchProfile: parseResult.HasOption(RunCommandParser.NoLaunchProfileOption),
                 noRestore: parseResult.HasOption(RunCommandParser.NoRestoreOption) || parseResult.HasOption(RunCommandParser.NoBuildOption),
                 interactive: parseResult.HasOption(RunCommandParser.InteractiveOption),
-                restoreArgs: parseResult.OptionValuesToBeForwarded(RunCommandParser.GetCommand()),
+                verbosity: parseResult.HasOption(CommonOptions.VerbosityOption) ? parseResult.GetValue(CommonOptions.VerbosityOption) : null,
+                restoreArgs: parseResult.OptionValuesToBeForwarded(RunCommandParser.GetCommand()).ToArray(),
                 args: parseResult.GetValue(RunCommandParser.ApplicationArguments)
             );
 
@@ -48,5 +45,54 @@ public static int Run(ParseResult parseResult)
 
             return FromParseResult(parseResult).Execute();
         }
+
+        public static ParseResult ModifyParseResultForShorthandProjectOption(ParseResult parseResult)
+        {
+            // we know the project is going to be one of the following forms:
+            //   -p:project
+            //   -p project
+            // so try to find those and filter them out of the arguments array
+            var possibleProject = parseResult.GetRunCommandShorthandProjectValues().FirstOrDefault()!;
+            var tokensMinusProject = new List<string>();
+            var nextTokenMayBeProject = false;
+            foreach (var token in parseResult.Tokens)
+            {
+                if (token.Value == "-p")
+                {
+                    // skip this token, if the next token _is_ the project then we'll skip that too
+                    // if the next token _isn't_ the project then we'll backfill
+                    nextTokenMayBeProject = true;
+                    continue;
+                }
+                else if (token.Value == possibleProject && nextTokenMayBeProject)
+                {
+                    // skip, we've successfully stripped this option and value entirely
+                    nextTokenMayBeProject = false;
+                    continue;
+                }
+                else if (token.Value.StartsWith("-p") && token.Value.EndsWith(possibleProject))
+                {
+                    // both option and value in the same token, skip and carry on
+                }
+                else
+                {
+                    if (nextTokenMayBeProject)
+                    {
+                        //we skipped a -p, so backfill it
+                        tokensMinusProject.Add("-p");
+                    }
+                    nextTokenMayBeProject = false;
+                }
+
+                tokensMinusProject.Add(token.Value);
+            }
+
+            tokensMinusProject.Add("--project");
+            tokensMinusProject.Add(possibleProject);
+
+            var tokensToParse = tokensMinusProject.ToArray();
+            var newParseResult = Parser.Instance.Parse(tokensToParse);
+            return newParseResult;
+        }
     }
 }