From 00e4ccb89b3e2450ad95e298588d80e90b6f8742 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 19 Jun 2020 16:32:54 +1000 Subject: Add more tuples to ignore in GenerateManifestDataFromIRCommand. --- src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs | 6 ++++++ src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs | 1 + 2 files changed, 7 insertions(+) diff --git a/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs b/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs index 7fd510c6..961195d0 100644 --- a/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs +++ b/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs @@ -82,11 +82,13 @@ namespace WixToolset.Core.Burn.Bind case TupleDefinitionType.WixBundleSlipstreamMsp: case TupleDefinitionType.WixBundleUpdate: case TupleDefinitionType.WixBundleVariable: + case TupleDefinitionType.WixBuildInfo: case TupleDefinitionType.WixChain: case TupleDefinitionType.WixComponentSearch: case TupleDefinitionType.WixDependencyProvider: case TupleDefinitionType.WixFileSearch: case TupleDefinitionType.WixGroup: + case TupleDefinitionType.WixOrdering: case TupleDefinitionType.WixProductSearch: case TupleDefinitionType.WixRegistrySearch: case TupleDefinitionType.WixRelatedBundle: @@ -96,6 +98,10 @@ namespace WixToolset.Core.Burn.Bind case TupleDefinitionType.WixUpdateRegistration: break; + // Tuples to investigate: + case TupleDefinitionType.WixChainItem: + break; + case TupleDefinitionType.WixBundleCustomData: unknownTuple = !this.IndexBundleCustomDataTuple((WixBundleCustomDataTuple)tuple, customDataById); break; diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs index 96a9a013..b86e67ff 100644 --- a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs @@ -70,6 +70,7 @@ namespace WixToolsetTest.CoreIntegration }); result.AssertSuccess(); + Assert.Empty(result.Messages.Where(m => m.Level == MessageLevel.Warning)); Assert.True(File.Exists(exePath)); Assert.True(File.Exists(pdbPath)); -- cgit v1.2.3-55-g6feb