From 86f539e420a0ded78211ab07122541989eb9fbf2 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Thu, 9 Mar 2017 19:21:49 +0000 Subject: [PATCH 1/4] Update CoreSetup to beta-001711 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3ba773697..0bc882063 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-beta-001697-00 + 2.0.0-beta-001711-00 15.2.0-preview-000047-02 2.0.0-rc4-61325-08 1.1.0-alpha-20170306-2 From 43263cc9c3a8979a921eaa2ba7ebee3e2c4bae3b Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 9 Mar 2017 16:30:29 -0600 Subject: [PATCH 2/4] Add logging for publishing src\redist.csproj --- build/Compile.targets | 1 + .../dotnet-cli-build/DotNetMSBuildTool.cs | 22 ++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/build/Compile.targets b/build/Compile.targets index d48bc1ff6..a016835f7 100644 --- a/build/Compile.targets +++ b/build/Compile.targets @@ -11,6 +11,7 @@ diff --git a/build_projects/dotnet-cli-build/DotNetMSBuildTool.cs b/build_projects/dotnet-cli-build/DotNetMSBuildTool.cs index d70103a46..18cca3ab3 100644 --- a/build_projects/dotnet-cli-build/DotNetMSBuildTool.cs +++ b/build_projects/dotnet-cli-build/DotNetMSBuildTool.cs @@ -9,14 +9,16 @@ namespace Microsoft.DotNet.Cli.Build { public abstract class DotNetMSBuildTool : DotNetTool { - public int MaxCpuCount {get; set;} = 0; + public int MaxCpuCount { get; set; } = 0; - protected override string Args - { + public string Verbosity { get; set; } + + protected override string Args + { get { - return $"{GetMaxCpuCountArg()}"; - } + return $"{GetVerbosityArg()} {GetMaxCpuCountArg()}"; + } } private string GetMaxCpuCountArg() @@ -28,5 +30,15 @@ namespace Microsoft.DotNet.Cli.Build return null; } + + private string GetVerbosityArg() + { + if (!string.IsNullOrEmpty(Verbosity)) + { + return $"--verbosity:{Verbosity}"; + } + + return null; + } } } From 35e3d69a2ff68a1b5e959c96c72f34a3f2daea8c Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 9 Mar 2017 16:35:08 -0600 Subject: [PATCH 3/4] Update ProjectJsonMigration's Roslyn Now that Roslyn is no longer in the Shared Framework, it doesn't make sense to keep using 1.3.0. Instead, we should use the same Roslyn version that we use for csc. --- .../Microsoft.DotNet.ProjectJsonMigration.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj index 3c0c013f2..91aad23fc 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj @@ -24,6 +24,6 @@ - + \ No newline at end of file From 5430d155cc072f53c070343b6ceee6b474c25c53 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Fri, 10 Mar 2017 16:37:40 +0000 Subject: [PATCH 4/4] Update CoreSetup to beta-001728 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0bc882063..4912b7e55 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-beta-001711-00 + 2.0.0-beta-001728-00 15.2.0-preview-000047-02 2.0.0-rc4-61325-08 1.1.0-alpha-20170306-2