mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Replacing the short form version of implicit msbuild parameters with longform ones.

Browse source
This commit is contained in:
Livar Cunha 2018-04-02 15:14:32 -07:00
parent 10289504a8
commit b1fca8c4d2
31 changed files with 173 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

42
test/dotnet-msbuild.Tests/GivenDotnetBuildInvocation.cs
View file

@ -9,25 +9,25 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
{
public class GivenDotnetBuildInvocation
{
const string ExpectedPrefix = "exec <msbuildpath> -m -v:m";
const string ExpectedPrefix = "exec <msbuildpath> -maxcpucount -verbosity:m";
[Theory]
[InlineData(new string[] { }, "-t:Build")]
[InlineData(new string[] { "-o", "foo" }, "-t:Build -p:OutputPath=foo")]
[InlineData(new string[] { "-p:Verbosity=diag" }, "-t:Build -p:Verbosity=diag")]
[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[] { "-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", "diag" }, "-t:Build -verbosity:diag")]
[InlineData(new string[] { "--verbosity", "diag" }, "-t:Build -verbosity:diag")]
[InlineData(new string[] { }, "-target:Build")]
[InlineData(new string[] { "-o", "foo" }, "-target:Build -property:OutputPath=foo")]
[InlineData(new string[] { "-property:Verbosity=diag" }, "-target:Build -property:Verbosity=diag")]
[InlineData(new string[] { "--output", "foo" }, "-target:Build -property:OutputPath=foo")]
[InlineData(new string[] { "-o", "foo1 foo2" }, "-target:Build \"-property:OutputPath=foo1 foo2\"")]
[InlineData(new string[] { "--no-incremental" }, "-target:Rebuild")]
[InlineData(new string[] { "-r", "rid" }, "-target:Build -property:RuntimeIdentifier=rid")]
[InlineData(new string[] { "--runtime", "rid" }, "-target:Build -property:RuntimeIdentifier=rid")]
[InlineData(new string[] { "-c", "config" }, "-target:Build -property:Configuration=config")]
[InlineData(new string[] { "--configuration", "config" }, "-target:Build -property:Configuration=config")]
[InlineData(new string[] { "--version-suffix", "mysuffix" }, "-target:Build -property:VersionSuffix=mysuffix")]
[InlineData(new string[] { "--no-dependencies" }, "-target:Build -property:BuildProjectReferences=false")]
[InlineData(new string[] { "-v", "diag" }, "-target:Build -verbosity:diag")]
[InlineData(new string[] { "--verbosity", "diag" }, "-target:Build -verbosity:diag")]
[InlineData(new string[] { "--no-incremental", "-o", "myoutput", "-r", "myruntime", "-v", "diag", "/ArbitrarySwitchForMSBuild" },
"-t:Rebuild -p:OutputPath=myoutput -p:RuntimeIdentifier=myruntime -verbosity:diag /ArbitrarySwitchForMSBuild")]
"-target:Rebuild -property:OutputPath=myoutput -property:RuntimeIdentifier=myruntime -verbosity:diag /ArbitrarySwitchForMSBuild")]
public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs)
{
expectedAdditionalArgs = (string.IsNullOrEmpty(expectedAdditionalArgs) ? "" : $" {expectedAdditionalArgs}");
@ -39,14 +39,14 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
command.GetProcessStartInfo()
.Arguments.Should()
.Be($"{ExpectedPrefix} -restore -clp:Summary{expectedAdditionalArgs}");
.Be($"{ExpectedPrefix} -restore -consoleloggerparameters:Summary{expectedAdditionalArgs}");
}
[Theory]
[InlineData(new string[] { "-f", "tfm" }, "-t:Restore", "-t:Build -p:TargetFramework=tfm")]
[InlineData(new string[] { "-f", "tfm" }, "-target:Restore", "-target:Build -property:TargetFramework=tfm")]
[InlineData(new string[] { "-o", "myoutput", "-f", "tfm", "-v", "diag", "/ArbitrarySwitchForMSBuild" },
"-t:Restore -p:OutputPath=myoutput -verbosity:diag /ArbitrarySwitchForMSBuild",
"-t:Build -p:OutputPath=myoutput -p:TargetFramework=tfm -verbosity:diag /ArbitrarySwitchForMSBuild")]
"-target:Restore -property:OutputPath=myoutput -verbosity:diag /ArbitrarySwitchForMSBuild",
"-target:Build -property:OutputPath=myoutput -property:TargetFramework=tfm -verbosity:diag /ArbitrarySwitchForMSBuild")]
public void MsbuildInvocationIsCorrectForSeparateRestore(
string[] args,
string expectedAdditionalArgsForRestore,
@ -63,7 +63,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
command.GetProcessStartInfo()
.Arguments.Should()
.Be($"{ExpectedPrefix} -nologo -clp:Summary{expectedAdditionalArgs}");
.Be($"{ExpectedPrefix} -nologo -consoleloggerparameters:Summary{expectedAdditionalArgs}");
}
}