From efa717daaa6676e8ca47f1f628cfe4319be84afc Mon Sep 17 00:00:00 2001 From: Brice Lambson Date: Mon, 19 Mar 2018 09:57:09 -0700 Subject: [PATCH 1/5] Bundle dotnet-ef --- build/BundledDotnetTools.props | 1 + build/DependencyVersions.props | 2 +- build/NugetConfigFile.targets | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) 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 e112fbee6..4f9f4a69c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.1.0-preview2-30338 + 2.1.0-preview2-30431 2.1.0-preview2-26314-02 $(MicrosoftNETCoreAppPackageVersion) 15.7.0-preview-000066 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 @@ - + From cd646d2dbca69237c032a5fd6b3292f2fb5ee86b Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Tue, 20 Mar 2018 15:13:08 -0700 Subject: [PATCH 2/5] MSBuild 15.7.122-preview --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f4fd69fc0..2d5dc5ebf 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,7 +4,7 @@ 2.1.0-preview2-30338 2.1.0-preview2-26313-01 $(MicrosoftNETCoreAppPackageVersion) - 15.7.0-preview-000066 + 15.7.0-preview-000122 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From d98928ed21e636adfda2801b7eb0358a2ce5128c Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Sat, 24 Mar 2018 11:59:36 -0500 Subject: [PATCH 3/5] Keep stdout for test execution Work around https://github.com/Microsoft/vstest/issues/1503 by using the MSBuild escape hatch variable MSBUILDENSURESTDOUTFORTASKPROCESSES and ensuring that tests don't run in a disconnected MSBuild process by passing /nr:false. --- src/dotnet/commands/dotnet-test/Program.cs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) 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) From 78c3211cc6ec18e15d267d95954b2df4e76f5e43 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Sat, 24 Mar 2018 21:19:34 -0700 Subject: [PATCH 4/5] MSBuild 15.7.124-preview --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 2d5dc5ebf..0de7eeb11 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,7 +4,7 @@ 2.1.0-preview2-30338 2.1.0-preview2-26313-01 $(MicrosoftNETCoreAppPackageVersion) - 15.7.0-preview-000122 + 15.7.0-preview-000124 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From fbacb9cd4b9f56c8c8f1139493ebe3c149aef320 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Fri, 23 Mar 2018 14:17:25 -0700 Subject: [PATCH 5/5] Insert NuGet Build 4.7.0-preview3.5039 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0de7eeb11..0419b2f2c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -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)