Normalize SectionType and OutputType "Product" to "Package"

6 files changed, 27 insertions, 12 deletions

diff --git a/src/api/wix/WixToolset.Data/OutputType.cs b/src/api/wix/WixToolset.Data/OutputType.cs
index 3bbdddcc..6d31d962 100644
--- a/src/api/wix/WixToolset.Data/OutputType.cs
+++ b/src/api/wix/WixToolset.Data/OutputType.cs
@@ -2,6 +2,8 @@
 
 namespace WixToolset.Data
 {
+    using System;
+
     /// <summary>
     /// Various types of output.
     /// </summary>
@@ -25,8 +27,12 @@ namespace WixToolset.Data
         /// <summary>Patch Creation output type.</summary>
         PatchCreation,
 
-        /// <summary>Product output type.</summary>
-        Product,
+        /// <summary>Package output type.</summary>
+        Package,
+
+        /// <summary>Package output type.</summary>
+        [Obsolete]
+        Product = Package,
 
         /// <summary>Transform output type.</summary>
         Transform,
diff --git a/src/api/wix/WixToolset.Data/SectionType.cs b/src/api/wix/WixToolset.Data/SectionType.cs
index 3322ba1a..21fb5eac 100644
--- a/src/api/wix/WixToolset.Data/SectionType.cs
+++ b/src/api/wix/WixToolset.Data/SectionType.cs
@@ -2,6 +2,8 @@
 
 namespace WixToolset.Data
 {
+    using System;
+
     /// <summary>
     /// Type of section.
     /// </summary>
@@ -19,8 +21,12 @@ namespace WixToolset.Data
         /// <summary>Module section type.</summary>
         Module,
 
-        /// <summary>Product section type.</summary>
-        Product,
+        /// <summary>Package section type.</summary>
+        Package,
+
+        /// <summary>Package output type.</summary>
+        [Obsolete]
+        Product = Package,
 
         /// <summary>Patch creation section type.</summary>
         PatchCreation,
diff --git a/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs b/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
index 66d9a56f..fbb38501 100644
--- a/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
+++ b/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
@@ -217,8 +217,9 @@ namespace WixToolset.Data.WindowsInstaller
                             case "PatchCreation":
                                 output.Type = OutputType.PatchCreation;
                                 break;
+                            case "Package":
                             case "Product":
-                                output.Type = OutputType.Product;
+                                output.Type = OutputType.Package;
                                 break;
                             case "Transform":
                                 output.Type = OutputType.Transform;
diff --git a/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/data.xsd b/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/data.xsd
index a3dc7e2b..2ee214d8 100644
--- a/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/data.xsd
+++ b/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/data.xsd
@@ -38,6 +38,7 @@
                         <xs:enumeration value="Module" />
                         <xs:enumeration value="Patch" />
                         <xs:enumeration value="PatchCreation" />
+                        <xs:enumeration value="Package" />
                         <xs:enumeration value="Product" />
                         <xs:enumeration value="Transform" />
                     </xs:restriction>
diff --git a/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd b/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd
index 94909032..84b59321 100644
--- a/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd
+++ b/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd
@@ -119,6 +119,7 @@
             <xs:enumeration value="bundle"/>
             <xs:enumeration value="fragment" />
             <xs:enumeration value="module" />
+            <xs:enumeration value="package" />
             <xs:enumeration value="product" />
             <xs:enumeration value="patchCreation" />
             <xs:enumeration value="patch" />
diff --git a/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs b/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs
index cda5d79a..98317446 100644
--- a/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs
+++ b/src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs
@@ -21,7 +21,7 @@ namespace WixToolsetTest.Data
         {
             var sln = new SourceLineNumber("test.wxs", 1);
 
-            var section = new IntermediateSection("test", SectionType.Product);
+            var section = new IntermediateSection("test", SectionType.Package);
 
             section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent"))
             {
@@ -66,7 +66,7 @@ namespace WixToolsetTest.Data
         public void CanUpdateIntermediate()
         {
             var sln = new SourceLineNumber("test.wxs", 1);
-            var section = new IntermediateSection("test", SectionType.Product);
+            var section = new IntermediateSection("test", SectionType.Package);
 
             section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent"))
             {
@@ -123,7 +123,7 @@ namespace WixToolsetTest.Data
         {
             var sln = new SourceLineNumber("test.wxs", 1);
 
-            var section = new IntermediateSection("test", SectionType.Product);
+            var section = new IntermediateSection("test", SectionType.Package);
 
             var fieldDefs = new[]
             {
@@ -182,7 +182,7 @@ namespace WixToolsetTest.Data
             symbol.Set(1, 2);
             symbol.Set(2, true);
 
-            var section = new IntermediateSection("test", SectionType.Product);
+            var section = new IntermediateSection("test", SectionType.Package);
             section.AddSymbol(symbol);
 
             var intermediate1 = new Intermediate("TestIntermediate", new[] { section }, null);
@@ -265,7 +265,7 @@ namespace WixToolsetTest.Data
 
             symbol.AddTag("symbol1tag");
 
-            var section = new IntermediateSection("test", SectionType.Product);
+            var section = new IntermediateSection("test", SectionType.Package);
             section.AddSymbol(symbol);
 
             var intermediate1 = new Intermediate("TestIntermediate", new[] { section }, null);
@@ -358,7 +358,7 @@ namespace WixToolsetTest.Data
                 new Localization(65001, 1252, null, bindVariables.ToDictionary(b => b.Id), controls.ToDictionary(c => c.GetKey()))
             };
 
-            var section = new IntermediateSection("test", SectionType.Product);
+            var section = new IntermediateSection("test", SectionType.Package);
 
             section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent"))
             {
@@ -397,7 +397,7 @@ namespace WixToolsetTest.Data
             var sln = new SourceLineNumber("test.wxs", 1);
             var windowsInstallerData = new Wid.WindowsInstallerData(sln)
             {
-                Type = OutputType.Product,
+                Type = OutputType.Package,
             };
 
             var fileTable = windowsInstallerData.EnsureTable(Wid.WindowsInstallerTableDefinitions.File);