1 files changed, 58 insertions, 8 deletions

diff --git a/src/WixToolset.Core/Resolver.cs b/src/WixToolset.Core/Resolver.cs
index c2d5cc87..03cf344b 100644
--- a/src/WixToolset.Core/Resolver.cs
+++ b/src/WixToolset.Core/Resolver.cs
@@ -31,6 +31,8 @@ namespace WixToolset.Core
 
         public IEnumerable<Localization> Localizations { get; set; }
 
+        public IEnumerable<string> FilterCultures { get; set; }
+
         public ResolveResult Execute()
         {
             var extensionManager = this.ServiceProvider.GetService<IExtensionManager>();
@@ -40,6 +42,7 @@ namespace WixToolset.Core
             context.BindPaths = this.BindPaths;
             context.Extensions = extensionManager.Create<IResolverExtension>();
             context.ExtensionData = extensionManager.Create<IExtensionData>();
+            context.FilterCultures = this.FilterCultures;
             context.IntermediateFolder = this.IntermediateFolder;
             context.IntermediateRepresentation = this.IntermediateRepresentation;
             context.Localizations = this.Localizations;
@@ -207,29 +210,76 @@ namespace WixToolset.Core
         {
             var creator = context.ServiceProvider.GetService<ITupleDefinitionCreator>();
 
+            var localizations = FilterLocalizations(context);
+
+            foreach (var localization in localizations)
+            {
+                context.VariableResolver.AddLocalization(localization);
+            }
+
+            // Gather all the wix variables.
+            var wixVariableTuples = context.IntermediateRepresentation.Sections.SelectMany(s => s.Tuples).OfType<WixVariableTuple>();
+            foreach (var tuple in wixVariableTuples)
+            {
+                context.VariableResolver.AddVariable(tuple.SourceLineNumbers, tuple.WixVariable, tuple.Value, tuple.Overridable);
+            }
+        }
+
+        private static IEnumerable<Localization> FilterLocalizations(IResolveContext context)
+        {
+            var result = new List<Localization>();
+            var filter = CalculateCultureFilter(context);
+
             var localizations = context.Localizations.Concat(context.IntermediateRepresentation.Localizations).ToList();
 
-            // Add localizations from the extensions with data.
+            // If there still is no filter, return all localizations.
+            AddFilteredLocalizations(result, filter, localizations);
+
+            // Filter localizations provided by extensions with data.
+            var creator = context.ServiceProvider.GetService<ITupleDefinitionCreator>();
+
             foreach (var data in context.ExtensionData)
             {
                 var library = data.GetLibrary(creator);
 
                 if (library?.Localizations != null)
                 {
-                    localizations.AddRange(library.Localizations);
+                    var extensionFilter = (!filter.Any() && data.DefaultCulture != null) ? new[] { data.DefaultCulture } : filter;
+
+                    AddFilteredLocalizations(result, extensionFilter, library.Localizations);
                 }
             }
 
-            foreach (var localization in localizations)
+            return result;
+        }
+
+        private static IEnumerable<string> CalculateCultureFilter(IResolveContext context)
+        {
+            var filter = context.FilterCultures ?? Array.Empty<string>();
+
+            // If no filter was specified, look for a language neutral localization file specified
+            // from the command-line (not embedded in the intermediate). If found, filter on language
+            // neutral.
+            if (!filter.Any() && context.Localizations.Any(l => String.IsNullOrEmpty(l.Culture)))
             {
-                context.VariableResolver.AddLocalization(localization);
+                filter = new[] { String.Empty };
             }
 
-            // Gather all the wix variables.
-            var wixVariableTuples = context.IntermediateRepresentation.Sections.SelectMany(s => s.Tuples).OfType<WixVariableTuple>();
-            foreach (var tuple in wixVariableTuples)
+            return filter;
+        }
+
+        private static void AddFilteredLocalizations(List<Localization> result, IEnumerable<string> filter, IEnumerable<Localization> localizations)
+        {
+            if (!filter.Any())
             {
-                context.VariableResolver.AddVariable(tuple.SourceLineNumbers, tuple.WixVariable, tuple.Value, tuple.Overridable);
+                result.AddRange(localizations);
+            }
+            else // filter localizations in order specified by the filter
+            {
+                foreach (var culture in filter)
+                {
+                    result.AddRange(localizations.Where(l => culture.Equals(l.Culture, StringComparison.OrdinalIgnoreCase)));
+                }
             }
         }
     }