From 1a41c836f21f217c82979b06c721a0cd7f6e2734 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 19 Jul 2018 00:48:51 -0700 Subject: Minimize duplicate localization processing --- src/WixToolset.Core/CommandLine/BuildCommand.cs | 2 +- src/WixToolset.Core/Resolver.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/WixToolset.Core') 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 return 1; } - var wxls = this.LoadLocalizationFiles(); + var wxls = this.LoadLocalizationFiles().ToList(); if (this.Messaging.EncounteredError) { 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 { var library = data.GetLibrary(creator); - if (library?.Localizations != null) + if (library?.Localizations != null && library.Localizations.Any()) { var extensionFilter = (!filter.Any() && data.DefaultCulture != null) ? new[] { data.DefaultCulture } : filter; -- cgit v1.2.3-55-g6feb