Adjust to some newly nullable fields in tuples.
Sean Hall committed
Apr 13, 2020 at 16:41 UTC
c7f9ef7e7bcceb670b56a70fc9aa92152fd55573
4 files changed
+9
-5
src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+1
-1
@@ -262,7 +262,7 @@ namespace WixToolset.Core.Burn
262
263
foreach (var payload in packagePayloads)
264
{
265
- facade.PackageTuple.Size += payload.FileSize;
265
+ facade.PackageTuple.Size += payload.FileSize.Value;
266
}
267
268
if (!facade.PackageTuple.InstallSize.HasValue)
src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
+1
-1
@@ -230,7 +230,7 @@ namespace WixToolset.Core.Burn.Bundles
230
}
231
232
writer.WriteAttributeString("Name", payloadTuple.Name);
233
- writer.WriteAttributeString("Size", payloadTuple.FileSize.ToString(CultureInfo.InvariantCulture));
233
+ writer.WriteAttributeString("Size", payloadTuple.FileSize.Value.ToString(CultureInfo.InvariantCulture));
234
235
if (!String.IsNullOrEmpty(payloadTuple.DownloadUrl))
236
{
src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
+3
-3
@@ -640,7 +640,7 @@ namespace WixToolset.Core.Burn.Bundles
640
private void WriteBurnManifestContainerAttributes(XmlTextWriter writer, string executableName, WixBundleContainerTuple container)
641
{
642
writer.WriteAttributeString("Id", container.Id.Id);
643
- writer.WriteAttributeString("FileSize", container.Size.ToString(CultureInfo.InvariantCulture));
643
+ writer.WriteAttributeString("FileSize", container.Size.Value.ToString(CultureInfo.InvariantCulture));
644
writer.WriteAttributeString("Hash", container.Hash);
645
646
if (ContainerType.Detached == container.Type)
@@ -665,7 +665,7 @@ namespace WixToolset.Core.Burn.Bundles
665
}
666
667
writer.WriteAttributeString("FilePath", executableName); // attached containers use the name of the bundle since they are attached to the executable.
668
- writer.WriteAttributeString("AttachedIndex", container.AttachedContainerIndex.ToString(CultureInfo.InvariantCulture));
668
+ writer.WriteAttributeString("AttachedIndex", container.AttachedContainerIndex.Value.ToString(CultureInfo.InvariantCulture));
669
writer.WriteAttributeString("Attached", "yes");
670
writer.WriteAttributeString("Primary", "yes");
671
}
@@ -677,7 +677,7 @@ namespace WixToolset.Core.Burn.Bundles
677
678
writer.WriteAttributeString("Id", payload.Id.Id);
679
writer.WriteAttributeString("FilePath", payload.Name);
680
- writer.WriteAttributeString("FileSize", payload.FileSize.ToString(CultureInfo.InvariantCulture));
680
+ writer.WriteAttributeString("FileSize", payload.FileSize.Value.ToString(CultureInfo.InvariantCulture));
681
writer.WriteAttributeString("Hash", payload.Hash);
682
683
if (payload.LayoutOnly)
src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
+4
@@ -150,6 +150,10 @@ namespace WixToolset.Core.Burn.Bundles
150
}
151
}
152
}
153
+ else
154
+ {
155
+ payload.FileSize = 0;
156
+ }
157
}
158
159
private void UpdatePayloadVersionInformation(WixBundlePayloadTuple payload, IntermediateFieldPathValue sourceFile)