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

Merge pull request #5979 from dotnet-bot/master-UpdateDependencies

Browse source 
Update CoreSetup to beta-001711 (master)
This commit is contained in:
Livar 2017-03-09 18:42:08 -08:00 committed by GitHub
commit 374f9ebcee
4 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/Compile.targets
View file

@ -11,6 +11,7 @@
<!-- Publish DotNet -->
<DotNetPublish ToolPath="$(Stage0Directory)"
Verbosity="normal"
Configuration="$(Configuration)"
ProjectPath="$(RootProject)" />
</Target>

2
build/DependencyVersions.props
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CLI_SharedFrameworkVersion>2.0.0-beta-001697-00</CLI_SharedFrameworkVersion>
<CLI_SharedFrameworkVersion>2.0.0-beta-001711-00</CLI_SharedFrameworkVersion>
<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_NETSDK_Version>1.1.0-alpha-20170306-2</CLI_NETSDK_Version>

22
build_projects/dotnet-cli-build/DotNetMSBuildTool.cs
View file

@ -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;
}
}
}

2
src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj
View file

@ -24,6 +24,6 @@
<ItemGroup>
<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>
</Project>