Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into build-refactor1
Conflicts: scripts/Microsoft.DotNet.Cli.Build.Framework/CurrentPlatform.cs scripts/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildPlatform.cs
This commit is contained in:
commit
3edcab8eab
112 changed files with 3673 additions and 723 deletions
|
@ -48,6 +48,15 @@ namespace Microsoft.DotNet.Cli.Build.Framework
|
|||
}
|
||||
}
|
||||
|
||||
public static bool IsRHEL
|
||||
{
|
||||
get
|
||||
{
|
||||
var osname = PlatformServices.Default.Runtime.OperatingSystem;
|
||||
return string.Equals(osname, "rhel", StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
}
|
||||
|
||||
public static bool IsUnix
|
||||
{
|
||||
get
|
||||
|
@ -60,7 +69,7 @@ namespace Microsoft.DotNet.Cli.Build.Framework
|
|||
{
|
||||
get
|
||||
{
|
||||
return IsUbuntu || IsCentOS;
|
||||
return IsUbuntu || IsCentOS || IsRHEL;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -76,6 +85,8 @@ namespace Microsoft.DotNet.Cli.Build.Framework
|
|||
return IsOSX;
|
||||
case BuildPlatform.CentOS:
|
||||
return IsCentOS;
|
||||
case BuildPlatform.RHEL:
|
||||
return IsRHEL;
|
||||
case BuildPlatform.Unix:
|
||||
return IsUnix;
|
||||
case BuildPlatform.Linux:
|
||||
|
@ -103,10 +114,14 @@ namespace Microsoft.DotNet.Cli.Build.Framework
|
|||
{
|
||||
return BuildPlatform.CentOS;
|
||||
}
|
||||
else if (IsRHEL)
|
||||
{
|
||||
return BuildPlatform.RHEL;
|
||||
}
|
||||
else
|
||||
{
|
||||
return default(BuildPlatform);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue