1 files changed, 19 insertions, 5 deletions

diff --git a/src/WixToolset.Data/IntermediateTupleDefinition.cs b/src/WixToolset.Data/IntermediateTupleDefinition.cs
index eb4ab12e..ea15c2dd 100644
--- a/src/WixToolset.Data/IntermediateTupleDefinition.cs
+++ b/src/WixToolset.Data/IntermediateTupleDefinition.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
 namespace WixToolset.Data
 {
@@ -8,19 +8,25 @@ namespace WixToolset.Data
     public class IntermediateTupleDefinition
     {
         public IntermediateTupleDefinition(string name, IntermediateFieldDefinition[] fieldDefinitions, Type strongTupleType)
-            : this(TupleDefinitionType.MustBeFromAnExtension, name, fieldDefinitions, strongTupleType)
+            : this(TupleDefinitionType.MustBeFromAnExtension, name, 0, fieldDefinitions, strongTupleType)
+        {
+        }
+
+        public IntermediateTupleDefinition(string name, int revision, IntermediateFieldDefinition[] fieldDefinitions, Type strongTupleType)
+            : this(TupleDefinitionType.MustBeFromAnExtension, name, revision, fieldDefinitions, strongTupleType)
         {
         }
 
         internal IntermediateTupleDefinition(TupleDefinitionType type, IntermediateFieldDefinition[] fieldDefinitions, Type strongTupleType)
-            : this(type, type.ToString(), fieldDefinitions, strongTupleType)
+            : this(type, type.ToString(), 0, fieldDefinitions, strongTupleType)
         {
         }
 
-        private IntermediateTupleDefinition(TupleDefinitionType type, string name, IntermediateFieldDefinition[] fieldDefinitions, Type strongTupleType)
+        private IntermediateTupleDefinition(TupleDefinitionType type, string name, int revision, IntermediateFieldDefinition[] fieldDefinitions, Type strongTupleType)
         {
             this.Type = type;
             this.Name = name;
+            this.Revision = revision;
             this.FieldDefinitions = fieldDefinitions;
             this.StrongTupleType = strongTupleType ?? typeof(IntermediateTuple);
 #if DEBUG
@@ -28,6 +34,8 @@ namespace WixToolset.Data
 #endif
         }
 
+        public int Revision { get; }
+
         public TupleDefinitionType Type { get; }
 
         public string Name { get; }
@@ -48,6 +56,7 @@ namespace WixToolset.Data
         internal static IntermediateTupleDefinition Deserialize(JsonObject jsonObject)
         {
             var name = jsonObject.GetValueOrDefault<string>("name");
+            var revision = jsonObject.GetValueOrDefault("rev", 0);
             var definitionsJson = jsonObject.GetValueOrDefault<JsonArray>("fields");
 
             var fieldDefinitions = new IntermediateFieldDefinition[definitionsJson.Count];
@@ -60,7 +69,7 @@ namespace WixToolset.Data
                 fieldDefinitions[i] = new IntermediateFieldDefinition(fieldName, fieldType);
             }
 
-            return new IntermediateTupleDefinition(name, fieldDefinitions, null);
+            return new IntermediateTupleDefinition(name, revision, fieldDefinitions, null);
         }
 
         internal JsonObject Serialize()
@@ -70,6 +79,11 @@ namespace WixToolset.Data
                 { "name", this.Name }
             };
 
+            if (this.Revision > 0)
+            {
+                jsonObject.Add("rev", this.Revision);
+            }
+
             var fieldsJson = new JsonArray(this.FieldDefinitions.Length);
 
             foreach (var fieldDefinition in this.FieldDefinitions)