Merge pull request #29065 from dsplaisted/error-solution-output-path

Add error when specifying --output option for a solution

Author: dsplaisted

src/Cli/dotnet/OptionForwardingExtensions.cs

@@ -18,6 +18,32 @@ public static class OptionForwardingExtensions
 
         public static ForwardedOption<T> ForwardAsSingle<T>(this ForwardedOption<T> option, Func<T, string> format) => option.SetForwardingFunction(format);
 
+        /// <summary>
+        /// Set up an option to be forwaded as an output path to MSBuild
+        /// </summary>
+        /// <param name="option">The command line option</param>
+        /// <param name="outputPropertyName">The property name for the output path (such as OutputPath or PublishDir)</param>
+        /// <param name="surroundWithDoubleQuotes">Whether the path should be surrounded with double quotes.  This may not be necessary but preserves the provious behavior of "dotnet test"</param>
+        /// <returns>The option</returns>
+        public static ForwardedOption<string> ForwardAsOutputPath(this ForwardedOption<string> option, string outputPropertyName, bool surroundWithDoubleQuotes = false)
+        {
+            return option.SetForwardingFunction((string o) =>
+            {
+                string argVal = CommandDirectoryContext.GetFullPath(o);
+                if (surroundWithDoubleQuotes)
+                {
+                    //  Not sure if this is necessary, but this is what "dotnet test" previously did and so we are
+                    //  preserving the behavior here after refactoring
+                    argVal = TestCommandParser.SurroundWithDoubleQuotes(argVal);
+                }
+                return new string[]
+                {
+                    $"-property:{outputPropertyName}={argVal}",
+                    "-property:_CommandLineDefinedOutputPath=true"
+                };
+            });
+        }
+
         public static ForwardedOption<string[]> ForwardAsProperty(this ForwardedOption<string[]> option) => option
             .SetForwardingFunction((optionVals) =>
                 optionVals

src/Cli/dotnet/commands/dotnet-build/BuildCommandParser.cs

@@ -24,7 +24,7 @@ internal static class BuildCommandParser
         public static readonly Option<string> OutputOption = new ForwardedOption<string>(new string[] { "-o", "--output" }, LocalizableStrings.OutputOptionDescription)
         {
             ArgumentHelpName = LocalizableStrings.OutputOptionName
-        }.ForwardAsSingle(arg => $"-property:OutputPath={CommandDirectoryContext.GetFullPath(arg)}");
+        }.ForwardAsOutputPath("OutputPath");
 
         public static readonly Option<bool> NoIncrementalOption = new Option<bool>("--no-incremental", LocalizableStrings.NoIncrementalOptionDescription);
 

src/Cli/dotnet/commands/dotnet-clean/CleanCommandParser.cs

@@ -24,7 +24,7 @@ internal static class CleanCommandParser
         public static readonly Option<string> OutputOption = new ForwardedOption<string>(new string[] { "-o", "--output" }, LocalizableStrings.CmdOutputDirDescription)
         {
             ArgumentHelpName = LocalizableStrings.CmdOutputDir
-        }.ForwardAsSingle(o => $"-property:OutputPath={CommandDirectoryContext.GetFullPath(o)}");
+        }.ForwardAsOutputPath("OutputPath");
 
         public static readonly Option<bool> NoLogoOption = new ForwardedOption<bool>("--nologo", LocalizableStrings.CmdNoLogo)
             .ForwardAs("-nologo");

src/Cli/dotnet/commands/dotnet-pack/PackCommandParser.cs

@@ -24,7 +24,7 @@ internal static class PackCommandParser
         public static readonly Option<string> OutputOption = new ForwardedOption<string>(new string[] { "-o", "--output" }, LocalizableStrings.CmdOutputDirDescription)
         {
             ArgumentHelpName = LocalizableStrings.CmdOutputDir
-        }.ForwardAsSingle(o => $"-property:PackageOutputPath={CommandDirectoryContext.GetFullPath(o)}");
+        }.ForwardAsOutputPath("PackageOutputPath");
 
         public static readonly Option<bool> NoBuildOption = new ForwardedOption<bool>("--no-build", LocalizableStrings.CmdNoBuildOptionDescription)
             .ForwardAs("-property:NoBuild=true");

src/Cli/dotnet/commands/dotnet-publish/PublishCommandParser.cs

