Update cli tests from merge

sfoslund · sfoslund · commit 7d4d129ba432 · 2021-07-16T15:34:23.000-07:00
diff --git a/src/Cli/dotnet/CommonOptions.cs b/src/Cli/dotnet/CommonOptions.cs
@@ -95,13 +95,13 @@ public static Option<bool> InteractiveOption() =>
 
         public static Option<bool> DebugOption() => new Option<bool>("--debug");
 
-        public static Option SelfContainedOption() =>
+        public static Option<bool> SelfContainedOption() =>
             new ForwardedOption<bool>(
                 "--self-contained",
                 CommonLocalizableStrings.SelfContainedOptionDescription)
             .ForwardAsMany(o => new string[] { $"-property:SelfContained={o}", "-property:_CommandLineDefinedSelfContained=true" });
 
-        public static Option NoSelfContainedOption() =>
+        public static Option<bool> NoSelfContainedOption() =>
             new ForwardedOption<bool>(
                 "--no-self-contained",
                 CommonLocalizableStrings.FrameworkDependentOptionDescription)
diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf
@@ -736,9 +736,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1150: "}</note>
       </trans-unit>
       <trans-unit id="SelfContainedOptionShouldBeUsedWithRuntime">
-        <source>NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
-        <target state="new">NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
-        <note>{StrBegin="NETSDK1176: "}</note>
+        <source>NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
+        <target state="new">NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
+        <note>{StrBegin="NETSDK1178: "}</note>
       </trans-unit>
       <trans-unit id="SkippingAdditionalProbingPaths">
         <source>NETSDK1048: 'AdditionalProbingPaths' were specified for GenerateRuntimeConfigurationFiles, but are being skipped because 'RuntimeConfigDevPath' is empty.</source>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf
@@ -736,9 +736,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1150: "}</note>
       </trans-unit>
       <trans-unit id="SelfContainedOptionShouldBeUsedWithRuntime">
-        <source>NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
-        <target state="new">NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
-        <note>{StrBegin="NETSDK1176: "}</note>
+        <source>NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
+        <target state="new">NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
+        <note>{StrBegin="NETSDK1178: "}</note>
       </trans-unit>
       <trans-unit id="SkippingAdditionalProbingPaths">
         <source>NETSDK1048: 'AdditionalProbingPaths' were specified for GenerateRuntimeConfigurationFiles, but are being skipped because 'RuntimeConfigDevPath' is empty.</source>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf
@@ -736,9 +736,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1150: "}</note>
       </trans-unit>
       <trans-unit id="SelfContainedOptionShouldBeUsedWithRuntime">
-        <source>NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
-        <target state="new">NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
-        <note>{StrBegin="NETSDK1176: "}</note>
+        <source>NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
+        <target state="new">NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
+        <note>{StrBegin="NETSDK1178: "}</note>
       </trans-unit>
       <trans-unit id="SkippingAdditionalProbingPaths">
         <source>NETSDK1048: 'AdditionalProbingPaths' were specified for GenerateRuntimeConfigurationFiles, but are being skipped because 'RuntimeConfigDevPath' is empty.</source>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf
@@ -736,9 +736,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1150: "}</note>
       </trans-unit>
       <trans-unit id="SelfContainedOptionShouldBeUsedWithRuntime">
-        <source>NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
-        <target state="new">NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
-        <note>{StrBegin="NETSDK1176: "}</note>
+        <source>NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
+        <target state="new">NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
+        <note>{StrBegin="NETSDK1178: "}</note>
       </trans-unit>
       <trans-unit id="SkippingAdditionalProbingPaths">
         <source>NETSDK1048: 'AdditionalProbingPaths' were specified for GenerateRuntimeConfigurationFiles, but are being skipped because 'RuntimeConfigDevPath' is empty.</source>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf
@@ -736,9 +736,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1150: "}</note>
       </trans-unit>
       <trans-unit id="SelfContainedOptionShouldBeUsedWithRuntime">
-        <source>NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
-        <target state="new">NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
-        <note>{StrBegin="NETSDK1176: "}</note>
+        <source>NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
+        <target state="new">NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
+        <note>{StrBegin="NETSDK1178: "}</note>
       </trans-unit>
       <trans-unit id="SkippingAdditionalProbingPaths">
         <source>NETSDK1048: 'AdditionalProbingPaths' were specified for GenerateRuntimeConfigurationFiles, but are being skipped because 'RuntimeConfigDevPath' is empty.</source>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf
@@ -736,9 +736,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1150: "}</note>
       </trans-unit>
       <trans-unit id="SelfContainedOptionShouldBeUsedWithRuntime">
-        <source>NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
-        <target state="new">NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
-        <note>{StrBegin="NETSDK1176: "}</note>
+        <source>NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
+        <target state="new">NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
+        <note>{StrBegin="NETSDK1178: "}</note>
       </trans-unit>
       <trans-unit id="SkippingAdditionalProbingPaths">
         <source>NETSDK1048: 'AdditionalProbingPaths' were specified for GenerateRuntimeConfigurationFiles, but are being skipped because 'RuntimeConfigDevPath' is empty.</source>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf
