diff options
Diffstat (limited to 'src/WixToolset.Core.Burn/Bundles/BurnWriter.cs')
-rw-r--r-- | src/WixToolset.Core.Burn/Bundles/BurnWriter.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/WixToolset.Core.Burn/Bundles/BurnWriter.cs b/src/WixToolset.Core.Burn/Bundles/BurnWriter.cs index 08eeaa15..83b73a61 100644 --- a/src/WixToolset.Core.Burn/Bundles/BurnWriter.cs +++ b/src/WixToolset.Core.Burn/Bundles/BurnWriter.cs | |||
@@ -67,19 +67,21 @@ namespace WixToolset.Core.Burn.Bundles | |||
67 | /// <param name="stubSize">Size of the stub engine "burn.exe".</param> | 67 | /// <param name="stubSize">Size of the stub engine "burn.exe".</param> |
68 | /// <param name="bundleId">Unique identifier for this bundle.</param> | 68 | /// <param name="bundleId">Unique identifier for this bundle.</param> |
69 | /// <returns></returns> | 69 | /// <returns></returns> |
70 | public bool InitializeBundleSectionData(long stubSize, Guid bundleId) | 70 | public bool InitializeBundleSectionData(long stubSize, string bundleId) |
71 | { | 71 | { |
72 | if (this.invalidBundle) | 72 | if (this.invalidBundle) |
73 | { | 73 | { |
74 | return false; | 74 | return false; |
75 | } | 75 | } |
76 | 76 | ||
77 | var bundleGuid = Guid.Parse(bundleId); | ||
78 | |||
77 | this.WriteToBurnSectionOffset(BURN_SECTION_OFFSET_MAGIC, BURN_SECTION_MAGIC); | 79 | this.WriteToBurnSectionOffset(BURN_SECTION_OFFSET_MAGIC, BURN_SECTION_MAGIC); |
78 | this.WriteToBurnSectionOffset(BURN_SECTION_OFFSET_VERSION, BURN_SECTION_VERSION); | 80 | this.WriteToBurnSectionOffset(BURN_SECTION_OFFSET_VERSION, BURN_SECTION_VERSION); |
79 | 81 | ||
80 | this.messaging.Write(VerboseMessages.BundleGuid(bundleId.ToString("B"))); | 82 | this.messaging.Write(VerboseMessages.BundleGuid(bundleId)); |
81 | this.binaryWriter.BaseStream.Seek(this.wixburnDataOffset + BURN_SECTION_OFFSET_BUNDLEGUID, SeekOrigin.Begin); | 83 | this.binaryWriter.BaseStream.Seek(this.wixburnDataOffset + BURN_SECTION_OFFSET_BUNDLEGUID, SeekOrigin.Begin); |
82 | this.binaryWriter.Write(bundleId.ToByteArray()); | 84 | this.binaryWriter.Write(bundleGuid.ToByteArray()); |
83 | 85 | ||
84 | this.StubSize = (uint)stubSize; | 86 | this.StubSize = (uint)stubSize; |
85 | 87 | ||
@@ -146,7 +148,7 @@ namespace WixToolset.Core.Burn.Bundles | |||
146 | return false; | 148 | return false; |
147 | } | 149 | } |
148 | 150 | ||
149 | return AppendContainer(containerStream, (UInt32)containerSize, burnSectionOffsetSize, burnSectionCount); | 151 | return this.AppendContainer(containerStream, (UInt32)containerSize, burnSectionOffsetSize, burnSectionCount); |
150 | } | 152 | } |
151 | 153 | ||
152 | public void RememberThenResetSignature() | 154 | public void RememberThenResetSignature() |