Add intermediate levels to track how IR has been lowered.

5 files changed, 78 insertions, 3 deletions

diff --git a/src/WixToolset.Data/ErrorMessages.cs b/src/WixToolset.Data/ErrorMessages.cs
index 43398ad2..1740f6c9 100644
--- a/src/WixToolset.Data/ErrorMessages.cs
+++ b/src/WixToolset.Data/ErrorMessages.cs
@@ -2249,6 +2249,21 @@ namespace WixToolset.Data
             return Message(null, Ids.WixiplSourceFileIsExclusive, "When an intermediate post link source file is specified, it must be the only source file provided.");
         }
 
+        public static Message IntermediatesMustBeCompiled(string invalidIntermediates)
+        {
+            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);
+        }
+
         private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
         {
             return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args);
@@ -2646,6 +2661,9 @@ namespace WixToolset.Data
             WixiplSourceFileIsExclusive = 392,
             UnableToConvertFieldToNumber = 393,
             CouldNotDetermineProductCodeFromTransformSummaryInfo = 394,
+            IntermediatesMustBeCompiled = 395,
+            IntermediatesMustBeLinked = 396,
+            IntermediatesMustBeResolved = 397,
         }
     }
 }
diff --git a/src/WixToolset.Data/Intermediate.cs b/src/WixToolset.Data/Intermediate.cs
index 7fc7d6c3..d1c38cf0 100644
--- a/src/WixToolset.Data/Intermediate.cs
+++ b/src/WixToolset.Data/Intermediate.cs
@@ -29,9 +29,14 @@ namespace WixToolset.Data
             this.Sections = new List<IntermediateSection>();
         }
 
-        public Intermediate(string id, IEnumerable<IntermediateSection> sections, IDictionary<string, Localization> localizationsByCulture)
+        public Intermediate(string id, IEnumerable<IntermediateSection> sections, IDictionary<string, Localization> localizationsByCulture) : this(id, level: null, sections, localizationsByCulture)
+        {
+        }
+
+        public Intermediate(string id, string level, IEnumerable<IntermediateSection> sections, IDictionary<string, Localization> localizationsByCulture)
         {
             this.Id = id;
+            this.Level = level;
             this.localizationsByCulture = (localizationsByCulture != null) ? new Dictionary<string, Localization>(localizationsByCulture, StringComparer.OrdinalIgnoreCase) : new Dictionary<string, Localization>(StringComparer.OrdinalIgnoreCase);
             this.Sections = (sections != null) ? new List<IntermediateSection>(sections) : new List<IntermediateSection>();
         }
@@ -42,6 +47,11 @@ namespace WixToolset.Data
         public string Id { get; }
 
         /// <summary>
+        /// Get the id for the intermediate.
+        /// </summary>
+        public string Level { get; private set; }
+
+        /// <summary>
         /// Get the localizations contained in this intermediate.
         /// </summary>
         public IEnumerable<Localization> Localizations => this.localizationsByCulture.Values;
@@ -182,6 +192,25 @@ namespace WixToolset.Data
         }
 
         /// <summary>
+        /// Updates the intermediate level to the specified level.
+        /// </summary>
+        /// <param name="level">Intermediate level.</param>
+        public void UpdateLevel(string level)
+        {
+            this.Level = String.IsNullOrEmpty(this.Level) ? level : String.Concat(this.Level, ";", level);
+        }
+
+        /// <summary>
+        /// Returns whether a specifed intermediate level has been set for this intermediate.
+        /// </summary>
+        /// <param name="level">Intermediate level.</param>
+        /// <returns>True if the specifed intermediate level has been set for this intermediate.</returns>
+        public bool HasLevel(string level)
+        {
+            return this.Level?.Contains(level) == true;
+        }
+
+        /// <summary>
         /// Saves an intermediate to a path on disk.
         /// </summary>
         /// <param name="path">Path to save intermediate file to disk.</param>
@@ -277,6 +306,7 @@ namespace WixToolset.Data
         private static Intermediate FinalizeLoad(JsonObject json, Uri baseUri, ITupleDefinitionCreator creator)
         {
             var id = json.GetValueOrDefault<string>("id");
+            var level = json.GetValueOrDefault<string>("level");
 
             var sections = new List<IntermediateSection>();
 
@@ -296,7 +326,7 @@ namespace WixToolset.Data
                 localizations.Add(localization.Culture, localization);
             }
 
-            return new Intermediate(id, sections, localizations);
+            return new Intermediate(id, level, sections, localizations);
         }
 
         private void SaveEmbedFiles(WixOutput wixout)
@@ -351,6 +381,7 @@ namespace WixToolset.Data
                 var jsonObject = new JsonObject
                 {
                     { "id", this.Id },
+                    { "level", this.Level },
                     { "version", Intermediate.CurrentVersion.ToString() }
                 };
 
diff --git a/src/WixToolset.Data/IntermediateLevels.cs b/src/WixToolset.Data/IntermediateLevels.cs
new file mode 100644
index 00000000..738cabaa
--- /dev/null
+++ b/src/WixToolset.Data/IntermediateLevels.cs
@@ -0,0 +1,9 @@
+namespace WixToolset.Data
+{
+    public static class IntermediateLevels
+    {
+        public const string Compiled = "compiled";
+        public const string Linked = "linked";
+        public const string Resolved = "resolved";
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/IntermediateLevels.cs b/src/WixToolset.Data/WindowsInstaller/IntermediateLevels.cs
new file mode 100644
index 00000000..1eb0ef2d
--- /dev/null
+++ b/src/WixToolset.Data/WindowsInstaller/IntermediateLevels.cs
@@ -0,0 +1,9 @@
+namespace WixToolset.Data.WindowsInstaller
+{
+    public static class IntermediateLevels
+    {
+        // TODO: These are placeholder names until we (hopefully) come up with better ones.
+        public const string PartiallyBound = "msiPartiallyBound";
+        public const string FullyBound = "msiFullyBound";
+    }
+}
diff --git a/src/test/WixToolsetTest.Data/SerializeFixture.cs b/src/test/WixToolsetTest.Data/SerializeFixture.cs
index 34e50f36..55460d54 100644
--- a/src/test/WixToolsetTest.Data/SerializeFixture.cs
+++ b/src/test/WixToolsetTest.Data/SerializeFixture.cs
@@ -26,13 +26,21 @@ namespace WixToolsetTest.Data
                 Location = ComponentLocation.Either,
             });
 
-            var intermediate = new Intermediate("TestIntermediate", new[] { section }, null);
+            var intermediate = new Intermediate("TestIntermediate", IntermediateLevels.Compiled, new[] { section }, null);
+
+            intermediate.UpdateLevel(IntermediateLevels.Linked);
+            intermediate.UpdateLevel(IntermediateLevels.Resolved);
 
             var path = Path.GetTempFileName();
             intermediate.Save(path);
 
             var loaded = Intermediate.Load(path);
 
+            Assert.True(loaded.HasLevel(IntermediateLevels.Compiled));
+            Assert.True(loaded.HasLevel(IntermediateLevels.Linked));
+            Assert.True(loaded.HasLevel(IntermediateLevels.Resolved));
+            Assert.False(loaded.HasLevel(WixToolset.Data.WindowsInstaller.IntermediateLevels.PartiallyBound));
+
             var tuple = (ComponentTuple)loaded.Sections.Single().Tuples.Single();
 
             Assert.Equal("TestComponent", tuple.Id.Id);