From 03544ad0cd7160c128ff296ee54ef7e9f8ce648f Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Thu, 9 Mar 2017 16:39:49 -0800 Subject: [PATCH] Build Unit Tests --- src/dotnet/commands/dotnet-build/Program.cs | 4 ++-- .../GivenDotnetBuildInvocation.cs | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/dotnet/commands/dotnet-build/Program.cs b/src/dotnet/commands/dotnet-build/Program.cs index c3e9d8a0f..77c2f0870 100644 --- a/src/dotnet/commands/dotnet-build/Program.cs +++ b/src/dotnet/commands/dotnet-build/Program.cs @@ -44,12 +44,12 @@ namespace Microsoft.DotNet.Tools.Build msbuildArgs.Add("/t:Build"); } - msbuildArgs.Add($"/clp:Summary"); - msbuildArgs.AddRange(appliedBuildOptions.OptionValuesToBeForwarded()); msbuildArgs.AddRange(appliedBuildOptions.Arguments); + msbuildArgs.Add($"/clp:Summary"); + return new BuildCommand(msbuildArgs, msbuildPath); } diff --git a/test/dotnet-msbuild.Tests/GivenDotnetBuildInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetBuildInvocation.cs index eb3b7256e..687b13f2e 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetBuildInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetBuildInvocation.cs @@ -18,16 +18,16 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests [InlineData(new string[] { "--output", "foo" }, "/t:Build /p:OutputPath=foo")] [InlineData(new string[] { "-o", "foo1 foo2" }, "/t:Build \"/p:OutputPath=foo1 foo2\"")] [InlineData(new string[] { "--no-incremental" }, "/t:Rebuild")] - [InlineData(new string[] { "-f", "framework" }, "/t:Build /p:TargetFramework=framework")] - [InlineData(new string[] { "--framework", "framework" }, "/t:Build /p:TargetFramework=framework")] - [InlineData(new string[] { "-r", "runtime" }, "/t:Build /p:RuntimeIdentifier=runtime")] - [InlineData(new string[] { "--runtime", "runtime" }, "/t:Build /p:RuntimeIdentifier=runtime")] - [InlineData(new string[] { "-c", "configuration" }, "/t:Build /p:Configuration=configuration")] - [InlineData(new string[] { "--configuration", "configuration" }, "/t:Build /p:Configuration=configuration")] + [InlineData(new string[] { "-f", "tfm" }, "/t:Build /p:TargetFramework=tfm")] + [InlineData(new string[] { "--framework", "tfm" }, "/t:Build /p:TargetFramework=tfm")] + [InlineData(new string[] { "-r", "rid" }, "/t:Build /p:RuntimeIdentifier=rid")] + [InlineData(new string[] { "--runtime", "rid" }, "/t:Build /p:RuntimeIdentifier=rid")] + [InlineData(new string[] { "-c", "config" }, "/t:Build /p:Configuration=config")] + [InlineData(new string[] { "--configuration", "config" }, "/t:Build /p:Configuration=config")] [InlineData(new string[] { "--version-suffix", "mysuffix" }, "/t:Build /p:VersionSuffix=mysuffix")] [InlineData(new string[] { "--no-dependencies" }, "/t:Build /p:BuildProjectReferences=false")] - [InlineData(new string[] { "-v", "verbosity" }, "/t:Build /verbosity:verbosity")] - [InlineData(new string[] { "--verbosity", "verbosity" }, "/t:Build /verbosity:verbosity")] + [InlineData(new string[] { "-v", "diag" }, "/t:Build /verbosity:diag")] + [InlineData(new string[] { "--verbosity", "diag" }, "/t:Build /verbosity:diag")] [InlineData(new string[] { "--no-incremental", "-o", "myoutput", "-r", "myruntime", "-v", "diag" }, "/t:Rebuild /p:OutputPath=myoutput /p:RuntimeIdentifier=myruntime /verbosity:diag")] public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs) {