aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.BuildTasks
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.BuildTasks')
-rw-r--r--src/WixToolset.BuildTasks/DoIt.cs4
-rw-r--r--src/WixToolset.BuildTasks/WixAssignCulture.cs8
2 files changed, 5 insertions, 7 deletions
diff --git a/src/WixToolset.BuildTasks/DoIt.cs b/src/WixToolset.BuildTasks/DoIt.cs
index 977a2326..0c7a0943 100644
--- a/src/WixToolset.BuildTasks/DoIt.cs
+++ b/src/WixToolset.BuildTasks/DoIt.cs
@@ -28,7 +28,7 @@ namespace WixToolset.BuildTasks
28 28
29 public string AdditionalOptions { get; set; } 29 public string AdditionalOptions { get; set; }
30 30
31 public string Cultures { get; set; } 31 public string[] Cultures { get; set; }
32 32
33 public string[] DefineConstants { get; set; } 33 public string[] DefineConstants { get; set; }
34 34
@@ -145,7 +145,7 @@ namespace WixToolset.BuildTasks
145 commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile); 145 commandLineBuilder.AppendSwitchIfNotNull("-out ", this.OutputFile);
146 commandLineBuilder.AppendSwitchIfNotNull("-outputType ", this.OutputType); 146 commandLineBuilder.AppendSwitchIfNotNull("-outputType ", this.OutputType);
147 commandLineBuilder.AppendIfTrue("-nologo", this.NoLogo); 147 commandLineBuilder.AppendIfTrue("-nologo", this.NoLogo);
148 commandLineBuilder.AppendSwitchIfNotNull("-cultures ", this.Cultures); 148 commandLineBuilder.AppendArrayIfNotNull("-culture ", this.Cultures);
149 commandLineBuilder.AppendArrayIfNotNull("-d ", this.DefineConstants); 149 commandLineBuilder.AppendArrayIfNotNull("-d ", this.DefineConstants);
150 commandLineBuilder.AppendArrayIfNotNull("-I ", this.IncludeSearchPaths); 150 commandLineBuilder.AppendArrayIfNotNull("-I ", this.IncludeSearchPaths);
151 commandLineBuilder.AppendExtensions(this.Extensions, this.ExtensionDirectory, this.ReferencePaths); 151 commandLineBuilder.AppendExtensions(this.Extensions, this.ExtensionDirectory, this.ReferencePaths);
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