@@ -736,9 +736,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1150: "}</note>
       </trans-unit>
       <trans-unit id="SelfContainedOptionShouldBeUsedWithRuntime">
-        <source>NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
-        <target state="new">NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
-        <note>{StrBegin="NETSDK1176: "}</note>
+        <source>NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
+        <target state="new">NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
+        <note>{StrBegin="NETSDK1178: "}</note>
       </trans-unit>
       <trans-unit id="SkippingAdditionalProbingPaths">
         <source>NETSDK1048: 'AdditionalProbingPaths' were specified for GenerateRuntimeConfigurationFiles, but are being skipped because 'RuntimeConfigDevPath' is empty.</source>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf
@@ -736,9 +736,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1150: "}</note>
       </trans-unit>
       <trans-unit id="SelfContainedOptionShouldBeUsedWithRuntime">
-        <source>NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
-        <target state="new">NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
-        <note>{StrBegin="NETSDK1176: "}</note>
+        <source>NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
+        <target state="new">NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
+        <note>{StrBegin="NETSDK1178: "}</note>
       </trans-unit>
       <trans-unit id="SkippingAdditionalProbingPaths">
         <source>NETSDK1048: 'AdditionalProbingPaths' were specified for GenerateRuntimeConfigurationFiles, but are being skipped because 'RuntimeConfigDevPath' is empty.</source>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
@@ -736,9 +736,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1150: "}</note>
       </trans-unit>
       <trans-unit id="SelfContainedOptionShouldBeUsedWithRuntime">
-        <source>NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
-        <target state="new">NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
-        <note>{StrBegin="NETSDK1176: "}</note>
+        <source>NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
+        <target state="new">NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
+        <note>{StrBegin="NETSDK1178: "}</note>
       </trans-unit>
       <trans-unit id="SkippingAdditionalProbingPaths">
         <source>NETSDK1048: 'AdditionalProbingPaths' were specified for GenerateRuntimeConfigurationFiles, but are being skipped because 'RuntimeConfigDevPath' is empty.</source>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf
@@ -736,9 +736,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1150: "}</note>
       </trans-unit>
       <trans-unit id="SelfContainedOptionShouldBeUsedWithRuntime">
-        <source>NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
-        <target state="new">NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
-        <note>{StrBegin="NETSDK1176: "}</note>
+        <source>NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
+        <target state="new">NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
+        <note>{StrBegin="NETSDK1178: "}</note>
       </trans-unit>
       <trans-unit id="SkippingAdditionalProbingPaths">
         <source>NETSDK1048: 'AdditionalProbingPaths' were specified for GenerateRuntimeConfigurationFiles, but are being skipped because 'RuntimeConfigDevPath' is empty.</source>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf
@@ -736,9 +736,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1150: "}</note>
       </trans-unit>
       <trans-unit id="SelfContainedOptionShouldBeUsedWithRuntime">
-        <source>NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
-        <target state="new">NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
-        <note>{StrBegin="NETSDK1176: "}</note>
+        <source>NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
+        <target state="new">NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
+        <note>{StrBegin="NETSDK1178: "}</note>
       </trans-unit>
       <trans-unit id="SkippingAdditionalProbingPaths">
         <source>NETSDK1048: 'AdditionalProbingPaths' were specified for GenerateRuntimeConfigurationFiles, but are being skipped because 'RuntimeConfigDevPath' is empty.</source>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf
@@ -736,9 +736,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1150: "}</note>
       </trans-unit>
       <trans-unit id="SelfContainedOptionShouldBeUsedWithRuntime">
-        <source>NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
-        <target state="new">NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
-        <note>{StrBegin="NETSDK1176: "}</note>
+        <source>NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
+        <target state="new">NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
+        <note>{StrBegin="NETSDK1178: "}</note>
       </trans-unit>
       <trans-unit id="SkippingAdditionalProbingPaths">
         <source>NETSDK1048: 'AdditionalProbingPaths' were specified for GenerateRuntimeConfigurationFiles, but are being skipped because 'RuntimeConfigDevPath' is empty.</source>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf
@@ -736,9 +736,9 @@ The following are names of parameters or literal values and should not be transl
         <note>{StrBegin="NETSDK1150: "}</note>
       </trans-unit>
       <trans-unit id="SelfContainedOptionShouldBeUsedWithRuntime">
-        <source>NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
-        <target state="new">NETSDK1177: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
-        <note>{StrBegin="NETSDK1176: "}</note>
+        <source>NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</source>
+        <target state="new">NETSDK1178: The  '--self-contained' or '--no-self-contained' option should be used with '-r|--runtime'.</target>
+        <note>{StrBegin="NETSDK1178: "}</note>
       </trans-unit>
       <trans-unit id="SkippingAdditionalProbingPaths">
         <source>NETSDK1048: 'AdditionalProbingPaths' were specified for GenerateRuntimeConfigurationFiles, but are being skipped because 'RuntimeConfigDevPath' is empty.</source>
