diff --git a/build/BundledDotnetTools.props b/build/BundledDotnetTools.props index 29c483c57..ceb89cfd2 100644 --- a/build/BundledDotnetTools.props +++ b/build/BundledDotnetTools.props @@ -1,6 +1,7 @@ + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b227ba810..574715c5d 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,10 +1,10 @@ - 2.1.0-preview2-30338 + 2.1.0-preview2-30431 2.1.0-preview2-26314-02 $(MicrosoftNETCoreAppPackageVersion) - 15.7.0-preview-000066 + 15.7.0-preview-000124 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) @@ -35,7 +35,7 @@ $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-62628-01 1.6.0-beta2-25304 - 4.7.0-preview1-4927 + 4.7.0-preview3.5039 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 01752b66d..d491ebee2 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -20,7 +20,7 @@ - + diff --git a/src/dotnet/commands/dotnet-test/Program.cs b/src/dotnet/commands/dotnet-test/Program.cs index 69c7739f6..c8a9d41d4 100644 --- a/src/dotnet/commands/dotnet-test/Program.cs +++ b/src/dotnet/commands/dotnet-test/Program.cs @@ -32,6 +32,7 @@ namespace Microsoft.DotNet.Tools.Test { "/t:VSTest", "/v:quiet", + "/nodereuse:false", // workaround for https://github.com/Microsoft/vstest/issues/1503 "/nologo" }; @@ -95,7 +96,23 @@ namespace Microsoft.DotNet.Tools.Test return e.ExitCode; } - return cmd.Execute(); + // Workaround for https://github.com/Microsoft/vstest/issues/1503 + const string NodeWindowEnvironmentName = "MSBUILDENSURESTDOUTFORTASKPROCESSES"; + string previousNodeWindowSetting = Environment.GetEnvironmentVariable(NodeWindowEnvironmentName); + + int result = -1; + + try + { + Environment.SetEnvironmentVariable(NodeWindowEnvironmentName, "1"); + result = cmd.Execute(); + } + finally + { + Environment.SetEnvironmentVariable(NodeWindowEnvironmentName, previousNodeWindowSetting); + } + + return result; } private static string GetSemiColonEscapedString(string arg)