diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-07-13 15:08:27 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-07-13 15:08:27 -0700 |
| commit | 06835732a8e6e9d18d548fbb4487bcaf5c8e1725 (patch) | |
| tree | c10530de5d650115326d68cdd5f016a6a91c9097 /src/WixToolset.Core/Resolver.cs | |
| parent | 6b9b24f21f3a9273b0b1b1000a05ba732fcf301f (diff) | |
| download | wix-06835732a8e6e9d18d548fbb4487bcaf5c8e1725.tar.gz wix-06835732a8e6e9d18d548fbb4487bcaf5c8e1725.tar.bz2 wix-06835732a8e6e9d18d548fbb4487bcaf5c8e1725.zip | |
Fix MSBuild handling of cultures plus add unit tests
Fixes #5847
Diffstat (limited to 'src/WixToolset.Core/Resolver.cs')
| -rw-r--r-- | src/WixToolset.Core/Resolver.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/WixToolset.Core/Resolver.cs b/src/WixToolset.Core/Resolver.cs index 03cf344b..14b5d0cf 100644 --- a/src/WixToolset.Core/Resolver.cs +++ b/src/WixToolset.Core/Resolver.cs | |||
| @@ -232,7 +232,6 @@ namespace WixToolset.Core | |||
| 232 | 232 | ||
| 233 | var localizations = context.Localizations.Concat(context.IntermediateRepresentation.Localizations).ToList(); | 233 | var localizations = context.Localizations.Concat(context.IntermediateRepresentation.Localizations).ToList(); |
| 234 | 234 | ||
| 235 | // If there still is no filter, return all localizations. | ||
| 236 | AddFilteredLocalizations(result, filter, localizations); | 235 | AddFilteredLocalizations(result, filter, localizations); |
| 237 | 236 | ||
| 238 | // Filter localizations provided by extensions with data. | 237 | // Filter localizations provided by extensions with data. |
| @@ -270,6 +269,7 @@ namespace WixToolset.Core | |||
| 270 | 269 | ||
| 271 | private static void AddFilteredLocalizations(List<Localization> result, IEnumerable<string> filter, IEnumerable<Localization> localizations) | 270 | private static void AddFilteredLocalizations(List<Localization> result, IEnumerable<string> filter, IEnumerable<Localization> localizations) |
| 272 | { | 271 | { |
| 272 | // If there is no filter, return all localizations. | ||
| 273 | if (!filter.Any()) | 273 | if (!filter.Any()) |
| 274 | { | 274 | { |
| 275 | result.AddRange(localizations); | 275 | result.AddRange(localizations); |
