dd9a9271 · joebigelow/wix-1 · siGit Code & Deploy

src/api/wix/WixToolset.Data/OutputType.cs

+8 -2

@@ -2,6 +2,8 @@

2

3 namespace WixToolset.Data

4 {

5 + using System;

6 +

7 /// <summary>

8 /// Various types of output.

9 /// </summary>

@@ -25,8 +27,12 @@ namespace WixToolset.Data

27 /// <summary>Patch Creation output type.</summary>

28 PatchCreation,

29

28 - /// <summary>Product output type.</summary>

29 - Product,

30 + /// <summary>Package output type.</summary>

31 + Package,

32 +

33 + /// <summary>Package output type.</summary>

34 + [Obsolete]

35 + Product = Package,

36

37 /// <summary>Transform output type.</summary>

38 Transform,

src/api/wix/WixToolset.Data/SectionType.cs

+8 -2

@@ -2,6 +2,8 @@

2

3 namespace WixToolset.Data

4 {

5 + using System;

6 +

7 /// <summary>

8 /// Type of section.

9 /// </summary>

@@ -19,8 +21,12 @@ namespace WixToolset.Data

21 /// <summary>Module section type.</summary>

22 Module,

23

22 - /// <summary>Product section type.</summary>

23 - Product,

24 + /// <summary>Package section type.</summary>

25 + Package,

26 +

27 + /// <summary>Package output type.</summary>

28 + [Obsolete]

29 + Product = Package,

30

31 /// <summary>Patch creation section type.</summary>

32 PatchCreation,

src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs

+2 -1

@@ -217,8 +217,9 @@ namespace WixToolset.Data.WindowsInstaller

217 case "PatchCreation":

218 output.Type = OutputType.PatchCreation;

219 break;

220 + case "Package":

221 case "Product":

221 - output.Type = OutputType.Product;

222 + output.Type = OutputType.Package;

223 break;

224 case "Transform":

225 output.Type = OutputType.Transform;

src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/data.xsd

+1

@@ -38,6 +38,7 @@

38 <xs:enumeration value="Module" />

39 <xs:enumeration value="Patch" />

40 <xs:enumeration value="PatchCreation" />

41 + <xs:enumeration value="Package" />

42 <xs:enumeration value="Product" />

43 <xs:enumeration value="Transform" />

44 </xs:restriction>

src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd

+1

@@ -119,6 +119,7 @@

119 <xs:enumeration value="bundle"/>

120 <xs:enumeration value="fragment" />

121 <xs:enumeration value="module" />

122 + <xs:enumeration value="package" />

123 <xs:enumeration value="product" />

124 <xs:enumeration value="patchCreation" />

125 <xs:enumeration value="patch" />

src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs

+7 -7

@@ -21,7 +21,7 @@ namespace WixToolsetTest.Data

21 {

22 var sln = new SourceLineNumber("test.wxs", 1);

23

24 - var section = new IntermediateSection("test", SectionType.Product);

24 + var section = new IntermediateSection("test", SectionType.Package);

25

26 section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent"))

27 {

@@ -66,7 +66,7 @@ namespace WixToolsetTest.Data

66 public void CanUpdateIntermediate()

67 {

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

71 section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent"))

72 {

@@ -123,7 +123,7 @@ namespace WixToolsetTest.Data

123 {

124 var sln = new SourceLineNumber("test.wxs", 1);

125

126 - var section = new IntermediateSection("test", SectionType.Product);

126 + var section = new IntermediateSection("test", SectionType.Package);

127

128 var fieldDefs = new[]

129 {

@@ -182,7 +182,7 @@ namespace WixToolsetTest.Data

182 symbol.Set(1, 2);

183 symbol.Set(2, true);

184

185 - var section = new IntermediateSection("test", SectionType.Product);

185 + var section = new IntermediateSection("test", SectionType.Package);

186 section.AddSymbol(symbol);

187

188 var intermediate1 = new Intermediate("TestIntermediate", new[] { section }, null);

@@ -265,7 +265,7 @@ namespace WixToolsetTest.Data

265

266 symbol.AddTag("symbol1tag");

267

268 - var section = new IntermediateSection("test", SectionType.Product);

268 + var section = new IntermediateSection("test", SectionType.Package);

269 section.AddSymbol(symbol);

270

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()))

359 };

360

361 - var section = new IntermediateSection("test", SectionType.Product);

361 + var section = new IntermediateSection("test", SectionType.Package);

362

363 section.AddSymbol(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent"))

364 {

@@ -397,7 +397,7 @@ namespace WixToolsetTest.Data

397 var sln = new SourceLineNumber("test.wxs", 1);

398 var windowsInstallerData = new Wid.WindowsInstallerData(sln)

399 {

400 - Type = OutputType.Product,

400 + Type = OutputType.Package,

401 };

402

403 var fileTable = windowsInstallerData.EnsureTable(Wid.WindowsInstallerTableDefinitions.File);

src/tools/heat/UtilHeatExtension.cs

+1

@@ -263,6 +263,7 @@ namespace WixToolset.Harvesters

263 case "module":

264 utilMutator.TemplateType = TemplateType.Module;

265 break;

266 + case "package":

267 case "product":

268 utilMutator.TemplateType = TemplateType.Package ;

269 break;

src/wix/WixToolset.Converters.Symbolizer/ConvertSymbols.cs

+1 -1

@@ -823,7 +823,7 @@ namespace WixToolset.Converters.Symbolizer

823 case Wix3.OutputType.PatchCreation:

824 return SectionType.PatchCreation;

825 case Wix3.OutputType.Product:

826 - return SectionType.Product;

826 + return SectionType.Package;

827 case Wix3.OutputType.Transform:

828 case Wix3.OutputType.Unknown:

829 default:

src/wix/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs

+3 -3

@@ -60,7 +60,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

60 }

61

62 // If neither symbol is authored, default to a media template.

63 - if (SectionType.Product == this.Section.Type && mediaTemplateSymbols.Count == 0 && mediaSymbols.Count == 0)

63 + if (SectionType.Package == this.Section.Type && mediaTemplateSymbols.Count == 0 && mediaSymbols.Count == 0)

64 {

65 var mediaTemplate = new WixMediaTemplateSymbol()

66 {

@@ -166,7 +166,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

166 {

167 // When building a product, if the current file is not to be compressed or if

168 // the package set not to be compressed, don't cab it.

169 - if (SectionType.Product == this.Section.Type && (facade.Uncompressed || !this.FilesCompressed))

169 + if (SectionType.Package == this.Section.Type && (facade.Uncompressed || !this.FilesCompressed))

170 {

171 uncompressedFiles.Add(facade);

172 continue;

@@ -265,7 +265,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

265 // the package set not to be compressed, don't cab it.

266 var compressed = facade.Compressed;

267 var uncompressed = facade.Uncompressed;

268 - if (SectionType.Product == this.Section.Type && (uncompressed || (!compressed && !this.FilesCompressed)))

268 + if (SectionType.Package == this.Section.Type && (uncompressed || (!compressed && !this.FilesCompressed)))

269 {

270 uncompressedFiles.Add(facade);

271 }

src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs

+8 -8

@@ -109,7 +109,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

109

110 var section = this.Intermediate.Sections.Single();

111

112 - var packageSymbol = (section.Type == SectionType.Product) ? this.GetSingleSymbol<WixPackageSymbol>(section) : null;

112 + var packageSymbol = (section.Type == SectionType.Package) ? this.GetSingleSymbol<WixPackageSymbol>(section) : null;

113 var moduleSymbol = (section.Type == SectionType.Module) ? this.GetSingleSymbol<WixModuleSymbol>(section) : null;

114 var patchSymbol = (section.Type == SectionType.Patch) ? this.GetSingleSymbol<WixPatchSymbol>(section) : null;

115

@@ -127,7 +127,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

127 tableDefinitions = command.TableDefinitions;

128 }

129

130 - if (section.Type == SectionType.Product)

130 + if (section.Type == SectionType.Package)

131 {

132 this.ProcessProductVersion(packageSymbol, section, validate: false);

133 }

@@ -188,7 +188,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

188 }

189

190 // Process dependency references.

191 - if (SectionType.Product == section.Type || SectionType.Module == section.Type)

191 + if (SectionType.Package == section.Type || SectionType.Module == section.Type)

192 {

193 var dependencyRefs = section.Symbols.OfType<WixDependencyRefSymbol>().ToList();

194

@@ -200,7 +200,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

200 }

201

202 // Process SoftwareTags in MSI packages.

203 - if (SectionType.Product == section.Type)

203 + if (SectionType.Package == section.Type)

204 {

205 var softwareTags = section.Symbols.OfType<WixPackageTagSymbol>().ToList();

206

@@ -250,7 +250,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

250 }

251

252 // Retrieve file information from merge modules.

253 - if (SectionType.Product == section.Type)

253 + if (SectionType.Package == section.Type)

254 {

255 var wixMergeSymbols = section.Symbols.OfType<WixMergeSymbol>().ToList();

256

@@ -293,7 +293,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

293

294 // Now that delayed fields are processed, fixup the package version (if needed) and validate it

295 // which will short circuit duplicate errors later if the ProductVersion is invalid.

296 - if (SectionType.Product == section.Type)

296 + if (SectionType.Package == section.Type)

297 {

298 this.ProcessProductVersion(packageSymbol, section, validate: true);

299 }

@@ -330,7 +330,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

330 }

331 }

332

333 - if (SectionType.Product == section.Type)

333 + if (SectionType.Package == section.Type)

334 {

335 var command = new ValidateWindowsInstallerProductConstraints(this.Messaging, section);

336 command.Execute();

@@ -402,7 +402,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

402 var unsuppress = new AddBackSuppressedSequenceTablesCommand(data, tableDefinitions);

403 suppressedTableNames = unsuppress.Execute();

404 }

405 - else if (data.Type == OutputType.Product) // we can create instance transforms since Component Guids and Outputs are created.

405 + else if (data.Type == OutputType.Package) // we can create instance transforms since Component Guids and Outputs are created.

406 {

407 var command = new CreateInstanceTransformsCommand(section, data, tableDefinitions, this.WindowsInstallerBackendHelper);

408 command.Execute();

src/wix/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs

+1 -1

@@ -108,7 +108,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

108 var exportBasePath = Path.Combine(this.IntermediateFolder, stageFolder);

109 var extractFilesFolder = Path.Combine(exportBasePath, "File");

110

111 - var command = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, path, null, OutputType.Product, exportBasePath, extractFilesFolder, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: false);

111 + var command = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, path, null, OutputType.Package, exportBasePath, extractFilesFolder, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: false);

112 data = command.Execute();

113 }

114

src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs

+5 -5

@@ -1389,7 +1389,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

1389 this.Data.EnsureTable(this.TableDefinitions["Properties"]);

1390 break;

1391

1392 - case OutputType.Product:

1392 + case OutputType.Package:

1393 this.Data.EnsureTable(this.TableDefinitions["File"]);

1394 this.Data.EnsureTable(this.TableDefinitions["Media"]);

1395 break;

@@ -1476,7 +1476,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

1476 }

1477 break;

1478

1479 - case OutputType.Product:

1479 + case OutputType.Package:

1480 if ("ModuleAdminExecuteSequence" == table.Name ||

1481 "ModuleAdminUISequence" == table.Name ||

1482 "ModuleAdvtExecuteSequence" == table.Name ||

@@ -1540,7 +1540,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

1540 }

1541

1542 // Ensure the Error table exists if output is marked for MSI 1.0 or below (see ICE40).

1543 - if (outputInstallerVersion <= 100 && OutputType.Product == this.Data.Type)

1543 + if (outputInstallerVersion <= 100 && OutputType.Package == this.Data.Type)

1544 {

1545 this.Data.EnsureTable(this.TableDefinitions["Error"]);

1546 }

@@ -1581,8 +1581,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind

1581 return OutputType.Bundle;

1582 case SectionType.Module:

1583 return OutputType.Module;

1584 - case SectionType.Product:

1585 - return OutputType.Product;

1584 + case SectionType.Package:

1585 + return OutputType.Package;

1586 case SectionType.PatchCreation:

1587 return OutputType.PatchCreation;

1588 case SectionType.Patch:

src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessPropertiesCommand.cs

+2 -2

@@ -39,7 +39,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

39 PropertySymbol languageSymbol = null;

40 var variableCache = this.PopulateDelayedVariables ? new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase) : null;

41

42 - if (SectionType.Product == this.Section.Type || variableCache != null)

42 + if (SectionType.Package == this.Section.Type || variableCache != null)

43 {

44 foreach (var propertySymbol in this.Section.Symbols.OfType<PropertySymbol>())

45 {

@@ -60,7 +60,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

60 }

61 }

62

63 - if (this.Section.Type == SectionType.Product && String.IsNullOrEmpty(languageSymbol?.Value))

63 + if (this.Section.Type == SectionType.Package && String.IsNullOrEmpty(languageSymbol?.Value))

64 {

65 if (languageSymbol == null)

66 {

src/wix/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs

+1 -1

@@ -343,7 +343,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

343 var set = new HashSet<string>();

344

345 // gather the required actions for the output type

346 - if (SectionType.Product == this.Section.Type)

346 + if (SectionType.Package == this.Section.Type)

347 {

348 // AdminExecuteSequence table

349 set.Add("AdminExecuteSequence/CostFinalize");

src/wix/WixToolset.Core.WindowsInstaller/CommandLine/DecompilerSubcommand.cs

+2 -2

@@ -207,7 +207,7 @@ namespace WixToolset.Core.WindowsInstaller.CommandLine

207 case "package":

208 case "msi":

209 case ".msi":

210 - decompileType = OutputType.Product;

210 + decompileType = OutputType.Package;

211 break;

212

213 case "mergemodule":

@@ -231,7 +231,7 @@ namespace WixToolset.Core.WindowsInstaller.CommandLine

231 {

232 switch (decompileType)

233 {

234 - case OutputType.Product:

234 + case OutputType.Package:

235 return this.SaveAsData ? ".wixmsi" : ".wxs";

236

237 case OutputType.Module:

src/wix/WixToolset.Core.WindowsInstaller/CommandLine/TransformSubcommand.cs

+1 -1

@@ -382,7 +382,7 @@ namespace WixToolset.Core.WindowsInstaller.CommandLine

382 {

383 if (!DataLoader.TryLoadWindowsInstallerData(path, out var data))

384 {

385 - var unbindCommand = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, path, null, OutputType.Product, this.ExportBasePath, null, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: false);

385 + var unbindCommand = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, path, null, OutputType.Package, this.ExportBasePath, null, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: false);

386 data = unbindCommand.Execute();

387 }

388

src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs

+9 -9

@@ -136,7 +136,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile

136 case OutputType.PatchCreation:

137 this.DecompilerHelper.RootElement = new XElement(Names.PatchCreationElement);

138 break;

139 - case OutputType.Product:

139 + case OutputType.Package:

140 this.DecompilerHelper.RootElement = new XElement(Names.PackageElement);

141 break;

142 default:

@@ -1234,7 +1234,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile

1234 {

1235 xFile.SetAttributeValue("Source", String.Concat(this.BaseSourcePath, Path.DirectorySeparatorChar, "File", Path.DirectorySeparatorChar, fileId, '.', this.ModularizationGuid.Substring(1, 36).Replace('-', '_')));

1236 }

1237 - else if (fileCompressed == "yes" || (fileCompressed != "no" && this.Compressed) || (OutputType.Product == this.OutputType && this.TreatProductAsModule))

1237 + else if (fileCompressed == "yes" || (fileCompressed != "no" && this.Compressed) || (OutputType.Package == this.OutputType && this.TreatProductAsModule))

1238 {

1239 xFile.SetAttributeValue("Source", String.Concat(this.BaseSourcePath, Path.DirectorySeparatorChar, "File", Path.DirectorySeparatorChar, fileId));

1240 }

@@ -1940,7 +1940,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile

1940 private void FinalizeSequenceTables(TableIndexedCollection tables)

1941 {

1942 // finalize the normal sequence tables

1943 - if (OutputType.Product == this.OutputType && !this.TreatProductAsModule)

1943 + if (OutputType.Package == this.OutputType && !this.TreatProductAsModule)

1944 {

1945 foreach (SequenceTable sequenceTable in Enum.GetValues(typeof(SequenceTable)))

1946 {

@@ -3009,7 +3009,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile

3009 {

3010 var table = tables["_SummaryInformation"];

3011

3012 - if (OutputType.Module == this.OutputType || OutputType.Product == this.OutputType)

3012 + if (OutputType.Module == this.OutputType || OutputType.Package == this.OutputType)

3013 {

3014 var xSummaryInformation = new XElement(Names.SummaryInformationElement);

3015

@@ -3071,7 +3071,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile

3071 if (0x1 == (wordCount & 0x1))

3072 {

3073 this.ShortNames = true;

3074 - if (OutputType.Product == this.OutputType)

3074 + if (OutputType.Package == this.OutputType)

3075 {

3076 this.DecompilerHelper.RootElement.SetAttributeValue("ShortNames", "yes");

3077 }

@@ -3082,7 +3082,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile

3082 this.Compressed = true;

3083 }

3084

3085 - if (OutputType.Product == this.OutputType)

3085 + if (OutputType.Package == this.OutputType)

3086 {

3087 if (0x8 == (wordCount & 0x8))

3088 {

@@ -3103,7 +3103,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile

3103 }

3104 }

3105

3106 - if (OutputType.Product == this.OutputType && !this.Compressed)

3106 + if (OutputType.Package == this.OutputType && !this.Compressed)

3107 {

3108 this.DecompilerHelper.RootElement.SetAttributeValue("Compressed", "no");

3109 }

@@ -6245,7 +6245,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile

6245

6246 continue;

6247 }

6248 - else if (OutputType.Product == this.OutputType)

6248 + else if (OutputType.Package == this.OutputType)

6249 {

6250 switch (id)

6251 {

@@ -7522,7 +7522,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile

7522 private void SetPrimaryFeature(Row row, int featureColumnIndex, int componentColumnIndex)

7523 {

7524 // only products contain primary features

7525 - if (OutputType.Product == this.OutputType)

7525 + if (OutputType.Package == this.OutputType)

7526 {

7527 var featureField = row.Fields[featureColumnIndex];

7528 var componentField = row.Fields[componentColumnIndex];

src/wix/WixToolset.Core.WindowsInstaller/Melter.cs

+1 -1

@@ -84,7 +84,7 @@ namespace WixToolset

84

85 PreDecompile(wixout);

86

87 - wixout.Type = OutputType.Product;

87 + wixout.Type = OutputType.Package;

88 this.decompiler.TreatProductAsModule = true;

89 Wix.Wix wix = this.decompiler.Decompile(wixout);

90

src/wix/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs

+1 -1

@@ -61,7 +61,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind

61 {

62 foreach (var mediaRow in mediaTable.Rows.Cast<MediaRow>().Where(r => !String.IsNullOrEmpty(r.Cabinet)))

63 {

64 - if (OutputType.Product == this.Output.Type ||

64 + if (OutputType.Package == this.Output.Type ||

65 (OutputType.Transform == this.Output.Type && RowOperation.Add == mediaRow.Operation))

66 {

67 if (mediaRow.Cabinet.StartsWith("#", StringComparison.Ordinal))

src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindTransformCommand.cs

+3 -3

@@ -98,7 +98,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind

98 {

99 var schemaData = new WindowsInstallerData(new SourceLineNumber(schemaDatabasePath))

100 {

101 - Type = OutputType.Product,

101 + Type = OutputType.Package,

102 };

103

104 foreach (var tableDefinition in this.TableDefinitions)

@@ -119,7 +119,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind

119 using (var msiDatabase = this.ApplyTransformToSchemaDatabase(schemaDatabasePath, TransformErrorConditions.All | TransformErrorConditions.ViewTransform))

120 {

121 // unbind the database

122 - var unbindCommand = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, schemaDatabasePath, msiDatabase, OutputType.Product, null, null, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: true);

122 + var unbindCommand = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, schemaDatabasePath, msiDatabase, OutputType.Package, null, null, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: true);

123 var transformViewOutput = unbindCommand.Execute();

124

125 return transformViewOutput.Tables["_TransformView"];

@@ -180,7 +180,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind

180 {

181

182 // unbind the database

183 - var unbindCommand = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, schemaDatabasePath, database, OutputType.Product, this.ExportBasePath, null, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: true);

183 + var unbindCommand = new UnbindDatabaseCommand(this.Messaging, this.BackendHelper, this.FileSystem, this.PathResolver, schemaDatabasePath, database, OutputType.Package, this.ExportBasePath, null, this.IntermediateFolder, enableDemodularization: false, skipSummaryInfo: true);

184 output = unbindCommand.Execute();

185 }

186

src/wix/WixToolset.Core/CommandLine/BuildCommand.cs

+3 -3

@@ -418,7 +418,7 @@ namespace WixToolset.Core.CommandLine

418 return ".exe";

419 case SectionType.Module:

420 return ".msm";

421 - case SectionType.Product:

421 + case SectionType.Package:

422 return ".msi";

423 case SectionType.PatchCreation:

424 return ".pcp";

@@ -445,7 +445,7 @@ namespace WixToolset.Core.CommandLine

445 return ".msp";

446 case OutputType.PatchCreation:

447 return ".pcp";

448 - case OutputType.Product:

448 + case OutputType.Package:

449 return ".msi";

450 case OutputType.Transform:

451 return ".mst";

@@ -701,7 +701,7 @@ namespace WixToolset.Core.CommandLine

701 case "product":

702 case "package":

703 case ".msi":

704 - return Data.OutputType.Product;

704 + return Data.OutputType.Package;

705

706 case "transform":

707 case ".mst":

src/wix/WixToolset.Core/Compiler_Package.cs

+1 -1

@@ -157,7 +157,7 @@ namespace WixToolset.Core

157 try

158 {

159 this.compilingProduct = true;

160 - this.Core.CreateActiveSection(productCode, SectionType.Product, this.Context.CompilationId);

160 + this.Core.CreateActiveSection(productCode, SectionType.Package, this.Context.CompilationId);

161

162 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "Manufacturer"), manufacturer, false, false, false, true);

163 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductCode"), productCode, false, false, false, true);

src/wix/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs

+1 -1

@@ -58,7 +58,7 @@ namespace WixToolset.Core.Link

58 foreach (var section in this.Sections)

59 {

60 // Try to find the one and only entry section.

61 - if (SectionType.Product == section.Type || SectionType.Module == section.Type || SectionType.PatchCreation == section.Type || SectionType.Patch == section.Type || SectionType.Bundle == section.Type)

61 + if (SectionType.Package == section.Type || SectionType.Module == section.Type || SectionType.PatchCreation == section.Type || SectionType.Patch == section.Type || SectionType.Bundle == section.Type)

62 {

63 // TODO: remove this?

64 //if (SectionType.Unknown != expectedEntrySectionType && section.Type != expectedEntrySectionType)

src/wix/WixToolset.Core/Linker.cs

+8 -8

@@ -193,49 +193,49 @@ namespace WixToolset.Core

193 switch (symbol.Definition.Type)

194 {

195 case SymbolDefinitionType.Class:

196 - if (SectionType.Product == resolvedSection.Type)

196 + if (SectionType.Package == resolvedSection.Type)

197 {

198 this.ResolveFeatures(symbol, (int)ClassSymbolFields.ComponentRef, (int)ClassSymbolFields.FeatureRef, componentsToFeatures, multipleFeatureComponents);

199 }

200 break;

201

202 case SymbolDefinitionType.Extension:

203 - if (SectionType.Product == resolvedSection.Type)

203 + if (SectionType.Package == resolvedSection.Type)

204 {

205 this.ResolveFeatures(symbol, (int)ExtensionSymbolFields.ComponentRef, (int)ExtensionSymbolFields.FeatureRef, componentsToFeatures, multipleFeatureComponents);

206 }

207 break;

208

209 case SymbolDefinitionType.Assembly:

210 - if (SectionType.Product == resolvedSection.Type)

210 + if (SectionType.Package == resolvedSection.Type)

211 {

212 this.ResolveFeatures(symbol, (int)AssemblySymbolFields.ComponentRef, (int)AssemblySymbolFields.FeatureRef, componentsToFeatures, multipleFeatureComponents);

213 }

214 break;

215

216 case SymbolDefinitionType.PublishComponent:

217 - if (SectionType.Product == resolvedSection.Type)

217 + if (SectionType.Package == resolvedSection.Type)

218 {

219 this.ResolveFeatures(symbol, (int)PublishComponentSymbolFields.ComponentRef, (int)PublishComponentSymbolFields.FeatureRef, componentsToFeatures, multipleFeatureComponents);

220 }

221 break;

222

223 case SymbolDefinitionType.Shortcut:

224 - if (SectionType.Product == resolvedSection.Type)

224 + if (SectionType.Package == resolvedSection.Type)

225 {

226 this.ResolveFeatures(symbol, (int)ShortcutSymbolFields.ComponentRef, (int)ShortcutSymbolFields.Target, componentsToFeatures, multipleFeatureComponents);

227 }

228 break;

229

230 case SymbolDefinitionType.TypeLib:

231 - if (SectionType.Product == resolvedSection.Type)

231 + if (SectionType.Package == resolvedSection.Type)

232 {

233 this.ResolveFeatures(symbol, (int)TypeLibSymbolFields.ComponentRef, (int)TypeLibSymbolFields.FeatureRef, componentsToFeatures, multipleFeatureComponents);

234 }

235 break;

236

237 case SymbolDefinitionType.WixMerge:

238 - if (SectionType.Product == resolvedSection.Type)

238 + if (SectionType.Package == resolvedSection.Type)

239 {

240 this.ResolveFeatures(symbol, -1, (int)WixMergeSymbolFields.FeatureRef, modulesToFeatures, null);

241 }

@@ -288,7 +288,7 @@ namespace WixToolset.Core

288 var command = new FlattenAndProcessBundleTablesCommand(resolvedSection, this.Messaging);

289 command.Execute();

290 }

291 - else if (resolvedSection.Type == SectionType.Product || resolvedSection.Type == SectionType.Module)

291 + else if (resolvedSection.Type == SectionType.Package || resolvedSection.Type == SectionType.Module)

292 {

293 // Packages and modules get standard directories add.

294 var command = new AddRequiredStandardDirectories(resolvedSection, references);

src/wix/WixToolset.Sdk/tools/wix.targets

+1 -1

@@ -519,7 +519,7 @@

519 ================================================================================================

520 GetTargetPath - OVERRIDE DependsOn

521

522 - This stand-alone target returns the name of the build product (i.e. MSI, MSM) that would be

522 + This stand-alone target returns the name of the build package (i.e. MSI, MSM) that would be

523 produced if we built this project.

524 ================================================================================================

525 -->

src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs

+1 -1

@@ -20,7 +20,7 @@ namespace WixToolsetTest.CoreIntegration

20 [Fact]

21 public void MustCompileBeforeLinking()

22 {

23 - var intermediate1 = new Intermediate("TestIntermediate1", new[] { new IntermediateSection("test1", SectionType.Product) }, null);

23 + var intermediate1 = new Intermediate("TestIntermediate1", new[] { new IntermediateSection("test1", SectionType.Package) }, null);

24 var intermediate2 = new Intermediate("TestIntermediate2", new[] { new IntermediateSection("test2", SectionType.Fragment) }, null);

25 var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();

26

Normalize SectionType and OutputType "Product" to "Package"