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/DoIt.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/DoIt.cs')
-rw-r--r-- | src/WixToolset.BuildTasks/DoIt.cs | 4 |
1 files changed, 2 insertions, 2 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); |