aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2018-07-19 00:48:51 -0700
committerRob Mensching <rob@firegiant.com>2018-07-19 00:48:51 -0700
commit1a41c836f21f217c82979b06c721a0cd7f6e2734 (patch)
treec1227061f8092588893a98937692f6b77a9de56c /src/WixToolset.Core
parent83880829036e43ea75c8b752680e659757241ecd (diff)
downloadwix-1a41c836f21f217c82979b06c721a0cd7f6e2734.tar.gz
wix-1a41c836f21f217c82979b06c721a0cd7f6e2734.tar.bz2
wix-1a41c836f21f217c82979b06c721a0cd7f6e2734.zip
Minimize duplicate localization processing
Diffstat (limited to 'src/WixToolset.Core')
-rw-r--r--src/WixToolset.Core/CommandLine/BuildCommand.cs2
-rw-r--r--src/WixToolset.Core/Resolver.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs
index 5097bd9b..7b605da1 100644
--- a/src/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -87,7 +87,7 @@ namespace WixToolset.Core.CommandLine
87 return 1; 87 return 1;
88 } 88 }
89 89
90 var wxls = this.LoadLocalizationFiles(); 90 var wxls = this.LoadLocalizationFiles().ToList();
91 91
92 if (this.Messaging.EncounteredError) 92 if (this.Messaging.EncounteredError)
93 { 93 {
diff --git a/src/WixToolset.Core/Resolver.cs b/src/WixToolset.Core/Resolver.cs
index b672e998..503d4bb7 100644
--- a/src/WixToolset.Core/Resolver.cs
+++ b/src/WixToolset.Core/Resolver.cs
@@ -241,7 +241,7 @@ namespace WixToolset.Core
241 { 241 {
242 var library = data.GetLibrary(creator); 242 var library = data.GetLibrary(creator);
243 243
244 if (library?.Localizations != null) 244 if (library?.Localizations != null && library.Localizations.Any())
245 { 245 {
246 var extensionFilter = (!filter.Any() && data.DefaultCulture != null) ? new[] { data.DefaultCulture } : filter; 246 var extensionFilter = (!filter.Any() && data.DefaultCulture != null) ? new[] { data.DefaultCulture } : filter;
247 247