Merge pull request #467 from radiy/master

Do not trim publisher name
Squirrel · Oct 15, 2015 · e3231c7 · e3231c7
2 parents ea1d65d + 6db88fb
commit e3231c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/Squirrel/UpdateManager.InstallHelpers.cs b/src/Squirrel/UpdateManager.InstallHelpers.cs
@@ -79,7 +79,7 @@ public async Task<RegistryKey> CreateUninstallerRegistryEntry(string uninstallCm
                     new { Key = "DisplayVersion", Value = zp.Version.ToString() },
                     new { Key = "InstallDate", Value = DateTime.Now.ToString("yyyymmdd") },
                     new { Key = "InstallLocation", Value = rootAppDirectory },
-                    new { Key = "Publisher", Value = zp.Authors.First() },
+                    new { Key = "Publisher", Value = String.Join(",", zp.Authors) },
                     new { Key = "QuietUninstallString", Value = String.Format("{0} {1}", uninstallCmd, quietSwitch) },
                     new { Key = "UninstallString", Value = uninstallCmd },
                     new { Key = "URLUpdateInfo", Value = zp.ProjectUrl != null ? zp.ProjectUrl.ToString() : "", }

diff --git a/src/Update/Program.cs b/src/Update/Program.cs
@@ -603,9 +603,10 @@ static async Task signPEFile(string exePath, string signingOpts)
 
         static async Task setPEVersionInfoAndIcon(string exePath, IPackage package, string iconPath = null)
         {
+            var company = String.Join(",", package.Authors);
             var verStrings = new Dictionary<string, string>() {
-                { "CompanyName", package.Authors.First() },
-                { "LegalCopyright", package.Copyright ?? "Copyright © " + DateTime.Now.Year.ToString() + " " + package.Authors.First() },
+                { "CompanyName", company },
+                { "LegalCopyright", package.Copyright ?? "Copyright © " + DateTime.Now.Year.ToString() + " " + company },
                 { "FileDescription", package.Summary ?? package.Description ?? "Installer for " + package.Id },
                 { "ProductName", package.Description ?? package.Summary ?? package.Id },
             };
@@ -644,12 +645,13 @@ static async Task createMsiPackage(string setupExe, IPackage package)
         {
             var pathToWix = pathToWixTools();
             var setupExeDir = Path.GetDirectoryName(setupExe);
+            var company = String.Join(",", package.Authors);
 
             var templateText = File.ReadAllText(Path.Combine(pathToWix, "template.wxs"));
             var templateResult = CopStache.Render(templateText, new Dictionary<string, string> {
                 { "Id", package.Id },
                 { "Title", package.Title },
-                { "Author", package.Authors.First() },
+                { "Author", company },
                 { "Summary", package.Summary ?? package.Description ?? package.Id },
             });