aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.Burn
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core.Burn')
-rw-r--r--src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs2
-rw-r--r--src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs12
-rw-r--r--src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj6
3 files changed, 19 insertions, 1 deletions
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
index bf0473d2..53636509 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
@@ -125,7 +125,7 @@ namespace WixToolset.Core.Burn.Bundles
125 version.FileVersion = fourPartVersion; 125 version.FileVersion = fourPartVersion;
126 version.ProductVersion = fourPartVersion; 126 version.ProductVersion = fourPartVersion;
127 127
128 var strings = version[1033]; 128 var strings = version[1033] ?? version.Add(1033);
129 strings["LegalCopyright"] = bundleInfo.Copyright; 129 strings["LegalCopyright"] = bundleInfo.Copyright;
130 strings["OriginalFilename"] = Path.GetFileName(outputPath); 130 strings["OriginalFilename"] = Path.GetFileName(outputPath);
131 strings["FileVersion"] = bundleInfo.Version; // string versions do not have to be four parts. 131 strings["FileVersion"] = bundleInfo.Version; // string versions do not have to be four parts.
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
index b7ea4116..64a01794 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
@@ -621,6 +621,18 @@ namespace WixToolset.Core.Burn.Bundles
621 writer.WriteEndElement(); 621 writer.WriteEndElement();
622 } 622 }
623 623
624 // Write the BundleExtension elements.
625 var bundleExtensions = this.Section.Tuples.OfType<WixBundleExtensionTuple>();
626
627 foreach (var bundleExtension in bundleExtensions)
628 {
629 writer.WriteStartElement("BundleExtension");
630 writer.WriteAttributeString("Id", bundleExtension.Id.Id);
631 writer.WriteAttributeString("EntryPayloadId", bundleExtension.PayloadRef);
632
633 writer.WriteEndElement();
634 }
635
624 writer.WriteEndDocument(); // </BurnManifest> 636 writer.WriteEndDocument(); // </BurnManifest>
625 } 637 }
626 } 638 }
diff --git a/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj b/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
index 3542f85a..ae0e7023 100644
--- a/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
+++ b/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
@@ -11,6 +11,12 @@
11 </PropertyGroup> 11 </PropertyGroup>
12 12
13 <ItemGroup> 13 <ItemGroup>
14 <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
15 <_Parameter1>WixToolset.Core.TestPackage</_Parameter1>
16 </AssemblyAttribute>
17 </ItemGroup>
18
19 <ItemGroup>
14 <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" /> 20 <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
15 </ItemGroup> 21 </ItemGroup>
16 22