diff --git a/scripts/dotnet-cli-build/TestTargets.cs b/scripts/dotnet-cli-build/TestTargets.cs index e60810939..6e28d2c0b 100644 --- a/scripts/dotnet-cli-build/TestTargets.cs +++ b/scripts/dotnet-cli-build/TestTargets.cs @@ -204,7 +204,7 @@ namespace Microsoft.DotNet.Cli.Build return new Dictionary(); } - 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")); @@ -236,13 +236,20 @@ set"); var vars = new Dictionary(); foreach (var line in result.StdOut.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries)) { - c.Info($"Adding variable '{line}'"); - 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; }