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

Fixes issue #1415

Browse source
This commit is contained in:
Piotr Puszkiewicz 2016-02-15 23:43:51 -08:00
parent 34f2837356
commit 811f892cf5
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/dotnet-cli-build/TestTargets.cs
View file

@ -204,7 +204,7 @@ namespace Microsoft.DotNet.Cli.Build
return new Dictionary<string, string>(); return new Dictionary<string, string>();
} }
c.Info("Start Collecting Visual Studio Environment Variables"); c.Verbose("Start Collecting Visual Studio Environment Variables");
var vsvarsPath = Path.GetFullPath(Path.Combine(Environment.GetEnvironmentVariable("VS140COMNTOOLS"), "..", "..", "VC")); var vsvarsPath = Path.GetFullPath(Path.Combine(Environment.GetEnvironmentVariable("VS140COMNTOOLS"), "..", "..", "VC"));
@ -236,13 +236,20 @@ set");
var vars = new Dictionary<string, string>(); var vars = new Dictionary<string, string>();
foreach (var line in result.StdOut.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries)) foreach (var line in result.StdOut.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries))
{ {
c.Info($"Adding variable '{line}'");
var splat = line.Split(new[] { '=' }, 2); var splat = line.Split(new[] { '=' }, 2);
vars[splat[0]] = splat[1];
if (splat.Length == 2)
{
c.Verbose($"Adding variable '{line}'");
vars[splat[0]] = splat[1];
}
else
{
c.Info($"Skipping VS Env Variable. Unknown format: '{line}'");
}
} }
c.Info("Finish Collecting Visual Studio Environment Variables"); c.Verbose("Finish Collecting Visual Studio Environment Variables");
return vars; return vars;
} }