From 50a0d7358e804138ec766adc107cb1f8762c59b0 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Thu, 26 Mar 2020 15:02:02 -0400
Subject: Add Combined intermediate levels to track librarian.

---
 src/WixToolset.Data/ErrorMessages.cs      | 8 +-------
 src/WixToolset.Data/IntermediateLevels.cs | 1 +
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/WixToolset.Data/ErrorMessages.cs b/src/WixToolset.Data/ErrorMessages.cs
index 1740f6c9..23d32b4f 100644
--- a/src/WixToolset.Data/ErrorMessages.cs
+++ b/src/WixToolset.Data/ErrorMessages.cs
@@ -2254,11 +2254,6 @@ namespace WixToolset.Data
             return Message(null, Ids.IntermediatesMustBeCompiled, "Intermediates being linked must have been compiled. Intermediates with these ids were not compiled: {0}", invalidIntermediates);
         }
 
-        public static Message IntermediatesMustBeLinked(string invalidIntermediate)
-        {
-            return Message(null, Ids.IntermediatesMustBeLinked, "Intermediates being resolved must have been linked. This intermediate was not linked: {0}", invalidIntermediate);
-        }
-
         public static Message IntermediatesMustBeResolved(string invalidIntermediate)
         {
             return Message(null, Ids.IntermediatesMustBeResolved, "Intermediates being bound must have been resolved. This intermediate was not resolved: {0}", invalidIntermediate);
@@ -2662,8 +2657,7 @@ namespace WixToolset.Data
             UnableToConvertFieldToNumber = 393,
             CouldNotDetermineProductCodeFromTransformSummaryInfo = 394,
             IntermediatesMustBeCompiled = 395,
-            IntermediatesMustBeLinked = 396,
-            IntermediatesMustBeResolved = 397,
+            IntermediatesMustBeResolved = 396,
         }
     }
 }
diff --git a/src/WixToolset.Data/IntermediateLevels.cs b/src/WixToolset.Data/IntermediateLevels.cs
index 738cabaa..64c19ae1 100644
--- a/src/WixToolset.Data/IntermediateLevels.cs
+++ b/src/WixToolset.Data/IntermediateLevels.cs
@@ -3,6 +3,7 @@ namespace WixToolset.Data
     public static class IntermediateLevels
     {
         public const string Compiled = "compiled";
+        public const string Combined = "combined";
         public const string Linked = "linked";
         public const string Resolved = "resolved";
     }
-- 
cgit v1.2.3-55-g6feb