From c7f9ef7e7bcceb670b56a70fc9aa92152fd55573 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 13 Apr 2020 16:41:15 +1000 Subject: Adjust to some newly nullable fields in tuples. --- src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs | 2 +- .../Bundles/CreateBootstrapperApplicationManifestCommand.cs | 2 +- src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs | 6 +++--- src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs | 4 ++++ 4 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs index c9917073..989a1b65 100644 --- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs +++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs @@ -262,7 +262,7 @@ namespace WixToolset.Core.Burn foreach (var payload in packagePayloads) { - facade.PackageTuple.Size += payload.FileSize; + facade.PackageTuple.Size += payload.FileSize.Value; } if (!facade.PackageTuple.InstallSize.HasValue) diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs index 5ef75b3e..231be7a5 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs @@ -230,7 +230,7 @@ namespace WixToolset.Core.Burn.Bundles } writer.WriteAttributeString("Name", payloadTuple.Name); - writer.WriteAttributeString("Size", payloadTuple.FileSize.ToString(CultureInfo.InvariantCulture)); + writer.WriteAttributeString("Size", payloadTuple.FileSize.Value.ToString(CultureInfo.InvariantCulture)); if (!String.IsNullOrEmpty(payloadTuple.DownloadUrl)) { diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs index 58133d38..205bd1f8 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs @@ -640,7 +640,7 @@ namespace WixToolset.Core.Burn.Bundles private void WriteBurnManifestContainerAttributes(XmlTextWriter writer, string executableName, WixBundleContainerTuple container) { writer.WriteAttributeString("Id", container.Id.Id); - writer.WriteAttributeString("FileSize", container.Size.ToString(CultureInfo.InvariantCulture)); + writer.WriteAttributeString("FileSize", container.Size.Value.ToString(CultureInfo.InvariantCulture)); writer.WriteAttributeString("Hash", container.Hash); if (ContainerType.Detached == container.Type) @@ -665,7 +665,7 @@ namespace WixToolset.Core.Burn.Bundles } writer.WriteAttributeString("FilePath", executableName); // attached containers use the name of the bundle since they are attached to the executable. - writer.WriteAttributeString("AttachedIndex", container.AttachedContainerIndex.ToString(CultureInfo.InvariantCulture)); + writer.WriteAttributeString("AttachedIndex", container.AttachedContainerIndex.Value.ToString(CultureInfo.InvariantCulture)); writer.WriteAttributeString("Attached", "yes"); writer.WriteAttributeString("Primary", "yes"); } @@ -677,7 +677,7 @@ namespace WixToolset.Core.Burn.Bundles writer.WriteAttributeString("Id", payload.Id.Id); writer.WriteAttributeString("FilePath", payload.Name); - writer.WriteAttributeString("FileSize", payload.FileSize.ToString(CultureInfo.InvariantCulture)); + writer.WriteAttributeString("FileSize", payload.FileSize.Value.ToString(CultureInfo.InvariantCulture)); writer.WriteAttributeString("Hash", payload.Hash); if (payload.LayoutOnly) diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs index 99e361aa..d0c1fdfc 100644 --- a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs @@ -150,6 +150,10 @@ namespace WixToolset.Core.Burn.Bundles } } } + else + { + payload.FileSize = 0; + } } private void UpdatePayloadVersionInformation(WixBundlePayloadTuple payload, IntermediateFieldPathValue sourceFile) -- cgit v1.2.3-55-g6feb