2 files changed, 35 insertions, 6 deletions

diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs
index 48f1b214..5097bd9b 100644
--- a/src/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -13,20 +13,20 @@ namespace WixToolset.Core.CommandLine
 
     internal class BuildCommand : ICommandLineCommand
     {
-        public BuildCommand(IServiceProvider serviceProvider, IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables, IEnumerable<string> locFiles, IEnumerable<string> libraryFiles, string outputPath, OutputType outputType, string cabCachePath, IEnumerable<string> cultures, bool bindFiles, IEnumerable<BindPath> bindPaths, IEnumerable<string> includeSearchPaths, string intermediateFolder, string contentsFile, string outputsFile, string builtOutputsFile)
+        public BuildCommand(IServiceProvider serviceProvider, IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables, IEnumerable<string> locFiles, IEnumerable<string> libraryFiles, IEnumerable<string> filterCultures, string outputPath, OutputType outputType, string cabCachePath, bool bindFiles, IEnumerable<BindPath> bindPaths, IEnumerable<string> includeSearchPaths, string intermediateFolder, string contentsFile, string outputsFile, string builtOutputsFile)
         {
             this.ServiceProvider = serviceProvider;
             this.Messaging = serviceProvider.GetService<IMessaging>();
             this.ExtensionManager = serviceProvider.GetService<IExtensionManager>();
             this.LocFiles = locFiles;
             this.LibraryFiles = libraryFiles;
+            this.FilterCultures = filterCultures;
             this.PreprocessorVariables = preprocessorVariables;
             this.SourceFiles = sources;
             this.OutputPath = outputPath;
             this.OutputType = outputType;
 
             this.CabCachePath = cabCachePath;
-            this.Cultures = cultures;
             this.BindFiles = bindFiles;
             this.BindPaths = bindPaths;
             this.IncludeSearchPaths = includeSearchPaths;
@@ -43,6 +43,8 @@ namespace WixToolset.Core.CommandLine
 
         public IExtensionManager ExtensionManager { get; }
 
+        public IEnumerable<string> FilterCultures { get; }
+
         public IEnumerable<string> IncludeSearchPaths { get; }
 
         public IEnumerable<string> LocFiles { get; }
@@ -59,8 +61,6 @@ namespace WixToolset.Core.CommandLine
 
         public string CabCachePath { get; }
 
-        public IEnumerable<string> Cultures { get; }
-
         public bool BindFiles { get; }
 
         public IEnumerable<BindPath> BindPaths { get; }
@@ -205,6 +205,7 @@ namespace WixToolset.Core.CommandLine
             {
                 var resolver = new Resolver(this.ServiceProvider);
                 resolver.BindPaths = this.BindPaths;
+                resolver.FilterCultures = this.FilterCultures;
                 resolver.IntermediateFolder = this.IntermediateFolder;
                 resolver.IntermediateRepresentation = output;
                 resolver.Localizations = localizations;
diff --git a/src/WixToolset.Core/CommandLine/CommandLineParser.cs b/src/WixToolset.Core/CommandLine/CommandLineParser.cs
index 500bed08..f4bc8ade 100644
--- a/src/WixToolset.Core/CommandLine/CommandLineParser.cs
+++ b/src/WixToolset.Core/CommandLine/CommandLineParser.cs
@@ -114,7 +114,7 @@ namespace WixToolset.Core.CommandLine
                             cmdline.GetNextArgumentOrError(ref cabCachePath);
                             return true;
 
-                        case "cultures":
+                        case "culture":
                             cmdline.GetNextArgumentOrError(cultures);
                             return true;
                         case "contentsfile":
@@ -210,8 +210,9 @@ namespace WixToolset.Core.CommandLine
                         var sourceFiles = GatherSourceFiles(files, outputFolder);
                         var variables = this.GatherPreprocessorVariables(defines);
                         var bindPathList = this.GatherBindPaths(bindPaths);
+                        var filterCultures = CalculateFilterCultures(cultures);
                         var type = CalculateOutputType(outputType, outputFile);
-                        return new BuildCommand(this.ServiceProvider, sourceFiles, variables, locFiles, libraryFiles, outputFile, type, cabCachePath, cultures, bindFiles, bindPathList, includePaths, intermediateFolder, contentsFile, outputsFile, builtOutputsFile);
+                        return new BuildCommand(this.ServiceProvider, sourceFiles, variables, locFiles, libraryFiles, filterCultures, outputFile, type, cabCachePath, bindFiles, bindPathList, includePaths, intermediateFolder, contentsFile, outputsFile, builtOutputsFile);
                     }
 
                 case Commands.Compile:
@@ -225,6 +226,33 @@ namespace WixToolset.Core.CommandLine
             return null;
         }
 
+        private static IEnumerable<string> CalculateFilterCultures(List<string> cultures)
+        {
+            var result = new List<string>();
+
+            if (cultures == null)
+            {
+            }
+            else if (cultures.Count == 1 && cultures[0].Equals("null", StringComparison.OrdinalIgnoreCase))
+            {
+                // When null is used treat it as if cultures wasn't specified. This is
+                // needed for batching in the MSBuild task since MSBuild doesn't support
+                // empty items.
+            }
+            else
+            {
+                foreach (var culture in cultures)
+                {
+                    // Neutral is different from null. For neutral we still want to do culture filtering.
+                    // Set the culture to the empty string = identifier for the invariant culture.
+                    var filter = (culture.Equals("neutral", StringComparison.OrdinalIgnoreCase)) ? String.Empty : culture;
+                    result.Add(filter);
+                }
+            }
+
+            return result;
+        }
+
         private static OutputType CalculateOutputType(string outputType, string outputFile)
         {
             if (String.IsNullOrEmpty(outputType))