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

Address some PR feedback.

Browse source 
- Make the MSI scripts to use parameters instead of environment variables.
This commit is contained in:
Sridhar Periyasamy 2016-03-07 14:52:41 -08:00
parent 0f679e68bf
commit ae041c8f61
8 changed files with 58 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/Microsoft.DotNet.Cli.Build.Framework/TargetConditions/EnvironmentAttribute.cs
View file

@ -7,9 +7,9 @@ namespace Microsoft.DotNet.Cli.Build.Framework
public class EnvironmentAttribute : TargetConditionAttribute
{
private string _envVar;
private string _expectedVal;
private string[] _expectedVals;
public EnvironmentAttribute(string envVar, string expectedVal)
public EnvironmentAttribute(string envVar, params string[] expectedVals)
{
if (string.IsNullOrEmpty(envVar))
{
@ -17,21 +17,22 @@ namespace Microsoft.DotNet.Cli.Build.Framework
}
_envVar = envVar;
_expectedVal = expectedVal;
_expectedVals = expectedVals;
}
public override bool EvaluateCondition()
{
var actualVal = Environment.GetEnvironmentVariable(_envVar);
if (string.IsNullOrEmpty(_expectedVal))
foreach (var expectedVal in _expectedVals)
{
return string.IsNullOrEmpty(actualVal) ||
actualVal.Equals("0") ||
actualVal.ToLower().Equals("false");
if (string.Equals(actualVal, expectedVal, StringComparison.Ordinal))
{
return true;
}
}
return _expectedVal.Equals(actualVal, StringComparison.Ordinal);
return false;
}
}
}