Merge remote-tracking branch 'dotnet/master' into tab-completion
This commit is contained in:
commit
0df2462344
4 changed files with 20 additions and 7 deletions
|
@ -11,6 +11,7 @@
|
||||||
|
|
||||||
<!-- Publish DotNet -->
|
<!-- Publish DotNet -->
|
||||||
<DotNetPublish ToolPath="$(Stage0Directory)"
|
<DotNetPublish ToolPath="$(Stage0Directory)"
|
||||||
|
Verbosity="normal"
|
||||||
Configuration="$(Configuration)"
|
Configuration="$(Configuration)"
|
||||||
ProjectPath="$(RootProject)" />
|
ProjectPath="$(RootProject)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<CLI_SharedFrameworkVersion>2.0.0-beta-001697-00</CLI_SharedFrameworkVersion>
|
<CLI_SharedFrameworkVersion>2.0.0-beta-001728-00</CLI_SharedFrameworkVersion>
|
||||||
<CLI_MSBuild_Version>15.2.0-preview-000047-02</CLI_MSBuild_Version>
|
<CLI_MSBuild_Version>15.2.0-preview-000047-02</CLI_MSBuild_Version>
|
||||||
<CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
|
<CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
|
||||||
<CLI_NETSDK_Version>1.1.0-alpha-20170306-2</CLI_NETSDK_Version>
|
<CLI_NETSDK_Version>1.1.0-alpha-20170306-2</CLI_NETSDK_Version>
|
||||||
|
|
|
@ -9,14 +9,16 @@ namespace Microsoft.DotNet.Cli.Build
|
||||||
{
|
{
|
||||||
public abstract class DotNetMSBuildTool : DotNetTool
|
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
|
get
|
||||||
{
|
{
|
||||||
return $"{GetMaxCpuCountArg()}";
|
return $"{GetVerbosityArg()} {GetMaxCpuCountArg()}";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private string GetMaxCpuCountArg()
|
private string GetMaxCpuCountArg()
|
||||||
|
@ -28,5 +30,15 @@ namespace Microsoft.DotNet.Cli.Build
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private string GetVerbosityArg()
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(Verbosity))
|
||||||
|
{
|
||||||
|
return $"--verbosity:{Verbosity}";
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,6 +24,6 @@
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" />
|
<PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" />
|
||||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.0" />
|
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(CLI_Roslyn_Version)" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
Loading…
Add table
Add a link
Reference in a new issue