@@ -25,7 +25,7 @@ internal static class PublishCommandParser
         public static readonly Option<string> OuputOption = new ForwardedOption<string>(new string[] { "-o", "--output" }, LocalizableStrings.OutputOptionDescription)
         {
             ArgumentHelpName = LocalizableStrings.OutputOption
-        }.ForwardAsSingle(o => $"-property:PublishDir={CommandDirectoryContext.GetFullPath(o)}");
+        }.ForwardAsOutputPath("PublishDir");
 
         public static readonly Option<IEnumerable<string>> ManifestOption = new ForwardedOption<IEnumerable<string>>("--manifest", LocalizableStrings.ManifestOptionDescription)
         {

src/Cli/dotnet/commands/dotnet-store/StoreCommandParser.cs

@@ -54,7 +54,7 @@ internal static class StoreCommandParser
         public static readonly Option<string> OutputOption = new ForwardedOption<string>(new string[] { "-o", "--output" }, LocalizableStrings.OutputOptionDescription)
         {
             ArgumentHelpName = LocalizableStrings.OutputOption
-        }.ForwardAsSingle(o => $"-property:ComposeDir={CommandDirectoryContext.GetFullPath(o)}");
+        }.ForwardAsOutputPath("ComposeDir");
 
         public static readonly Option<string> WorkingDirOption = new ForwardedOption<string>(new string[] { "-w", "--working-dir" }, LocalizableStrings.IntermediateWorkingDirOptionDescription)
         {

src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs

@@ -61,7 +61,8 @@ internal static class TestCommandParser
         public static readonly Option<string> OutputOption = new ForwardedOption<string>(new string[] { "-o", "--output" }, LocalizableStrings.CmdOutputDescription)
         {
             ArgumentHelpName = LocalizableStrings.CmdOutputDir
-        }.ForwardAsSingle(o => $"-property:OutputPath={SurroundWithDoubleQuotes(CommandDirectoryContext.GetFullPath(o))}");
+        }
+        .ForwardAsOutputPath("OutputPath", true);
 
         public static readonly Option<string> DiagOption = new ForwardedOption<string>(new string[] { "-d", "--diag" }, LocalizableStrings.CmdPathTologFileDescription)
         {

src/Tasks/Common/Resources/Strings.resx

@@ -879,4 +879,8 @@ You may need to build the project on another operating system or architecture, o
     <value>NETSDK1193: If PublishSelfContained is set, it must be either true or false. The value given was '{0}'.</value>
     <comment>{StrBegin="NETSDK1193: "}</comment>
   </data>
+    <data name="CannotHaveSolutionLevelOutputPath" xml:space="preserve">
+    <value>NETSDK1194: The "--output" option isn't supported when building a solution.</value>
+    <comment>{StrBegin="NETSDK1194: "}</comment>
+  </data>
 </root>

src/Tasks/Common/Resources/xlf/Strings.cs.xlf

@@ -142,6 +142,11 @@
         <target state="translated">NETSDK1099: Publikování do jednoho souboru je podporované jen u spustitelných aplikací.</target>
         <note>{StrBegin="NETSDK1099: "}</note>
       </trans-unit>
+      <trans-unit id="CannotHaveSolutionLevelOutputPath">
+        <source>NETSDK1194: The "--output" option isn't supported when building a solution.</source>
+        <target state="new">NETSDK1194: The "--output" option isn't supported when building a solution.</target>
+        <note>{StrBegin="NETSDK1194: "}</note>
+      </trans-unit>
       <trans-unit id="CannotHaveSolutionLevelRuntimeIdentifier">
         <source>NETSDK1134: Building a solution with a specific RuntimeIdentifier is not supported. If you would like to publish for a single RID, specifiy the RID at the individual project level instead.</source>
         <target state="translated">NETSDK1134: Vytváření řešení s konkrétním identifikátorem RuntimeIdentifier se nepodporuje. Pokud chcete publikovat pro jedno RID, zadejte místo toho RID na úrovni jednotlivých projektů.</target>

src/Tasks/Common/Resources/xlf/Strings.de.xlf

@@ -142,6 +142,11 @@
         <target state="translated">NETSDK1099: Die Veröffentlichung in einer einzelnen Datei wird nur für ausführbare Anwendungen unterstützt.</target>
         <note>{StrBegin="NETSDK1099: "}</note>
       </trans-unit>
+      <trans-unit id="CannotHaveSolutionLevelOutputPath">
+        <source>NETSDK1194: The "--output" option isn't supported when building a solution.</source>
+        <target state="new">NETSDK1194: The "--output" option isn't supported when building a solution.</target>
+        <note>{StrBegin="NETSDK1194: "}</note>
+      </trans-unit>
       <trans-unit id="CannotHaveSolutionLevelRuntimeIdentifier">
         <source>NETSDK1134: Building a solution with a specific RuntimeIdentifier is not supported. If you would like to publish for a single RID, specifiy the RID at the individual project level instead.</source>
         <target state="translated">NETSDK1134: Das Erstellen einer Lösung mit einem bestimmten RuntimeIdentifier wird nicht unterstützt. Wenn Sie für eine einzelne RID veröffentlichen möchten, geben Sie die RID auf individueller Projektebene an.</target>

src/Tasks/Common/Resources/xlf/Strings.es.xlf

@@ -142,6 +142,11 @@
         <target state="translated">NETSDK1099: La publicación en un archivo único solo se admite con aplicaciones ejecutables.</target>
         <note>{StrBegin="NETSDK1099: "}</note>
       </trans-unit>
+      <trans-unit id="CannotHaveSolutionLevelOutputPath">
+        <source>NETSDK1194: The "--output" option isn't supported when building a solution.</source>
+        <target state="new">NETSDK1194: The "--output" option isn't supported when building a solution.</target>
+        <note>{StrBegin="NETSDK1194: "}</note>
+      </trans-unit>
       <trans-unit id="CannotHaveSolutionLevelRuntimeIdentifier">
         <source>NETSDK1134: Building a solution with a specific RuntimeIdentifier is not supported. If you would like to publish for a single RID, specifiy the RID at the individual project level instead.</source>
         <target state="translated">NETSDK1134: No se admite la compilación de una solución con un valor RuntimeIdentifier específico. Si quiere publicar para un solo RID, especifique el RID en el nivel de proyecto individual en su lugar.</target>

src/Tasks/Common/Resources/xlf/Strings.fr.xlf

@@ -142,6 +142,11 @@
         <target state="translated">NETSDK1099: La publication dans un fichier unique n'est prise en charge que pour les applications exécutables.</target>
         <note>{StrBegin="NETSDK1099: "}</note>
       </trans-unit>
+      <trans-unit id="CannotHaveSolutionLevelOutputPath">
+        <source>NETSDK1194: The "--output" option isn't supported when building a solution.</source>
+        <target state="new">NETSDK1194: The "--output" option isn't supported when building a solution.</target>
+        <note>{StrBegin="NETSDK1194: "}</note>
+      </trans-unit>
       <trans-unit id="CannotHaveSolutionLevelRuntimeIdentifier">
         <source>NETSDK1134: Building a solution with a specific RuntimeIdentifier is not supported. If you would like to publish for a single RID, specifiy the RID at the individual project level instead.</source>
         <target state="translated">NETSDK1134: La génération d'une solution avec un RuntimeIdentifier spécifique n'est pas prise en charge. Si vous voulez publier pour un RID unique, spécifiez le RID au niveau du projet individuel à la place.</target>

src/Tasks/Common/Resources/xlf/Strings.it.xlf

@@ -142,6 +142,11 @@
         <target state="translated">NETSDK1099: la pubblicazione in un singolo file è supportata solo per le applicazioni eseguibili.</target>
         <note>{StrBegin="NETSDK1099: "}</note>
       </trans-unit>
+      <trans-unit id="CannotHaveSolutionLevelOutputPath">
+        <source>NETSDK1194: The "--output" option isn't supported when building a solution.</source>
+        <target state="new">NETSDK1194: The "--output" option isn't supported when building a solution.</target>
+        <note>{StrBegin="NETSDK1194: "}</note>
+      </trans-unit>
       <trans-unit id="CannotHaveSolutionLevelRuntimeIdentifier">
         <source>NETSDK1134: Building a solution with a specific RuntimeIdentifier is not supported. If you would like to publish for a single RID, specifiy the RID at the individual project level instead.</source>
         <target state="translated">NETSDK1134: non è possibile compilare una soluzione con un parametro RuntimeIdentifier specifico. Per pubblicare per un singolo RID, specificare il RID a livello di singolo progetto.</target>