From dd9a9271d49ab9b9231152e8b7f3128294fd342e Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 4 Nov 2022 13:07:32 -0700 Subject: Normalize SectionType and OutputType "Product" to "Package" --- src/api/wix/WixToolset.Data/OutputType.cs | 10 ++++++++-- src/api/wix/WixToolset.Data/SectionType.cs | 10 ++++++++-- .../WindowsInstaller/WindowsInstallerData.cs | 3 ++- src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/data.xsd | 1 + .../wix/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd | 1 + src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs | 14 +++++++------- 6 files changed, 27 insertions(+), 12 deletions(-) (limited to 'src/api') 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; + /// /// Various types of output. /// @@ -25,8 +27,12 @@ namespace WixToolset.Data /// Patch Creation output type. PatchCreation, - /// Product output type. - Product, + /// Package output type. + Package, + + /// Package output type. + [Obsolete] + Product = Package, /// Transform output type. 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; + /// /// Type of section. /// @@ -19,8 +21,12 @@ namespace WixToolset.Data /// Module section type. Module, - /// Product section type. - Product, + /// Package section type. + Package, + + /// Package output type. + [Obsolete] + Product = Package, /// Patch creation section type. 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 @@ + 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 @@ + 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); -- cgit v1.2.3-55-g6feb