aboutsummaryrefslogtreecommitdiff
path: root/src/api
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-11-04 13:07:32 -0700
committerRob Mensching <rob@firegiant.com>2022-11-04 14:11:42 -0700
commitdd9a9271d49ab9b9231152e8b7f3128294fd342e (patch)
tree5d8700ce8ddc6ed1d757e4fce22ab49b46b005a6 /src/api
parent184fd7663696e52fe5386f6623b3313a41e05979 (diff)
downloadwix-dd9a9271d49ab9b9231152e8b7f3128294fd342e.tar.gz
wix-dd9a9271d49ab9b9231152e8b7f3128294fd342e.tar.bz2
wix-dd9a9271d49ab9b9231152e8b7f3128294fd342e.zip
Normalize SectionType and OutputType "Product" to "Package"
Diffstat (limited to 'src/api')
-rw-r--r--src/api/wix/WixToolset.Data/OutputType.cs10
-rw-r--r--src/api/wix/WixToolset.Data/SectionType.cs10
-rw-r--r--src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs3
-rw-r--r--src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/data.xsd1
-rw-r--r--src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd1
-rw-r--r--src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs14
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 @@
2 2
3namespace WixToolset.Data 3namespace WixToolset.Data
4{ 4{
5 using System;
6
5 /// <summary> 7 /// <summary>
6 /// Various types of output. 8 /// Various types of output.
7 /// </summary> 9 /// </summary>
@@ -25,8 +27,12 @@ namespace WixToolset.Data
25 /// <summary>Patch Creation output type.</summary> 27 /// <summary>Patch Creation output type.</summary>
26 PatchCreation, 28 PatchCreation,
27 29
28 /// <summary>Product output type.</summary> 30 /// <summary>Package output type.</summary>
29 Product, 31 Package,
32
33 /// <summary>Package output type.</summary>
34 [Obsolete]
35 Product = Package,
30 36
31 /// <summary>Transform output type.</summary> 37 /// <summary>Transform output type.</summary>
32 Transform, 38 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 @@
2 2
3namespace WixToolset.Data 3namespace WixToolset.Data
4{ 4{
5 using System;
6
5 /// <summary> 7 /// <summary>
6 /// Type of section. 8 /// Type of section.
7 /// </summary> 9 /// </summary>
@@ -19,8 +21,12 @@ namespace WixToolset.Data
19 /// <summary>Module section type.</summary> 21 /// <summary>Module section type.</summary>
20 Module, 22 Module,
21 23
22 /// <summary>Product section type.</summary> 24 /// <summary>Package section type.</summary>
23 Product, 25 Package,
26
27 /// <summary>Package output type.</summary>
28 [Obsolete]
29 Product = Package,
24 30
25 /// <summary>Patch creation section type.</summary> 31 /// <summary>Patch creation section type.</summary>
26 PatchCreation, 32 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
217 case "PatchCreation": 217 case "PatchCreation":
218 output.Type = OutputType.PatchCreation; 218 output.Type = OutputType.PatchCreation;
219 break; 219 break;
220 case "Package":
220 case "Product": 221 case "Product":
221 output.Type = OutputType.Product; 222 output.Type = OutputType.Package;
222 break; 223 break;
223 case "Transform": 224 case "Transform":
224 output.Type = OutputType.Transform; 225 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 @@
38 <xs:enumeration value="Module" /> 38 <xs:enumeration value="Module" />
39 <xs:enumeration value="Patch" /> 39 <xs:enumeration value="Patch" />
40 <xs:enumeration value="PatchCreation" /> 40 <xs:enumeration value="PatchCreation" />
41 <xs:enumeration value="Package" />
41 <xs:enumeration value="Product" /> 42 <xs:enumeration value="Product" />
42 <xs:enumeration value="Transform" /> 43 <xs:enumeration value="Transform" />
43 </xs:restriction> 44 </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 @@
119 <xs:enumeration value="bundle"/> 119 <xs:enumeration value="bundle"/>
120 <xs:enumeration value="fragment" /> 120 <xs:enumeration value="fragment" />
121 <xs:enumeration value="module" /> 121 <xs:enumeration value="module" />
122 <xs:enumeration value="package" />
122 <xs:enumeration value="product" /> 123 <xs:enumeration value="product" />
123 <xs:enumeration value="patchCreation" /> 124 <xs:enumeration value="patchCreation" />
124 <xs:enumeration value="patch" /> 125 <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
21 { 21 {
22 var sln = new SourceLineNumber("test.wxs", 1); 22 var sln = new SourceLineNumber("test.wxs", 1);
23 23
24 var section = new IntermediateSection("test", SectionType.Product); 24 var section = new IntermediateSection("test", SectionType.Package);
25 25
26 section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent")) 26 section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent"))
27 { 27 {
@@ -66,7 +66,7 @@ namespace WixToolsetTest.Data
66 public void CanUpdateIntermediate() 66 public void CanUpdateIntermediate()
67 { 67 {
68 var sln = new SourceLineNumber("test.wxs", 1); 68 var sln = new SourceLineNumber("test.wxs", 1);
69 var section = new IntermediateSection("test", SectionType.Product); 69 var section = new IntermediateSection("test", SectionType.Package);
70 70
71 section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent")) 71 section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent"))
72 { 72 {
@@ -123,7 +123,7 @@ namespace WixToolsetTest.Data
123 { 123 {
124 var sln = new SourceLineNumber("test.wxs", 1); 124 var sln = new SourceLineNumber("test.wxs", 1);
125 125
126 var section = new IntermediateSection("test", SectionType.Product); 126 var section = new IntermediateSection("test", SectionType.Package);
127 127
128 var fieldDefs = new[] 128 var fieldDefs = new[]
129 { 129 {
@@ -182,7 +182,7 @@ namespace WixToolsetTest.Data
182 symbol.Set(1, 2); 182 symbol.Set(1, 2);
183 symbol.Set(2, true); 183 symbol.Set(2, true);
184 184
185 var section = new IntermediateSection("test", SectionType.Product); 185 var section = new IntermediateSection("test", SectionType.Package);
186 section.AddSymbol(symbol); 186 section.AddSymbol(symbol);
187 187
188 var intermediate1 = new Intermediate("TestIntermediate", new[] { section }, null); 188 var intermediate1 = new Intermediate("TestIntermediate", new[] { section }, null);
@@ -265,7 +265,7 @@ namespace WixToolsetTest.Data
265 265
266 symbol.AddTag("symbol1tag"); 266 symbol.AddTag("symbol1tag");
267 267
268 var section = new IntermediateSection("test", SectionType.Product); 268 var section = new IntermediateSection("test", SectionType.Package);
269 section.AddSymbol(symbol); 269 section.AddSymbol(symbol);
270 270
271 var intermediate1 = new Intermediate("TestIntermediate", new[] { section }, null); 271 var intermediate1 = new Intermediate("TestIntermediate", new[] { section }, null);
@@ -358,7 +358,7 @@ namespace WixToolsetTest.Data
358 new Localization(65001, 1252, null, bindVariables.ToDictionary(b => b.Id), controls.ToDictionary(c => c.GetKey())) 358 new Localization(65001, 1252, null, bindVariables.ToDictionary(b => b.Id), controls.ToDictionary(c => c.GetKey()))
359 }; 359 };
360 360
361 var section = new IntermediateSection("test", SectionType.Product); 361 var section = new IntermediateSection("test", SectionType.Package);
362 362
363 section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent")) 363 section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent"))
364 { 364 {
@@ -397,7 +397,7 @@ namespace WixToolsetTest.Data
397 var sln = new SourceLineNumber("test.wxs", 1); 397 var sln = new SourceLineNumber("test.wxs", 1);
398 var windowsInstallerData = new Wid.WindowsInstallerData(sln) 398 var windowsInstallerData = new Wid.WindowsInstallerData(sln)
399 { 399 {
400 Type = OutputType.Product, 400 Type = OutputType.Package,
401 }; 401 };
402 402
403 var fileTable = windowsInstallerData.EnsureTable(Wid.WindowsInstallerTableDefinitions.File); 403 var fileTable = windowsInstallerData.EnsureTable(Wid.WindowsInstallerTableDefinitions.File);
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 00:07:20 +0000