fix a few more expectations

Author: baronfel

test/dotnet-watch.Tests/CommandLineOptionsTests.cs

@@ -424,7 +424,7 @@ public void ShortFormForLaunchProfileArgumentWorks()
         [InlineData(new[] { "--framework", "net9.0" }, new[] { "-property:TargetFramework=net9.0", NugetInteractiveProperty })]
         [InlineData(new[] { "--runtime", "arm64" }, new[] { "-property:RuntimeIdentifier=arm64", "-property:_CommandLineDefinedRuntimeIdentifier=true", NugetInteractiveProperty })]
         [InlineData(new[] { "--property", "b=1" }, new[] { "--property:b=1", NugetInteractiveProperty })]
-        [InlineData(new[] { "--interactive" }, new[] { NugetInteractiveProperty })]
+        [InlineData(new[] { "--interactive" }, new[] { "-property:NuGetInteractive=true" })]
         [InlineData(new[] { "--no-restore" }, new[] { NugetInteractiveProperty, "-restore:false" })]
         [InlineData(new[] { "--sc" }, new[] { NugetInteractiveProperty, "-property:SelfContained=True", "-property:_CommandLineDefinedSelfContained=true" })]
         [InlineData(new[] { "--self-contained" }, new[] { NugetInteractiveProperty, "-property:SelfContained=True", "-property:_CommandLineDefinedSelfContained=true" })]

test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPublishInvocation.cs

@@ -19,6 +19,7 @@ public GivenDotnetPublishInvocation(ITestOutputHelper output)
 
         private static readonly string[] ExpectedPrefix = ["-maxcpucount", "-verbosity:m", "-tlp:default=auto", "-nologo"];
         private static readonly string[] ExpectedProperties = ["--property:_IsPublishing=true"];
+        private static readonly string NuGetDisabledProperty = "-property:NuGetInteractive=false";
 
         [Theory]
         [InlineData(new string[] { }, new string[] { })]
@@ -56,7 +57,7 @@ public void MsbuildInvocationIsCorrect(string[] args, string[] expectedAdditiona
 
                 command.GetArgumentTokensToMSBuild()
                     .Should()
-                    .BeEquivalentTo([.. ExpectedPrefix, "-restore", "-target:Publish", .. ExpectedProperties, .. expectedAdditionalArgs]);
+                    .BeEquivalentTo([.. ExpectedPrefix, "-restore", "-target:Publish", .. ExpectedProperties, .. expectedAdditionalArgs, NuGetDisabledProperty]);
             });
         }
 
@@ -68,14 +69,23 @@ public void MsbuildInvocationIsCorrectForSeparateRestore(string[] args, string[]
             var msbuildPath = "<msbuildpath>";
             var command = PublishCommand.FromArgs(args, msbuildPath);
 
-            command.SeparateRestoreCommand
-                   .GetArgumentTokensToMSBuild()
+            var restoreTokens =
+                command.SeparateRestoreCommand
+                   .GetArgumentTokensToMSBuild();
+            output.WriteLine("restore tokens:");
+            output.WriteLine(string.Join(" ", restoreTokens));
+            restoreTokens
                    .Should()
-                   .BeEquivalentTo([.. ExpectedPrefix, "-target:Restore", "-tlp:verbosity=quiet", .. ExpectedProperties]);
+                   .BeEquivalentTo([.. ExpectedPrefix, "-target:Restore", "-tlp:verbosity=quiet", .. ExpectedProperties, NuGetDisabledProperty]);
 
-            command.GetArgumentTokensToMSBuild()
+            var buildTokens =
+                command.GetArgumentTokensToMSBuild();
+            output.WriteLine("build tokens:");
+            output.WriteLine(string.Join(" ", buildTokens));
+
+            buildTokens
                    .Should()
-                   .BeEquivalentTo([.. ExpectedPrefix, "-nologo", "-target:Publish", .. ExpectedProperties, .. expectedAdditionalArgs]);
+                   .BeEquivalentTo([.. ExpectedPrefix, "-nologo", "-target:Publish", .. ExpectedProperties, .. expectedAdditionalArgs, NuGetDisabledProperty]);
         }
 
         [Fact]