diff --git a/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
@@ -187,7 +187,7 @@ public void It_warns_on_rid_without_self_contained_options()
                .Should()
                .Pass()
                .And
-               .HaveStdOutContaining("NETSDK1177");
+               .HaveStdOutContaining("NETSDK1178");
         }
 
         [Fact]
@@ -203,7 +203,7 @@ public void It_does_not_warn_on_rid_with_self_contained_options()
                .Should()
                .Pass()
                .And
-               .NotHaveStdOutContaining("NETSDK1177");
+               .NotHaveStdOutContaining("NETSDK1178");
         }
 
         [Fact]
@@ -219,7 +219,7 @@ public void It_does_not_warn_on_rid_with_self_contained_options_prior_to_net6()
                .Should()
                .Pass()
                .And
-               .NotHaveStdOutContaining("NETSDK1177");
+               .NotHaveStdOutContaining("NETSDK1178");
         }
     }
 }
diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs
@@ -21,8 +21,8 @@ public class GivenDotnetBuildInvocation : IClassFixture<NullCurrentSessionIdFixt
         [InlineData(new string[] { "--output", "foo" }, "-property:OutputPath=<cwd>foo")]
         [InlineData(new string[] { "-o", "foo1 foo2" }, "\"-property:OutputPath=<cwd>foo1 foo2\"")]
         [InlineData(new string[] { "--no-incremental" }, "-target:Rebuild")]
-        [InlineData(new string[] { "-r", "rid" }, "-property:RuntimeIdentifier=rid")]
-        [InlineData(new string[] { "--runtime", "rid" }, "-property:RuntimeIdentifier=rid")]
+        [InlineData(new string[] { "-r", "rid" }, "-property:RuntimeIdentifier=rid -property:_CommandLineDefinedRuntimeIdentifier=true")]
+        [InlineData(new string[] { "--runtime", "rid" }, "-property:RuntimeIdentifier=rid -property:_CommandLineDefinedRuntimeIdentifier=true")]
         [InlineData(new string[] { "--use-current-runtime" }, "-property:UseCurrentRuntimeIdentifier=True")]
         [InlineData(new string[] { "-c", "config" }, "-property:Configuration=config")]
         [InlineData(new string[] { "--configuration", "config" }, "-property:Configuration=config")]
@@ -31,7 +31,7 @@ public class GivenDotnetBuildInvocation : IClassFixture<NullCurrentSessionIdFixt
         [InlineData(new string[] { "-v", "diag" }, "-verbosity:diag")]
         [InlineData(new string[] { "--verbosity", "diag" }, "-verbosity:diag")]
         [InlineData(new string[] { "--no-incremental", "-o", "myoutput", "-r", "myruntime", "-v", "diag", "/ArbitrarySwitchForMSBuild" },
-                                  "-target:Rebuild -property:RuntimeIdentifier=myruntime -verbosity:diag -property:OutputPath=<cwd>myoutput /ArbitrarySwitchForMSBuild")]
+                                  "-target:Rebuild -property:RuntimeIdentifier=myruntime -property:_CommandLineDefinedRuntimeIdentifier=true -verbosity:diag -property:OutputPath=<cwd>myoutput /ArbitrarySwitchForMSBuild")]
         [InlineData(new string[] { "/t:CustomTarget" }, "/t:CustomTarget")]
         public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs)
         {
diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPublishInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPublishInvocation.cs
@@ -24,8 +24,8 @@ public GivenDotnetPublishInvocation(ITestOutputHelper output)
 
         [Theory]
         [InlineData(new string[] { }, "")]
-        [InlineData(new string[] { "-r", "<rid>" }, "-property:RuntimeIdentifier=<rid>")]
-        [InlineData(new string[] { "--runtime", "<rid>" }, "-property:RuntimeIdentifier=<rid>")]
+        [InlineData(new string[] { "-r", "<rid>" }, "-property:RuntimeIdentifier=<rid> -property:_CommandLineDefinedRuntimeIdentifier=true")]
+        [InlineData(new string[] { "--runtime", "<rid>" }, "-property:RuntimeIdentifier=<rid> -property:_CommandLineDefinedRuntimeIdentifier=true")]
         [InlineData(new string[] { "--use-current-runtime" }, "-property:UseCurrentRuntimeIdentifier=True")]
         [InlineData(new string[] { "-o", "<publishdir>" }, "-property:PublishDir=<cwd><publishdir>")]
         [InlineData(new string[] { "--output", "<publishdir>" }, "-property:PublishDir=<cwd><publishdir>")]
diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetStoreInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetStoreInvocation.cs
