diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppFullClr/Program.cs b/TestAssets/TestProjects/RunTestsApps/TestAppFullClr/Program.cs index 1d00917a4..7d5689393 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppFullClr/Program.cs +++ b/TestAssets/TestProjects/RunTestsApps/TestAppFullClr/Program.cs @@ -6,7 +6,7 @@ namespace ConsoleApplication { public static void Main(string[] args) { - Console.WriteLine("NET451"); + Console.WriteLine("NET451, ARGS: " + args.Length); } } } diff --git a/src/dotnet/commands/dotnet-run/RunCommand.cs b/src/dotnet/commands/dotnet-run/RunCommand.cs index 5936c2d7a..f8f051da5 100644 --- a/src/dotnet/commands/dotnet-run/RunCommand.cs +++ b/src/dotnet/commands/dotnet-run/RunCommand.cs @@ -124,11 +124,14 @@ namespace Microsoft.DotNet.Tools.Run return result; } - // Add Nuget Packages Probing Path - var nugetPackagesRoot = _context.PackagesDirectory; - var probingPathArg = "--additionalprobingpath"; - _args.Insert(0, nugetPackagesRoot); - _args.Insert(0, probingPathArg); + if (!_context.TargetFramework.IsDesktop()) + { + // Add Nuget Packages Probing Path + var nugetPackagesRoot = _context.PackagesDirectory; + var probingPathArg = "--additionalprobingpath"; + _args.Insert(0, nugetPackagesRoot); + _args.Insert(0, probingPathArg); + } // Now launch the output and give it the results var outputPaths = _context.GetOutputPaths(Configuration); diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RunCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RunCommand.cs index ea832f1da..949801cc7 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RunCommand.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RunCommand.cs @@ -78,6 +78,11 @@ namespace Microsoft.DotNet.Tools.Test.Utilities args = $"run {BuildArgs()} {args}"; return base.Execute(args); } + public override CommandResult ExecuteWithCapturedOutput(string args = "") + { + args = $"run {BuildArgs()} {args}"; + return base.ExecuteWithCapturedOutput(args); + } private string BuildArgs() { diff --git a/test/dotnet-run.Tests/RunTests.cs b/test/dotnet-run.Tests/RunTests.cs index 0ef74da61..b41ecce8b 100644 --- a/test/dotnet-run.Tests/RunTests.cs +++ b/test/dotnet-run.Tests/RunTests.cs @@ -20,7 +20,7 @@ namespace Microsoft.DotNet.Tools.Run.Tests TestInstance instance = TestAssetsManager.CreateTestInstance(Path.Combine(RunTestsBase, "TestAppFullClr")) .WithLockFiles() .WithBuildArtifacts(); - new RunCommand(instance.TestRoot).Execute().Should().Pass(); + new RunCommand(instance.TestRoot).ExecuteWithCapturedOutput().Should().Pass().And.HaveStdOutContaining("NET451, ARGS: 0"); } [Fact]