From bb84eab87c7361d0af10f68b2ef6369d20762c67 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 23 May 2019 15:15:17 -0700
Subject: Minor fixes

---
 src/WixToolset.Data/Intermediate.cs                    |  2 +-
 src/WixToolset.Data/Tuples/FileTuple.cs                | 16 ++++++++--------
 src/WixToolset.Data/Tuples/MediaTuple.cs               |  4 ++--
 src/test/WixToolsetTest.Data/TupleDefinitionFixture.cs |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/WixToolset.Data/Intermediate.cs b/src/WixToolset.Data/Intermediate.cs
index 4b7daa4e..7693b815 100644
--- a/src/WixToolset.Data/Intermediate.cs
+++ b/src/WixToolset.Data/Intermediate.cs
@@ -130,7 +130,7 @@ namespace WixToolset.Data
         /// <param name="intermediateFiles">Paths to intermediate files saved on disk.</param>
         /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param>
         /// <returns>Returns the loaded intermediates</returns>
-        public static IEnumerable<Intermediate> Load(IEnumerable<string> intermediateFiles, bool suppressVersionCheck = false)
+        public static IEnumerable<Intermediate> Load(IEnumerable<string> intermediateFiles)
         {
             var creator = new SimpleTupleDefinitionCreator();
 
diff --git a/src/WixToolset.Data/Tuples/FileTuple.cs b/src/WixToolset.Data/Tuples/FileTuple.cs
index 6d7281cc..43de8b46 100644
--- a/src/WixToolset.Data/Tuples/FileTuple.cs
+++ b/src/WixToolset.Data/Tuples/FileTuple.cs
@@ -11,8 +11,8 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(FileTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.ShortName), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(FileTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileTupleFields.ShortName), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(FileTupleFields.FileSize), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(FileTupleFields.Version), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(FileTupleFields.Language), IntermediateFieldType.String),
@@ -35,8 +35,8 @@ namespace WixToolset.Data.Tuples
     public enum FileTupleFields
     {
         ComponentRef,
-        ShortName,
         Name,
+        ShortName,
         FileSize,
         Version,
         Language,
@@ -69,18 +69,18 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)FileTupleFields.ComponentRef, value);
         }
 
-        public string ShortName
-        {
-            get => (string)this.Fields[(int)FileTupleFields.ShortName];
-            set => this.Set((int)FileTupleFields.ShortName, value);
-        }
-
         public string Name
         {
             get => (string)this.Fields[(int)FileTupleFields.Name];
             set => this.Set((int)FileTupleFields.Name, value);
         }
 
+        public string ShortName
+        {
+            get => (string)this.Fields[(int)FileTupleFields.ShortName];
+            set => this.Set((int)FileTupleFields.ShortName, value);
+        }
+
         public int FileSize
         {
             get => (int)this.Fields[(int)FileTupleFields.FileSize];
diff --git a/src/WixToolset.Data/Tuples/MediaTuple.cs b/src/WixToolset.Data/Tuples/MediaTuple.cs
index 009a588f..a9cbb034 100644
--- a/src/WixToolset.Data/Tuples/MediaTuple.cs
+++ b/src/WixToolset.Data/Tuples/MediaTuple.cs
@@ -55,9 +55,9 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)MediaTupleFields.DiskId, value);
         }
 
-        public int LastSequence
+        public int? LastSequence
         {
-            get => (int)this.Fields[(int)MediaTupleFields.LastSequence];
+            get => (int?)this.Fields[(int)MediaTupleFields.LastSequence];
             set => this.Set((int)MediaTupleFields.LastSequence, value);
         }
 
diff --git a/src/test/WixToolsetTest.Data/TupleDefinitionFixture.cs b/src/test/WixToolsetTest.Data/TupleDefinitionFixture.cs
index 35e7bf33..9854ba9f 100644
--- a/src/test/WixToolsetTest.Data/TupleDefinitionFixture.cs
+++ b/src/test/WixToolsetTest.Data/TupleDefinitionFixture.cs
@@ -43,10 +43,10 @@ namespace WixToolsetTest.Data
         public void CanCheckNameofField()
         {
             var fileTuple = new FileTuple();
-            Assert.Equal("Component_", fileTuple.Definition.FieldDefinitions[0].Name);
+            Assert.Equal("ComponentRef", fileTuple.Definition.FieldDefinitions[0].Name);
             Assert.Null(fileTuple.Fields[0]);
             fileTuple.ComponentRef = "Foo";
-            Assert.Equal("Component_", fileTuple.Fields[0].Name);
+            Assert.Equal("ComponentRef", fileTuple.Fields[0].Name);
             Assert.Same(fileTuple.Definition.FieldDefinitions[0].Name, fileTuple.Fields[0].Name);
         }
 
-- 
cgit v1.2.3-55-g6feb