From 58b8be53fd966e3d475362912477a422f5b5aa11 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 27 Dec 2017 22:58:19 -0800 Subject: Correctly join command line arguments and other small clean up and optimizations --- src/WixToolset.Core/CommandLine/CommandLineParser.cs | 2 +- src/WixToolset.Core/Librarian.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/WixToolset.Core') diff --git a/src/WixToolset.Core/CommandLine/CommandLineParser.cs b/src/WixToolset.Core/CommandLine/CommandLineParser.cs index 017810e0..3c7f3d1e 100644 --- a/src/WixToolset.Core/CommandLine/CommandLineParser.cs +++ b/src/WixToolset.Core/CommandLine/CommandLineParser.cs @@ -54,7 +54,7 @@ namespace WixToolset.Core.CommandLine if (!String.IsNullOrEmpty(context.Arguments)) { - args = CommandLineParser.ParseArgumentsToArray(context.Arguments).Union(args).ToArray(); + args = CommandLineParser.ParseArgumentsToArray(context.Arguments).Concat(args).ToArray(); } return this.ParseStandardCommandLine(context, args); diff --git a/src/WixToolset.Core/Librarian.cs b/src/WixToolset.Core/Librarian.cs index 3e843070..f4191e86 100644 --- a/src/WixToolset.Core/Librarian.cs +++ b/src/WixToolset.Core/Librarian.cs @@ -143,7 +143,7 @@ namespace WixToolset.Core foreach (var tuple in sections.SelectMany(s => s.Tuples)) { - foreach (var field in tuple.Fields.Where(f => f.Type == IntermediateFieldType.Path)) + foreach (var field in tuple.Fields.Where(f => f?.Type == IntermediateFieldType.Path)) { var pathField = field.AsPath(); -- cgit v1.2.3-55-g6feb