diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-19 16:32:54 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-19 16:36:42 +1000 |
| commit | 00e4ccb89b3e2450ad95e298588d80e90b6f8742 (patch) | |
| tree | 13b1b716993c909e7cc12234801013404d814bb7 | |
| parent | abff61df823505abc01776cec7b207501c671bf2 (diff) | |
| download | wix-00e4ccb89b3e2450ad95e298588d80e90b6f8742.tar.gz wix-00e4ccb89b3e2450ad95e298588d80e90b6f8742.tar.bz2 wix-00e4ccb89b3e2450ad95e298588d80e90b6f8742.zip | |
Add more tuples to ignore in GenerateManifestDataFromIRCommand.
| -rw-r--r-- | src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs | 6 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs | 1 |
2 files changed, 7 insertions, 0 deletions
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 | |||
| 82 | case TupleDefinitionType.WixBundleSlipstreamMsp: | 82 | case TupleDefinitionType.WixBundleSlipstreamMsp: |
| 83 | case TupleDefinitionType.WixBundleUpdate: | 83 | case TupleDefinitionType.WixBundleUpdate: |
| 84 | case TupleDefinitionType.WixBundleVariable: | 84 | case TupleDefinitionType.WixBundleVariable: |
| 85 | case TupleDefinitionType.WixBuildInfo: | ||
| 85 | case TupleDefinitionType.WixChain: | 86 | case TupleDefinitionType.WixChain: |
| 86 | case TupleDefinitionType.WixComponentSearch: | 87 | case TupleDefinitionType.WixComponentSearch: |
| 87 | case TupleDefinitionType.WixDependencyProvider: | 88 | case TupleDefinitionType.WixDependencyProvider: |
| 88 | case TupleDefinitionType.WixFileSearch: | 89 | case TupleDefinitionType.WixFileSearch: |
| 89 | case TupleDefinitionType.WixGroup: | 90 | case TupleDefinitionType.WixGroup: |
| 91 | case TupleDefinitionType.WixOrdering: | ||
| 90 | case TupleDefinitionType.WixProductSearch: | 92 | case TupleDefinitionType.WixProductSearch: |
| 91 | case TupleDefinitionType.WixRegistrySearch: | 93 | case TupleDefinitionType.WixRegistrySearch: |
| 92 | case TupleDefinitionType.WixRelatedBundle: | 94 | case TupleDefinitionType.WixRelatedBundle: |
| @@ -96,6 +98,10 @@ namespace WixToolset.Core.Burn.Bind | |||
| 96 | case TupleDefinitionType.WixUpdateRegistration: | 98 | case TupleDefinitionType.WixUpdateRegistration: |
| 97 | break; | 99 | break; |
| 98 | 100 | ||
| 101 | // Tuples to investigate: | ||
| 102 | case TupleDefinitionType.WixChainItem: | ||
| 103 | break; | ||
| 104 | |||
| 99 | case TupleDefinitionType.WixBundleCustomData: | 105 | case TupleDefinitionType.WixBundleCustomData: |
| 100 | unknownTuple = !this.IndexBundleCustomDataTuple((WixBundleCustomDataTuple)tuple, customDataById); | 106 | unknownTuple = !this.IndexBundleCustomDataTuple((WixBundleCustomDataTuple)tuple, customDataById); |
| 101 | break; | 107 | 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 | |||
| 70 | }); | 70 | }); |
| 71 | 71 | ||
| 72 | result.AssertSuccess(); | 72 | result.AssertSuccess(); |
| 73 | Assert.Empty(result.Messages.Where(m => m.Level == MessageLevel.Warning)); | ||
| 73 | 74 | ||
| 74 | Assert.True(File.Exists(exePath)); | 75 | Assert.True(File.Exists(exePath)); |
| 75 | Assert.True(File.Exists(pdbPath)); | 76 | Assert.True(File.Exists(pdbPath)); |