From 06835732a8e6e9d18d548fbb4487bcaf5c8e1725 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 13 Jul 2018 15:08:27 -0700 Subject: Fix MSBuild handling of cultures plus add unit tests Fixes #5847 --- src/WixToolset.BuildTasks/WixAssignCulture.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/WixToolset.BuildTasks/WixAssignCulture.cs') 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 private class CultureGroup { - private List cultures = new List(); - /// /// TargetPath already has a '\', do not double it! /// @@ -193,11 +191,11 @@ namespace WixToolset.BuildTasks Debug.Assert(!String.IsNullOrEmpty(cultureGroupString)); foreach (string cultureString in cultureGroupString.Split(',')) { - this.cultures.Add(cultureString); + this.Cultures.Add(cultureString); } } - public List Cultures { get { return cultures; } } + public List Cultures { get; } = new List(); public string OutputFolder { @@ -218,7 +216,7 @@ namespace WixToolset.BuildTasks { if (this.Cultures.Count > 0) { - return String.Join(",", this.Cultures.ToArray()); + return String.Join(";", this.Cultures); } // We use a keyword for a null culture because MSBuild cannnot handle "" items -- cgit v1.2.3-55-g6feb