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.BuildTasks/WixAssignCulture.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.BuildTasks/WixAssignCulture.cs')
-rw-r--r-- | src/WixToolset.BuildTasks/WixAssignCulture.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/WixToolset.BuildTasks/WixAssignCulture.cs b/src/WixToolset.BuildTasks/WixAssignCulture.cs index 7a03dc47..a8baa62f 100644 --- a/src/WixToolset.BuildTasks/WixAssignCulture.cs +++ b/src/WixToolset.BuildTasks/WixAssignCulture.cs | |||
@@ -174,8 +174,6 @@ namespace WixToolset.BuildTasks | |||
174 | 174 | ||
175 | private class CultureGroup | 175 | private class CultureGroup |
176 | { | 176 | { |
177 | private List<string> cultures = new List<string>(); | ||
178 | |||
179 | /// <summary> | 177 | /// <summary> |
180 | /// TargetPath already has a '\', do not double it! | 178 | /// TargetPath already has a '\', do not double it! |
181 | /// </summary> | 179 | /// </summary> |
@@ -193,11 +191,11 @@ namespace WixToolset.BuildTasks | |||
193 | Debug.Assert(!String.IsNullOrEmpty(cultureGroupString)); | 191 | Debug.Assert(!String.IsNullOrEmpty(cultureGroupString)); |
194 | foreach (string cultureString in cultureGroupString.Split(',')) | 192 | foreach (string cultureString in cultureGroupString.Split(',')) |
195 | { | 193 | { |
196 | this.cultures.Add(cultureString); | 194 | this.Cultures.Add(cultureString); |
197 | } | 195 | } |
198 | } | 196 | } |
199 | 197 | ||
200 | public List<string> Cultures { get { return cultures; } } | 198 | public List<string> Cultures { get; } = new List<string>(); |
201 | 199 | ||
202 | public string OutputFolder | 200 | public string OutputFolder |
203 | { | 201 | { |
@@ -218,7 +216,7 @@ namespace WixToolset.BuildTasks | |||
218 | { | 216 | { |
219 | if (this.Cultures.Count > 0) | 217 | if (this.Cultures.Count > 0) |
220 | { | 218 | { |
221 | return String.Join(",", this.Cultures.ToArray()); | 219 | return String.Join(";", this.Cultures); |
222 | } | 220 | } |
223 | 221 | ||
224 | // We use a keyword for a null culture because MSBuild cannnot handle "" items | 222 | // We use a keyword for a null culture because MSBuild cannnot handle "" items |