Fix passing /p:DISABLE_CROSSGEN on cli.

When passing a property using the commandline, it is not flown through to "dotnet publish" calls.  So instead of using "dotnet publish", just use the MSBuild task to invoke the Publish target on the reidst project.  This way properties flow correctly.

I also did a little cleaning of unused build logic.
This commit is contained in:
Eric Erhardt 2017-04-04 17:50:28 -05:00
parent a616c04a38
commit a7becbe6d8
6 changed files with 2 additions and 39 deletions

View file

@ -50,7 +50,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
build\OutputDirectories.props = build\OutputDirectories.props build\OutputDirectories.props = build\OutputDirectories.props
build\Package.targets = build\Package.targets build\Package.targets = build\Package.targets
build\Prepare.targets = build\Prepare.targets build\Prepare.targets = build\Prepare.targets
build\ProjectsToPublish.props = build\ProjectsToPublish.props
build\Publish.targets = build\Publish.targets build\Publish.targets = build\Publish.targets
build\Run.targets = build\Run.targets build\Run.targets = build\Run.targets
build\sdks\sdks.csproj = build\sdks\sdks.csproj build\sdks\sdks.csproj = build\sdks\sdks.csproj

View file

@ -10,9 +10,7 @@
<MakeDir Directories="$(OutputDirectory)"/> <MakeDir Directories="$(OutputDirectory)"/>
<!-- Publish DotNet --> <!-- Publish DotNet -->
<DotNetPublish ToolPath="$(Stage0Directory)" <MSBuild Projects="$(SrcDirectory)/redist/redist.csproj"
Verbosity="normal" Targets="Publish" />
Configuration="$(Configuration)"
ProjectPath="$(RootProject)" />
</Target> </Target>
</Project> </Project>

View file

@ -1,5 +0,0 @@
<Project>
<PropertyGroup>
<RootProject>$(SrcDirectory)/redist/redist.csproj</RootProject>
</PropertyGroup>
</Project>

View file

@ -7,8 +7,6 @@ namespace Microsoft.DotNet.Cli.Build
{ {
public class BuildVersion : Version public class BuildVersion : Version
{ {
public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}";
public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}"; public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}";
public string NuGetVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}";
} }
} }

View file

@ -2,37 +2,11 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information. // Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
using Microsoft.DotNet.Cli.Build.Framework;
namespace Microsoft.DotNet.Cli.Build namespace Microsoft.DotNet.Cli.Build
{ {
public class EnvVars public class EnvVars
{ {
public static readonly bool Verbose = GetBool("DOTNET_BUILD_VERBOSE");
public static bool GetBool(string name, bool defaultValue = false)
{
var str = Environment.GetEnvironmentVariable(name);
if (string.IsNullOrEmpty(str))
{
return defaultValue;
}
switch (str.ToLowerInvariant())
{
case "true":
case "1":
case "yes":
return true;
case "false":
case "0":
case "no":
return false;
default:
return defaultValue;
}
}
public static string EnsureVariable(string variableName) public static string EnsureVariable(string variableName)
{ {
string value = Environment.GetEnvironmentVariable(variableName); string value = Environment.GetEnvironmentVariable(variableName);

View file

@ -30,7 +30,6 @@
<Import Project="build/FileExtensions.props" /> <Import Project="build/FileExtensions.props" />
<Import Project="build/InputDirectories.props" /> <Import Project="build/InputDirectories.props" />
<Import Project="build/MSBuildExtensions.props" /> <Import Project="build/MSBuildExtensions.props" />
<Import Project="build/ProjectsToPublish.props" />
<Import Project="build/OutputDirectories.props" /> <Import Project="build/OutputDirectories.props" />
<Import Project="build/BuildDefaults.props" /> <Import Project="build/BuildDefaults.props" />
<Import Project="build/Stage0.props" /> <Import Project="build/Stage0.props" />