From 5a19a39a72d87ed96a6254f65da67b4258fef478 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 12 Apr 2020 12:17:37 +1000
Subject: Add warning when CreateOutputFromIRCommand doesn't know how to handle
 a tuple.

---
 .../Bind/CreateOutputFromIRCommand.cs              | 24 ++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
index c3bedfc7..0cbb81d8 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
@@ -56,6 +56,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         {
             foreach (var tuple in this.Section.Tuples)
             {
+                var unknownTuple = false;
                 switch (tuple.Definition.Type)
                 {
                 case TupleDefinitionType.AppSearch:
@@ -192,10 +193,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     this.AddWixMediaTemplateTuple((WixMediaTemplateTuple)tuple);
                     break;
 
-                case TupleDefinitionType.MustBeFromAnExtension:
-                    this.AddTupleFromExtension(tuple);
-                    break;
-
                 case TupleDefinitionType.WixCustomRow:
                     this.AddWixCustomRowTuple((WixCustomRowTuple)tuple);
                     break;
@@ -215,10 +212,19 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 case TupleDefinitionType.WixCustomTable:
                     break;
 
+                case TupleDefinitionType.MustBeFromAnExtension:
+                    unknownTuple = !this.AddTupleFromExtension(tuple);
+                    break;
+
                 default:
-                    this.AddTupleDefaultly(tuple);
+                    unknownTuple = !this.AddTupleDefaultly(tuple);
                     break;
                 }
+
+                if (unknownTuple)
+                {
+                    this.Messaging.Write(WarningMessages.TupleNotTranslatedToOutput(tuple));
+                }
             }
         }
 
@@ -1029,18 +1035,20 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             row.MaximumCabinetSizeForLargeFileSplitting = tuple.MaximumCabinetSizeForLargeFileSplitting ?? MaxValueOfMaxCabSizeForLargeFileSplitting;
         }
 
-        private void AddTupleFromExtension(IntermediateTuple tuple)
+        private bool AddTupleFromExtension(IntermediateTuple tuple)
         {
             foreach (var extension in this.BackendExtensions)
             {
                 if (extension.TryAddTupleToOutput(this.Section, tuple, this.Output, this.TableDefinitions))
                 {
-                    break;
+                    return true;
                 }
             }
+
+            return false;
         }
 
-        private void AddTupleDefaultly(IntermediateTuple tuple) =>
+        private bool AddTupleDefaultly(IntermediateTuple tuple) =>
             this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(this.Section, tuple, this.Output, this.TableDefinitions);
 
         private static OutputType SectionTypeToOutputType(SectionType type)
-- 
cgit v1.2.3-55-g6feb