@@ -90,7 +100,7 @@ public void MsbuildInvocationIsCorrectForNoBuild()
 
             command.GetArgumentTokensToMSBuild()
                    .Should()
-                   .BeEquivalentTo([.. ExpectedPrefix, "-target:Publish", .. ExpectedProperties, "-property:NoBuild=true"]);
+                   .BeEquivalentTo([.. ExpectedPrefix, "-target:Publish", .. ExpectedProperties, "-property:NoBuild=true", NuGetDisabledProperty]);
         }
 
         [Fact]
@@ -101,7 +111,7 @@ public void CommandAcceptsMultipleCustomProperties()
 
             command.GetArgumentTokensToMSBuild()
                .Should()
-               .BeEquivalentTo([.. ExpectedPrefix, "-restore", "-target:Publish", .. ExpectedProperties, "--property:Prop1=prop1", "--property:Prop2=prop2"]);
+               .BeEquivalentTo([.. ExpectedPrefix, "-restore", "-target:Publish", .. ExpectedProperties, "--property:Prop1=prop1", "--property:Prop2=prop2", NuGetDisabledProperty]);
         }
     }
 }

test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetRestoreInvocation.cs

@@ -9,6 +9,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     public class GivenDotnetRestoreInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
         private static readonly string[] ExpectedPrefix = ["-maxcpucount", "-verbosity:m", "-tlp:default=auto", "-nologo", "-target:Restore"];
+        private static readonly string NuGetDisabledProperty = "-property:NuGetInteractive=false";
         private static readonly string WorkingDirectory =
             TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetRestoreInvocation));
 
@@ -49,7 +50,7 @@ public void MsbuildInvocationIsCorrect(string[] args, string[] expectedAdditiona
                 RestoreCommand.FromArgs(args, msbuildPath)
                     .GetArgumentTokensToMSBuild()
                     .Should()
-                    .BeEquivalentTo([.. ExpectedPrefix, .. expectedAdditionalArgs]);
+                    .BeEquivalentTo([.. ExpectedPrefix, .. expectedAdditionalArgs, NuGetDisabledProperty]);
             });
         }
     }

test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetRunInvocation.cs

@@ -9,6 +9,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     public class GivenDotnetRunInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
         private static readonly string[] ConstantRestoreArgs = ["-nologo", "-verbosity:quiet"];
+        private static readonly string NuGetDisabledProperty = "-property:NuGetInteractive=false";
 
         public ITestOutputHelper Log { get; }
 
@@ -41,7 +42,7 @@ public void MsbuildInvocationIsCorrect(string[] args, string[] expectedArgs)
                     var command = RunCommand.FromArgs(args);
                     command.RestoreArgs
                         .Should()
-                        .BeEquivalentTo([.. ConstantRestoreArgs, .. expectedArgs]);
+                        .BeEquivalentTo([.. ConstantRestoreArgs, .. expectedArgs, NuGetDisabledProperty]);
                 });
             }
             finally

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

@@ -697,23 +697,6 @@ public void ItRunsWithTheSpecifiedVerbosity()
             }
         }
 
-        [Fact]
-        public void ItDoesShowImportantLevelMessageByDefault()
-        {
-            var testAppName = "MSBuildTestApp";
-            var testInstance = _testAssetsManager.CopyTestAsset(testAppName)
-                .WithSource()
-                .WithProjectChanges(ProjectModification.AddDisplayMessageBeforeRestoreToProject);
-
-            var result = new DotnetCommand(Log, "run")
-                .WithWorkingDirectory(testInstance.Path)
-                .Execute();
-
-            // this message should show because interactivity (and therefore nuget auth) is the default
-            result.Should().Pass()
-                .And.HaveStdOutContaining("Important text");
-        }
-
         [Fact]
         public void ItDoesNotShowImportantLevelMessageByDefaultWhenInteractivityDisabled()
         {