From 38afa9e7bc7eacc021f8805f607368a05751e3c3 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 25 Jun 2020 14:43:50 -0700 Subject: The Great Tuple to Symbol Rename (tm) --- src/WixToolset.Core.Burn/Bind/BaseSearchFacade.cs | 16 +- src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs | 182 ++-- .../Bind/ExtensionSearchFacade.cs | 6 +- .../Bind/GenerateManifestDataFromIRCommand.cs | 176 ++-- .../Bind/LegacySearchFacade.cs | 84 +- .../Bind/ProcessDependencyProvidersCommand.cs | 72 +- .../Bind/SetVariableSearchFacade.cs | 16 +- .../AutomaticallySlipstreamPatchesCommand.cs | 62 +- ...CreateBootstrapperApplicationManifestCommand.cs | 128 +-- .../Bundles/CreateBundleExeCommand.cs | 22 +- .../CreateBundleExtensionManifestCommand.cs | 20 +- .../Bundles/CreateBurnManifestCommand.cs | 170 ++-- .../Bundles/CreateContainerCommand.cs | 8 +- .../Bundles/CreateNonUXContainers.cs | 38 +- .../Bundles/GetPackageFacadesCommand.cs | 18 +- .../OrderPackagesAndRollbackBoundariesCommand.cs | 46 +- .../Bundles/OrderSearchesCommand.cs | 68 +- src/WixToolset.Core.Burn/Bundles/PackageFacade.cs | 16 +- .../Bundles/ProcessExePackageCommand.cs | 16 +- .../Bundles/ProcessMsiPackageCommand.cs | 96 +- .../Bundles/ProcessMspPackageCommand.cs | 28 +- .../Bundles/ProcessMsuPackageCommand.cs | 16 +- .../Bundles/ProcessPayloadsCommand.cs | 12 +- .../Bundles/VerifyPayloadsWithCatalogCommand.cs | 8 +- .../ExtensibilityServices/BurnBackendHelper.cs | 18 +- .../Bind/AddBackSuppressedSequenceTablesCommand.cs | 2 +- .../Bind/AddCreateFoldersCommand.cs | 16 +- .../Bind/AssignMediaCommand.cs | 100 +- .../Bind/AttachPatchTransformsCommand.cs | 170 ++-- .../Bind/BindDatabaseCommand.cs | 26 +- .../Bind/BindSummaryInfoCommand.cs | 24 +- .../Bind/BindTransformCommand.cs | 2 +- .../Bind/CalculateComponentGuids.cs | 52 +- .../Bind/CopyTransformDataCommand.cs | 14 +- .../Bind/CreateCabinetsCommand.cs | 48 +- .../Bind/CreateDeltaPatchesCommand.cs | 8 +- .../Bind/CreateInstanceTransformsCommand.cs | 42 +- .../Bind/CreateOutputFromIRCommand.cs | 1074 ++++++++++---------- .../Bind/CreatePatchTransformsCommand.cs | 16 +- .../Bind/CreateSpecialPropertiesCommand.cs | 14 +- .../Bind/ExtractMergeModuleFilesCommand.cs | 26 +- .../Bind/GenerateTransformCommand.cs | 2 +- .../Bind/GetFileFacadesCommand.cs | 14 +- .../Bind/LoadTableDefinitionsCommand.cs | 16 +- .../Bind/MergeModulesCommand.cs | 12 +- .../Bind/ModularizeCommand.cs | 16 +- .../Bind/ProcessUncompressedFilesCommand.cs | 12 +- .../Bind/SequenceActionsCommand.cs | 344 +++---- .../Bind/UpdateFileFacadesCommand.cs | 50 +- .../Bind/UpdateFromTextFilesCommand.cs | 8 +- .../Bind/UpdateMediaSequencesCommand.cs | 38 +- .../Bind/UpdateTransformsWithFileFacades.cs | 14 +- .../Bind/ValidateComponentGuidsCommand.cs | 16 +- .../Decompile/Decompiler.cs | 218 ++-- src/WixToolset.Core.WindowsInstaller/Differ.cs | 2 +- .../WindowsInstallerBackendHelper.cs | 20 +- src/WixToolset.Core.WindowsInstaller/MspBackend.cs | 2 +- src/WixToolset.Core/Bind/DelayedField.cs | 12 +- src/WixToolset.Core/Bind/FileFacade.cs | 58 +- src/WixToolset.Core/Bind/FileResolver.cs | 16 +- .../Bind/ResolveDelayedFieldsCommand.cs | 10 +- src/WixToolset.Core/Bind/ResolveFieldsCommand.cs | 38 +- src/WixToolset.Core/Binder.cs | 10 +- src/WixToolset.Core/CommandLine/BuildCommand.cs | 10 +- src/WixToolset.Core/Compiler.cs | 328 +++--- src/WixToolset.Core/CompilerCore.cs | 48 +- src/WixToolset.Core/Compiler_2.cs | 206 ++-- src/WixToolset.Core/Compiler_Bundle.cs | 142 +-- src/WixToolset.Core/Compiler_EmbeddedUI.cs | 12 +- src/WixToolset.Core/Compiler_Module.cs | 32 +- src/WixToolset.Core/Compiler_Patch.cs | 16 +- src/WixToolset.Core/Compiler_PatchCreation.cs | 38 +- src/WixToolset.Core/Compiler_UI.cs | 170 ++-- .../ExtensibilityServices/ParseHelper.cs | 126 +-- .../TupleDefinitionCreator.cs | 24 +- src/WixToolset.Core/Librarian.cs | 10 +- .../Link/FindEntrySectionAndLoadSymbolsCommand.cs | 34 +- .../Link/IntermediateTupleExtensions.cs | 8 +- .../Link/ReportConflictingTuplesCommand.cs | 18 +- .../Link/ResolveReferencesCommand.cs | 104 +- .../Link/WixComplexReferenceTupleExtensions.cs | 32 +- src/WixToolset.Core/Link/WixGroupingOrdering.cs | 16 +- src/WixToolset.Core/LinkContext.cs | 2 +- src/WixToolset.Core/Linker.cs | 178 ++-- src/WixToolset.Core/Resolver.cs | 50 +- src/WixToolset.Core/WixToolsetServiceProvider.cs | 2 +- .../Example.Extension/ExampleCompilerExtension.cs | 10 +- src/test/Example.Extension/ExampleExtensionData.cs | 10 +- src/test/Example.Extension/ExampleSearchTuple.cs | 14 +- .../Example.Extension/ExampleTableDefinitions.cs | 6 +- src/test/Example.Extension/ExampleTuple.cs | 14 +- .../Example.Extension/ExampleTupleDefinitions.cs | 40 +- .../ExampleWindowsInstallerBackendExtension.cs | 16 +- .../BundleFixture.cs | 14 +- .../ExtensionFixture.cs | 14 +- .../LinkerFixture.cs | 12 +- .../WixToolsetTest.CoreIntegration/MsiFixture.cs | 76 +- .../MsiQueryFixture.cs | 4 +- .../WixToolsetTest.CoreIntegration/ParseFixture.cs | 4 +- .../WixiplFixture.cs | 28 +- .../WixlibFixture.cs | 38 +- .../WixlibQueryFixture.cs | 16 +- 102 files changed, 2913 insertions(+), 2913 deletions(-) diff --git a/src/WixToolset.Core.Burn/Bind/BaseSearchFacade.cs b/src/WixToolset.Core.Burn/Bind/BaseSearchFacade.cs index d00c5778..0da78797 100644 --- a/src/WixToolset.Core.Burn/Bind/BaseSearchFacade.cs +++ b/src/WixToolset.Core.Burn/Bind/BaseSearchFacade.cs @@ -4,23 +4,23 @@ namespace WixToolset.Core.Burn { using System; using System.Xml; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; internal abstract class BaseSearchFacade : ISearchFacade { - protected WixSearchTuple SearchTuple { get; set; } + protected WixSearchSymbol SearchSymbol { get; set; } public virtual void WriteXml(XmlTextWriter writer) { - writer.WriteAttributeString("Id", this.SearchTuple.Id.Id); - writer.WriteAttributeString("Variable", this.SearchTuple.Variable); - if (!String.IsNullOrEmpty(this.SearchTuple.Condition)) + writer.WriteAttributeString("Id", this.SearchSymbol.Id.Id); + writer.WriteAttributeString("Variable", this.SearchSymbol.Variable); + if (!String.IsNullOrEmpty(this.SearchSymbol.Condition)) { - writer.WriteAttributeString("Condition", this.SearchTuple.Condition); + writer.WriteAttributeString("Condition", this.SearchSymbol.Condition); } - if (!String.IsNullOrEmpty(this.SearchTuple.BundleExtensionRef)) + if (!String.IsNullOrEmpty(this.SearchSymbol.BundleExtensionRef)) { - writer.WriteAttributeString("ExtensionId", this.SearchTuple.BundleExtensionRef); + writer.WriteAttributeString("ExtensionId", this.SearchSymbol.BundleExtensionRef); } } } diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs index 943625ec..a64bdcc1 100644 --- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs +++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs @@ -13,7 +13,7 @@ namespace WixToolset.Core.Burn using WixToolset.Core.Burn.Bundles; using WixToolset.Data; using WixToolset.Data.Burn; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; @@ -88,28 +88,28 @@ namespace WixToolset.Core.Burn // We shouldn't really get past the linker phase if there are // no group items... that means that there's no UX, no Chain, // *and* no Containers! - var chainPackageTuples = this.GetRequiredTuples(); + var chainPackageSymbols = this.GetRequiredSymbols(); - var wixGroupTuples = this.GetRequiredTuples(); + var wixGroupSymbols = this.GetRequiredSymbols(); // Ensure there is one and only one row in the WixBundle table. // The compiler and linker behavior should have colluded to get // this behavior. - var bundleTuple = this.GetSingleTuple(); + var bundleSymbol = this.GetSingleSymbol(); - bundleTuple.ProviderKey = bundleTuple.BundleId = Guid.NewGuid().ToString("B").ToUpperInvariant(); + bundleSymbol.ProviderKey = bundleSymbol.BundleId = Guid.NewGuid().ToString("B").ToUpperInvariant(); - bundleTuple.Attributes |= WixBundleAttributes.PerMachine; // default to per-machine but the first-per user package wil flip the bundle per-user. + bundleSymbol.Attributes |= WixBundleAttributes.PerMachine; // default to per-machine but the first-per user package wil flip the bundle per-user. // Ensure there is one and only one row in the WixBootstrapperApplication table. // The compiler and linker behavior should have colluded to get // this behavior. - var bundleApplicationTuple = this.GetSingleTuple(); + var bundleApplicationSymbol = this.GetSingleSymbol(); // Ensure there is one and only one row in the WixChain table. // The compiler and linker behavior should have colluded to get // this behavior. - var chainTuple = this.GetSingleTuple(); + var chainSymbol = this.GetSingleSymbol(); if (this.Messaging.EncounteredError) { @@ -122,7 +122,7 @@ namespace WixToolset.Core.Burn var orderSearchesCommand = new OrderSearchesCommand(this.Messaging, section); orderSearchesCommand.Execute(); var orderedSearches = orderSearchesCommand.OrderedSearchFacades; - var extensionSearchTuplesById = orderSearchesCommand.ExtensionSearchTuplesByExtensionId; + var extensionSearchSymbolsById = orderSearchesCommand.ExtensionSearchSymbolsByExtensionId; // Extract files that come from binary .wixlibs and WixExtensions (this does not extract files from merge modules). { @@ -133,29 +133,29 @@ namespace WixToolset.Core.Burn } // Get the explicit payloads. - var payloadTuples = section.Tuples.OfType().ToDictionary(t => t.Id.Id); + var payloadSymbols = section.Symbols.OfType().ToDictionary(t => t.Id.Id); // Update explicitly authored payloads with their parent package and container (as appropriate) // to make it easier to gather the payloads later. - foreach (var groupTuple in wixGroupTuples) + foreach (var groupSymbol in wixGroupSymbols) { - if (ComplexReferenceChildType.Payload == groupTuple.ChildType) + if (ComplexReferenceChildType.Payload == groupSymbol.ChildType) { - var payloadTuple = payloadTuples[groupTuple.ChildId]; + var payloadSymbol = payloadSymbols[groupSymbol.ChildId]; - if (ComplexReferenceParentType.Package == groupTuple.ParentType) + if (ComplexReferenceParentType.Package == groupSymbol.ParentType) { - Debug.Assert(String.IsNullOrEmpty(payloadTuple.PackageRef)); - payloadTuple.PackageRef = groupTuple.ParentId; + Debug.Assert(String.IsNullOrEmpty(payloadSymbol.PackageRef)); + payloadSymbol.PackageRef = groupSymbol.ParentId; } - else if (ComplexReferenceParentType.Container == groupTuple.ParentType) + else if (ComplexReferenceParentType.Container == groupSymbol.ParentType) { - Debug.Assert(String.IsNullOrEmpty(payloadTuple.ContainerRef)); - payloadTuple.ContainerRef = groupTuple.ParentId; + Debug.Assert(String.IsNullOrEmpty(payloadSymbol.ContainerRef)); + payloadSymbol.ContainerRef = groupSymbol.ParentId; } - else if (ComplexReferenceParentType.Layout == groupTuple.ParentType) + else if (ComplexReferenceParentType.Layout == groupSymbol.ParentType) { - payloadTuple.LayoutOnly = true; + payloadSymbol.LayoutOnly = true; } } } @@ -165,44 +165,44 @@ namespace WixToolset.Core.Burn // Process the explicitly authored payloads. ISet processedPayloads; { - var command = new ProcessPayloadsCommand(this.ServiceProvider, this.BackendHelper, payloadTuples.Values, bundleTuple.DefaultPackagingType, layoutDirectory); + var command = new ProcessPayloadsCommand(this.ServiceProvider, this.BackendHelper, payloadSymbols.Values, bundleSymbol.DefaultPackagingType, layoutDirectory); command.Execute(); fileTransfers.AddRange(command.FileTransfers); trackedFiles.AddRange(command.TrackedFiles); - processedPayloads = new HashSet(payloadTuples.Keys); + processedPayloads = new HashSet(payloadSymbols.Keys); } IDictionary facades; { - var command = new GetPackageFacadesCommand(chainPackageTuples, section); + var command = new GetPackageFacadesCommand(chainPackageSymbols, section); command.Execute(); facades = command.PackageFacades; } - // Process each package facade. Note this is likely to add payloads and other tuples so + // Process each package facade. Note this is likely to add payloads and other symbols so // note that any indexes created above may be out of date now. foreach (var facade in facades.Values) { - switch (facade.PackageTuple.Type) + switch (facade.PackageSymbol.Type) { case WixBundlePackageType.Exe: { - var command = new ProcessExePackageCommand(facade, payloadTuples); + var command = new ProcessExePackageCommand(facade, payloadSymbols); command.Execute(); } break; case WixBundlePackageType.Msi: { - var command = new ProcessMsiPackageCommand(this.ServiceProvider, this.BackendExtensions, section, facade, payloadTuples); + var command = new ProcessMsiPackageCommand(this.ServiceProvider, this.BackendExtensions, section, facade, payloadSymbols); command.Execute(); if (null != variableCache) { - var msiPackage = (WixBundleMsiPackageTuple)facade.SpecificPackageTuple; + var msiPackage = (WixBundleMsiPackageSymbol)facade.SpecificPackageSymbol; variableCache.Add(String.Concat("packageLanguage.", facade.PackageId), msiPackage.ProductLanguage.ToString()); if (null != msiPackage.Manufacturer) @@ -215,14 +215,14 @@ namespace WixToolset.Core.Burn case WixBundlePackageType.Msp: { - var command = new ProcessMspPackageCommand(this.Messaging, section, facade, payloadTuples); + var command = new ProcessMspPackageCommand(this.Messaging, section, facade, payloadSymbols); command.Execute(); } break; case WixBundlePackageType.Msu: { - var command = new ProcessMsuPackageCommand(facade, payloadTuples); + var command = new ProcessMsuPackageCommand(facade, payloadSymbols); command.Execute(); } break; @@ -230,7 +230,7 @@ namespace WixToolset.Core.Burn if (null != variableCache) { - BindBundleCommand.PopulatePackageVariableCache(facade.PackageTuple, variableCache); + BindBundleCommand.PopulatePackageVariableCache(facade.PackageSymbol, variableCache); } } @@ -241,13 +241,13 @@ namespace WixToolset.Core.Burn // Reindex the payloads now that all the payloads (minus the manifest payloads that will be created later) // are present. - payloadTuples = section.Tuples.OfType().ToDictionary(t => t.Id.Id); + payloadSymbols = section.Symbols.OfType().ToDictionary(t => t.Id.Id); // Process the payloads that were added by processing the packages. { - var toProcess = payloadTuples.Values.Where(r => !processedPayloads.Contains(r.Id.Id)).ToList(); + var toProcess = payloadSymbols.Values.Where(r => !processedPayloads.Contains(r.Id.Id)).ToList(); - var command = new ProcessPayloadsCommand(this.ServiceProvider, this.BackendHelper, toProcess, bundleTuple.DefaultPackagingType, layoutDirectory); + var command = new ProcessPayloadsCommand(this.ServiceProvider, this.BackendHelper, toProcess, bundleSymbol.DefaultPackagingType, layoutDirectory); command.Execute(); fileTransfers.AddRange(command.FileTransfers); @@ -258,34 +258,34 @@ namespace WixToolset.Core.Burn // Set the package metadata from the payloads now that we have the complete payload information. { - var payloadsByPackageId = payloadTuples.Values.ToLookup(p => p.PackageRef); + var payloadsByPackageId = payloadSymbols.Values.ToLookup(p => p.PackageRef); foreach (var facade in facades.Values) { - facade.PackageTuple.Size = 0; + facade.PackageSymbol.Size = 0; var packagePayloads = payloadsByPackageId[facade.PackageId]; foreach (var payload in packagePayloads) { - facade.PackageTuple.Size += payload.FileSize.Value; + facade.PackageSymbol.Size += payload.FileSize.Value; } - if (!facade.PackageTuple.InstallSize.HasValue) + if (!facade.PackageSymbol.InstallSize.HasValue) { - facade.PackageTuple.InstallSize = facade.PackageTuple.Size; + facade.PackageSymbol.InstallSize = facade.PackageSymbol.Size; } - var packagePayload = payloadTuples[facade.PackageTuple.PayloadRef]; + var packagePayload = payloadSymbols[facade.PackageSymbol.PayloadRef]; - if (String.IsNullOrEmpty(facade.PackageTuple.Description)) + if (String.IsNullOrEmpty(facade.PackageSymbol.Description)) { - facade.PackageTuple.Description = packagePayload.Description; + facade.PackageSymbol.Description = packagePayload.Description; } - if (String.IsNullOrEmpty(facade.PackageTuple.DisplayName)) + if (String.IsNullOrEmpty(facade.PackageSymbol.DisplayName)) { - facade.PackageTuple.DisplayName = packagePayload.DisplayName; + facade.PackageSymbol.DisplayName = packagePayload.DisplayName; } } } @@ -293,7 +293,7 @@ namespace WixToolset.Core.Burn // Give the UX payloads their embedded IDs... var uxPayloadIndex = 0; { - foreach (var payload in payloadTuples.Values.Where(p => BurnConstants.BurnUXContainerName == p.ContainerRef)) + foreach (var payload in payloadSymbols.Values.Where(p => BurnConstants.BurnUXContainerName == p.ContainerRef)) { // In theory, UX payloads could be embedded in the UX CAB, external to the bundle EXE, or even // downloaded. The current engine requires the UX to be fully present before any downloading starts, @@ -317,7 +317,7 @@ namespace WixToolset.Core.Burn // Give the embedded payloads without an embedded id yet an embedded id. var payloadIndex = 0; - foreach (var payload in payloadTuples.Values) + foreach (var payload in payloadSymbols.Values) { Debug.Assert(PackagingType.Unknown != payload.Packaging); @@ -341,11 +341,11 @@ namespace WixToolset.Core.Burn } // If catalog files exist, non-embedded payloads should validate with the catalogs. - var catalogs = section.Tuples.OfType().ToList(); + var catalogs = section.Symbols.OfType().ToList(); if (catalogs.Count > 0) { - var command = new VerifyPayloadsWithCatalogCommand(this.Messaging, catalogs, payloadTuples.Values); + var command = new VerifyPayloadsWithCatalogCommand(this.Messaging, catalogs, payloadSymbols.Values); command.Execute(); } @@ -355,12 +355,12 @@ namespace WixToolset.Core.Burn } IEnumerable orderedFacades; - IEnumerable boundaries; + IEnumerable boundaries; { - var groupTuples = section.Tuples.OfType(); - var boundaryTuplesById = section.Tuples.OfType().ToDictionary(b => b.Id.Id); + var groupSymbols = section.Symbols.OfType(); + var boundarySymbolsById = section.Symbols.OfType().ToDictionary(b => b.Id.Id); - var command = new OrderPackagesAndRollbackBoundariesCommand(this.Messaging, groupTuples, boundaryTuplesById, facades); + var command = new OrderPackagesAndRollbackBoundariesCommand(this.Messaging, groupSymbols, boundarySymbolsById, facades); command.Execute(); orderedFacades = command.OrderedPackageFacades; @@ -374,24 +374,24 @@ namespace WixToolset.Core.Burn resolveDelayedFieldsCommand.Execute(); } - Dictionary dependencyTuplesByKey; + Dictionary dependencySymbolsByKey; { var command = new ProcessDependencyProvidersCommand(this.Messaging, section, facades); command.Execute(); if (!String.IsNullOrEmpty(command.BundleProviderKey)) { - bundleTuple.ProviderKey = command.BundleProviderKey; // set the overridable bundle provider key. + bundleSymbol.ProviderKey = command.BundleProviderKey; // set the overridable bundle provider key. } - dependencyTuplesByKey = command.DependencyTuplesByKey; + dependencySymbolsByKey = command.DependencySymbolsByKey; } // Update the bundle per-machine/per-user scope based on the chained packages. - this.ResolveBundleInstallScope(section, bundleTuple, orderedFacades); + this.ResolveBundleInstallScope(section, bundleSymbol, orderedFacades); // Generate data for all manifests. { - var command = new GenerateManifestDataFromIRCommand(this.Messaging, section, this.BackendExtensions, this.InternalBurnBackendHelper, extensionSearchTuplesById); + var command = new GenerateManifestDataFromIRCommand(this.Messaging, section, this.BackendExtensions, this.InternalBurnBackendHelper, extensionSearchSymbolsById); command.Execute(); } @@ -409,12 +409,12 @@ namespace WixToolset.Core.Burn // Generate the core-defined BA manifest tables... string baManifestPath; { - var command = new CreateBootstrapperApplicationManifestCommand(section, bundleTuple, orderedFacades, uxPayloadIndex, payloadTuples, this.IntermediateFolder, this.InternalBurnBackendHelper); + var command = new CreateBootstrapperApplicationManifestCommand(section, bundleSymbol, orderedFacades, uxPayloadIndex, payloadSymbols, this.IntermediateFolder, this.InternalBurnBackendHelper); command.Execute(); var baManifestPayload = command.BootstrapperApplicationManifestPayloadRow; baManifestPath = command.OutputPath; - payloadTuples.Add(baManifestPayload.Id.Id, baManifestPayload); + payloadSymbols.Add(baManifestPayload.Id.Id, baManifestPayload); ++uxPayloadIndex; trackedFiles.Add(this.BackendHelper.TrackFile(baManifestPath, TrackedFileType.Temporary)); @@ -423,12 +423,12 @@ namespace WixToolset.Core.Burn // Generate the bundle extension manifest... string bextManifestPath; { - var command = new CreateBundleExtensionManifestCommand(section, bundleTuple, uxPayloadIndex, this.IntermediateFolder, this.InternalBurnBackendHelper); + var command = new CreateBundleExtensionManifestCommand(section, bundleSymbol, uxPayloadIndex, this.IntermediateFolder, this.InternalBurnBackendHelper); command.Execute(); var bextManifestPayload = command.BundleExtensionManifestPayloadRow; bextManifestPath = command.OutputPath; - payloadTuples.Add(bextManifestPayload.Id.Id, bextManifestPayload); + payloadSymbols.Add(bextManifestPayload.Id.Id, bextManifestPayload); ++uxPayloadIndex; trackedFiles.Add(this.BackendHelper.TrackFile(bextManifestPath, TrackedFileType.Temporary)); @@ -436,11 +436,11 @@ namespace WixToolset.Core.Burn // Create all the containers except the UX container first so the manifest (that goes in the UX container) // can contain all size and hash information about the non-UX containers. - WixBundleContainerTuple uxContainer; - IEnumerable uxPayloads; - IEnumerable containers; + WixBundleContainerSymbol uxContainer; + IEnumerable uxPayloads; + IEnumerable containers; { - var command = new CreateNonUXContainers(this.BackendHelper, section, bundleApplicationTuple, payloadTuples, this.IntermediateFolder, layoutDirectory, this.DefaultCompressionLevel); + var command = new CreateNonUXContainers(this.BackendHelper, section, bundleApplicationSymbol, payloadSymbols, this.IntermediateFolder, layoutDirectory, this.DefaultCompressionLevel); command.Execute(); fileTransfers.AddRange(command.FileTransfers); @@ -450,13 +450,13 @@ namespace WixToolset.Core.Burn uxPayloads = command.UXContainerPayloads; containers = command.Containers; } - + // Create the bundle manifest. string manifestPath; { var executableName = Path.GetFileName(this.OutputPath); - var command = new CreateBurnManifestCommand(this.Messaging, this.BackendExtensions, executableName, section, bundleTuple, containers, chainTuple, orderedFacades, boundaries, uxPayloads, payloadTuples, orderedSearches, catalogs, this.IntermediateFolder); + var command = new CreateBurnManifestCommand(this.Messaging, this.BackendExtensions, executableName, section, bundleSymbol, containers, chainSymbol, orderedFacades, boundaries, uxPayloads, payloadSymbols, orderedSearches, catalogs, this.IntermediateFolder); command.Execute(); manifestPath = command.OutputPath; @@ -475,7 +475,7 @@ namespace WixToolset.Core.Burn } { - var command = new CreateBundleExeCommand(this.Messaging, this.BackendHelper, this.IntermediateFolder, this.OutputPath, bundleTuple, uxContainer, containers); + var command = new CreateBundleExeCommand(this.Messaging, this.BackendHelper, this.IntermediateFolder, this.OutputPath, bundleSymbol, uxContainer, containers); command.Execute(); fileTransfers.Add(command.Transfer); @@ -483,7 +483,7 @@ namespace WixToolset.Core.Burn } #if TODO // does this need to come back, or do they only need to be in TrackedFiles? - this.ContentFilePaths = payloadTuples.Values.Where(p => p.ContentFile).Select(p => p.FullFileName).ToList(); + this.ContentFilePaths = payloadSymbols.Values.Where(p => p.ContentFile).Select(p => p.FullFileName).ToList(); #endif this.FileTransfers = fileTransfers; this.TrackedFiles = trackedFiles; @@ -522,7 +522,7 @@ namespace WixToolset.Core.Burn /// /// The package with properties to cache. /// The property cache. - private static void PopulatePackageVariableCache(WixBundlePackageTuple package, IDictionary variableCache) + private static void PopulatePackageVariableCache(WixBundlePackageSymbol package, IDictionary variableCache) { var id = package.Id.Id; @@ -533,17 +533,17 @@ namespace WixToolset.Core.Burn variableCache.Add(String.Concat("packageVersion.", id), package.Version); } - private void ResolveBundleInstallScope(IntermediateSection section, WixBundleTuple bundleTuple, IEnumerable facades) + private void ResolveBundleInstallScope(IntermediateSection section, WixBundleSymbol bundleSymbol, IEnumerable facades) { - var dependencyTuplesById = section.Tuples.OfType().ToDictionary(t => t.Id.Id); + var dependencySymbolsById = section.Symbols.OfType().ToDictionary(t => t.Id.Id); foreach (var facade in facades) { - if (bundleTuple.PerMachine && YesNoDefaultType.No == facade.PackageTuple.PerMachine) + if (bundleSymbol.PerMachine && YesNoDefaultType.No == facade.PackageSymbol.PerMachine) { - this.Messaging.Write(VerboseMessages.SwitchingToPerUserPackage(facade.PackageTuple.SourceLineNumbers, facade.PackageId)); + this.Messaging.Write(VerboseMessages.SwitchingToPerUserPackage(facade.PackageSymbol.SourceLineNumbers, facade.PackageId)); - bundleTuple.Attributes &= ~WixBundleAttributes.PerMachine; + bundleSymbol.Attributes &= ~WixBundleAttributes.PerMachine; break; } } @@ -551,45 +551,45 @@ namespace WixToolset.Core.Burn foreach (var facade in facades) { // Update package scope from bundle scope if default. - if (YesNoDefaultType.Default == facade.PackageTuple.PerMachine) + if (YesNoDefaultType.Default == facade.PackageSymbol.PerMachine) { - facade.PackageTuple.PerMachine = bundleTuple.PerMachine ? YesNoDefaultType.Yes : YesNoDefaultType.No; + facade.PackageSymbol.PerMachine = bundleSymbol.PerMachine ? YesNoDefaultType.Yes : YesNoDefaultType.No; } // We will only register packages in the same scope as the bundle. Warn if any packages with providers // are in a different scope and not permanent (permanents typically don't need a ref-count). - if (!bundleTuple.PerMachine && - YesNoDefaultType.Yes == facade.PackageTuple.PerMachine && - !facade.PackageTuple.Permanent && - dependencyTuplesById.ContainsKey(facade.PackageId)) + if (!bundleSymbol.PerMachine && + YesNoDefaultType.Yes == facade.PackageSymbol.PerMachine && + !facade.PackageSymbol.Permanent && + dependencySymbolsById.ContainsKey(facade.PackageId)) { - this.Messaging.Write(WarningMessages.NoPerMachineDependencies(facade.PackageTuple.SourceLineNumbers, facade.PackageId)); + this.Messaging.Write(WarningMessages.NoPerMachineDependencies(facade.PackageSymbol.SourceLineNumbers, facade.PackageId)); } } } - private IEnumerable GetRequiredTuples() where T : IntermediateTuple + private IEnumerable GetRequiredSymbols() where T : IntermediateSymbol { - var tuples = this.Output.Sections.Single().Tuples.OfType().ToList(); + var symbols = this.Output.Sections.Single().Symbols.OfType().ToList(); - if (0 == tuples.Count) + if (0 == symbols.Count) { throw new WixException(ErrorMessages.MissingBundleInformation(nameof(T))); } - return tuples; + return symbols; } - private T GetSingleTuple() where T : IntermediateTuple + private T GetSingleSymbol() where T : IntermediateSymbol { - var tuples = this.Output.Sections.Single().Tuples.OfType().ToList(); + var symbols = this.Output.Sections.Single().Symbols.OfType().ToList(); - if (1 != tuples.Count) + if (1 != symbols.Count) { throw new WixException(ErrorMessages.MissingBundleInformation(nameof(T))); } - return tuples[0]; + return symbols[0]; } } } diff --git a/src/WixToolset.Core.Burn/Bind/ExtensionSearchFacade.cs b/src/WixToolset.Core.Burn/Bind/ExtensionSearchFacade.cs index 6a830a28..773250d7 100644 --- a/src/WixToolset.Core.Burn/Bind/ExtensionSearchFacade.cs +++ b/src/WixToolset.Core.Burn/Bind/ExtensionSearchFacade.cs @@ -3,13 +3,13 @@ namespace WixToolset.Core.Burn { using System.Xml; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; internal class ExtensionSearchFacade : BaseSearchFacade { - public ExtensionSearchFacade(WixSearchTuple searchTuple) + public ExtensionSearchFacade(WixSearchSymbol searchSymbol) { - this.SearchTuple = searchTuple; + this.SearchSymbol = searchSymbol; } public override void WriteXml(XmlTextWriter writer) diff --git a/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs b/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs index c20abadb..29768dff 100644 --- a/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs +++ b/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs @@ -10,26 +10,26 @@ namespace WixToolset.Core.Burn.Bind using WixToolset.Core.Burn.Bundles; using WixToolset.Core.Burn.ExtensibilityServices; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; using WixToolset.Extensibility.Services; internal class GenerateManifestDataFromIRCommand { - public GenerateManifestDataFromIRCommand(IMessaging messaging, IntermediateSection section, IEnumerable backendExtensions, IBurnBackendHelper backendHelper, IDictionary> extensionSearchTuplesById) + public GenerateManifestDataFromIRCommand(IMessaging messaging, IntermediateSection section, IEnumerable backendExtensions, IBurnBackendHelper backendHelper, IDictionary> extensionSearchSymbolsById) { this.Messaging = messaging; this.Section = section; this.BackendExtensions = backendExtensions; this.BackendHelper = backendHelper; - this.ExtensionSearchTuplesById = extensionSearchTuplesById; + this.ExtensionSearchSymbolsById = extensionSearchSymbolsById; } private IEnumerable BackendExtensions { get; } private IBurnBackendHelper BackendHelper { get; } - private IDictionary> ExtensionSearchTuplesById { get; } + private IDictionary> ExtensionSearchSymbolsById { get; } private IMessaging Messaging { get; } @@ -37,108 +37,108 @@ namespace WixToolset.Core.Burn.Bind public void Execute() { - var tuples = this.Section.Tuples.ToList(); - var cellsByCustomDataAndElementId = new Dictionary>(); - var customDataById = new Dictionary(); + var symbols = this.Section.Symbols.ToList(); + var cellsByCustomDataAndElementId = new Dictionary>(); + var customDataById = new Dictionary(); - foreach (var kvp in this.ExtensionSearchTuplesById) + foreach (var kvp in this.ExtensionSearchSymbolsById) { var extensionId = kvp.Key; - var extensionSearchTuples = kvp.Value; - foreach (var extensionSearchTuple in extensionSearchTuples) + var extensionSearchSymbols = kvp.Value; + foreach (var extensionSearchSymbol in extensionSearchSymbols) { - this.BackendHelper.AddBundleExtensionData(extensionId, extensionSearchTuple, tupleIdIsIdAttribute: true); - tuples.Remove(extensionSearchTuple); + this.BackendHelper.AddBundleExtensionData(extensionId, extensionSearchSymbol, symbolIdIsIdAttribute: true); + symbols.Remove(extensionSearchSymbol); } } - foreach (var tuple in tuples) + foreach (var symbol in symbols) { - var unknownTuple = false; - switch (tuple.Definition.Type) + var unknownSymbol = false; + switch (symbol.Definition.Type) { - // Tuples used internally and are not added to a data manifest. - case TupleDefinitionType.ProvidesDependency: - case TupleDefinitionType.WixApprovedExeForElevation: - case TupleDefinitionType.WixBootstrapperApplication: - case TupleDefinitionType.WixBundle: - case TupleDefinitionType.WixBundleCatalog: - case TupleDefinitionType.WixBundleContainer: - case TupleDefinitionType.WixBundleCustomDataAttribute: - case TupleDefinitionType.WixBundleExePackage: - case TupleDefinitionType.WixBundleExtension: - case TupleDefinitionType.WixBundleMsiFeature: - case TupleDefinitionType.WixBundleMsiPackage: - case TupleDefinitionType.WixBundleMsiProperty: - case TupleDefinitionType.WixBundleMspPackage: - case TupleDefinitionType.WixBundleMsuPackage: - case TupleDefinitionType.WixBundlePackage: - case TupleDefinitionType.WixBundlePackageCommandLine: - case TupleDefinitionType.WixBundlePackageExitCode: - case TupleDefinitionType.WixBundlePackageGroup: - case TupleDefinitionType.WixBundlePatchTargetCode: - case TupleDefinitionType.WixBundlePayload: - case TupleDefinitionType.WixBundlePayloadGroup: - case TupleDefinitionType.WixBundleRelatedPackage: - case TupleDefinitionType.WixBundleRollbackBoundary: - case TupleDefinitionType.WixBundleSlipstreamMsp: - case TupleDefinitionType.WixBundleUpdate: - case TupleDefinitionType.WixBundleVariable: - case TupleDefinitionType.WixBuildInfo: - case TupleDefinitionType.WixChain: - case TupleDefinitionType.WixComponentSearch: - case TupleDefinitionType.WixDependencyProvider: - case TupleDefinitionType.WixFileSearch: - case TupleDefinitionType.WixGroup: - case TupleDefinitionType.WixProductSearch: - case TupleDefinitionType.WixRegistrySearch: - case TupleDefinitionType.WixRelatedBundle: - case TupleDefinitionType.WixSearch: - case TupleDefinitionType.WixSearchRelation: - case TupleDefinitionType.WixSetVariable: - case TupleDefinitionType.WixUpdateRegistration: + // Symbols used internally and are not added to a data manifest. + case SymbolDefinitionType.ProvidesDependency: + case SymbolDefinitionType.WixApprovedExeForElevation: + case SymbolDefinitionType.WixBootstrapperApplication: + case SymbolDefinitionType.WixBundle: + case SymbolDefinitionType.WixBundleCatalog: + case SymbolDefinitionType.WixBundleContainer: + case SymbolDefinitionType.WixBundleCustomDataAttribute: + case SymbolDefinitionType.WixBundleExePackage: + case SymbolDefinitionType.WixBundleExtension: + case SymbolDefinitionType.WixBundleMsiFeature: + case SymbolDefinitionType.WixBundleMsiPackage: + case SymbolDefinitionType.WixBundleMsiProperty: + case SymbolDefinitionType.WixBundleMspPackage: + case SymbolDefinitionType.WixBundleMsuPackage: + case SymbolDefinitionType.WixBundlePackage: + case SymbolDefinitionType.WixBundlePackageCommandLine: + case SymbolDefinitionType.WixBundlePackageExitCode: + case SymbolDefinitionType.WixBundlePackageGroup: + case SymbolDefinitionType.WixBundlePatchTargetCode: + case SymbolDefinitionType.WixBundlePayload: + case SymbolDefinitionType.WixBundlePayloadGroup: + case SymbolDefinitionType.WixBundleRelatedPackage: + case SymbolDefinitionType.WixBundleRollbackBoundary: + case SymbolDefinitionType.WixBundleSlipstreamMsp: + case SymbolDefinitionType.WixBundleUpdate: + case SymbolDefinitionType.WixBundleVariable: + case SymbolDefinitionType.WixBuildInfo: + case SymbolDefinitionType.WixChain: + case SymbolDefinitionType.WixComponentSearch: + case SymbolDefinitionType.WixDependencyProvider: + case SymbolDefinitionType.WixFileSearch: + case SymbolDefinitionType.WixGroup: + case SymbolDefinitionType.WixProductSearch: + case SymbolDefinitionType.WixRegistrySearch: + case SymbolDefinitionType.WixRelatedBundle: + case SymbolDefinitionType.WixSearch: + case SymbolDefinitionType.WixSearchRelation: + case SymbolDefinitionType.WixSetVariable: + case SymbolDefinitionType.WixUpdateRegistration: break; - // Tuples used before binding. - case TupleDefinitionType.WixComplexReference: - case TupleDefinitionType.WixOrdering: - case TupleDefinitionType.WixSimpleReference: - case TupleDefinitionType.WixVariable: + // Symbols used before binding. + case SymbolDefinitionType.WixComplexReference: + case SymbolDefinitionType.WixOrdering: + case SymbolDefinitionType.WixSimpleReference: + case SymbolDefinitionType.WixVariable: break; - // Tuples to investigate: - case TupleDefinitionType.WixChainItem: + // Symbols to investigate: + case SymbolDefinitionType.WixChainItem: break; - case TupleDefinitionType.WixBundleCustomData: - unknownTuple = !this.IndexBundleCustomDataTuple((WixBundleCustomDataTuple)tuple, customDataById); + case SymbolDefinitionType.WixBundleCustomData: + unknownSymbol = !this.IndexBundleCustomDataSymbol((WixBundleCustomDataSymbol)symbol, customDataById); break; - case TupleDefinitionType.WixBundleCustomDataCell: - this.IndexBundleCustomDataCellTuple((WixBundleCustomDataCellTuple)tuple, cellsByCustomDataAndElementId); + case SymbolDefinitionType.WixBundleCustomDataCell: + this.IndexBundleCustomDataCellSymbol((WixBundleCustomDataCellSymbol)symbol, cellsByCustomDataAndElementId); break; - case TupleDefinitionType.MustBeFromAnExtension: - unknownTuple = !this.AddTupleFromExtension(tuple); + case SymbolDefinitionType.MustBeFromAnExtension: + unknownSymbol = !this.AddSymbolFromExtension(symbol); break; default: - unknownTuple = true; + unknownSymbol = true; break; } - if (unknownTuple) + if (unknownSymbol) { - this.Messaging.Write(WarningMessages.TupleNotTranslatedToOutput(tuple)); + this.Messaging.Write(WarningMessages.SymbolNotTranslatedToOutput(symbol)); } } - this.AddIndexedCellTuples(customDataById, cellsByCustomDataAndElementId); + this.AddIndexedCellSymbols(customDataById, cellsByCustomDataAndElementId); } - private bool IndexBundleCustomDataTuple(WixBundleCustomDataTuple wixBundleCustomDataTuple, Dictionary customDataById) + private bool IndexBundleCustomDataSymbol(WixBundleCustomDataSymbol wixBundleCustomDataSymbol, Dictionary customDataById) { - switch (wixBundleCustomDataTuple.Type) + switch (wixBundleCustomDataSymbol.Type) { case WixBundleCustomDataType.BootstrapperApplication: case WixBundleCustomDataType.BundleExtension: @@ -147,38 +147,38 @@ namespace WixToolset.Core.Burn.Bind return false; } - var customDataId = wixBundleCustomDataTuple.Id.Id; - customDataById.Add(customDataId, wixBundleCustomDataTuple); + var customDataId = wixBundleCustomDataSymbol.Id.Id; + customDataById.Add(customDataId, wixBundleCustomDataSymbol); return true; } - private void IndexBundleCustomDataCellTuple(WixBundleCustomDataCellTuple wixBundleCustomDataCellTuple, Dictionary> cellsByCustomDataAndElementId) + private void IndexBundleCustomDataCellSymbol(WixBundleCustomDataCellSymbol wixBundleCustomDataCellSymbol, Dictionary> cellsByCustomDataAndElementId) { - var tableAndRowId = wixBundleCustomDataCellTuple.CustomDataRef + "/" + wixBundleCustomDataCellTuple.ElementId; + var tableAndRowId = wixBundleCustomDataCellSymbol.CustomDataRef + "/" + wixBundleCustomDataCellSymbol.ElementId; if (!cellsByCustomDataAndElementId.TryGetValue(tableAndRowId, out var cells)) { - cells = new List(); + cells = new List(); cellsByCustomDataAndElementId.Add(tableAndRowId, cells); } - cells.Add(wixBundleCustomDataCellTuple); + cells.Add(wixBundleCustomDataCellSymbol); } - private void AddIndexedCellTuples(Dictionary customDataById, Dictionary> cellsByCustomDataAndElementId) + private void AddIndexedCellSymbols(Dictionary customDataById, Dictionary> cellsByCustomDataAndElementId) { foreach (var elementValues in cellsByCustomDataAndElementId.Values) { var elementName = elementValues[0].CustomDataRef; - var customDataTuple = customDataById[elementName]; + var customDataSymbol = customDataById[elementName]; - var attributeNames = customDataTuple.AttributeNamesSeparated; + var attributeNames = customDataSymbol.AttributeNamesSeparated; var elementValuesByAttribute = elementValues.ToDictionary(t => t.AttributeRef, t => t.Value); var sb = new StringBuilder(); using (var writer = XmlWriter.Create(sb, BurnBackendHelper.WriterSettings)) { - switch (customDataTuple.Type) + switch (customDataSymbol.Type) { case WixBundleCustomDataType.BootstrapperApplication: writer.WriteStartElement(elementName, BurnCommon.BADataNamespace); @@ -202,13 +202,13 @@ namespace WixToolset.Core.Burn.Bind writer.WriteEndElement(); } - switch (customDataTuple.Type) + switch (customDataSymbol.Type) { case WixBundleCustomDataType.BootstrapperApplication: this.BackendHelper.AddBootstrapperApplicationData(sb.ToString()); break; case WixBundleCustomDataType.BundleExtension: - this.BackendHelper.AddBundleExtensionData(customDataTuple.BundleExtensionRef, sb.ToString()); + this.BackendHelper.AddBundleExtensionData(customDataSymbol.BundleExtensionRef, sb.ToString()); break; default: throw new NotImplementedException(); @@ -216,11 +216,11 @@ namespace WixToolset.Core.Burn.Bind } } - private bool AddTupleFromExtension(IntermediateTuple tuple) + private bool AddSymbolFromExtension(IntermediateSymbol symbol) { foreach (var extension in this.BackendExtensions) { - if (extension.TryAddTupleToDataManifest(this.Section, tuple)) + if (extension.TryAddSymbolToDataManifest(this.Section, symbol)) { return true; } diff --git a/src/WixToolset.Core.Burn/Bind/LegacySearchFacade.cs b/src/WixToolset.Core.Burn/Bind/LegacySearchFacade.cs index 0a80760d..24d6f542 100644 --- a/src/WixToolset.Core.Burn/Bind/LegacySearchFacade.cs +++ b/src/WixToolset.Core.Burn/Bind/LegacySearchFacade.cs @@ -5,17 +5,17 @@ namespace WixToolset.Core.Burn using System; using System.Xml; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; internal class LegacySearchFacade : BaseSearchFacade { - public LegacySearchFacade(WixSearchTuple searchTuple, IntermediateTuple searchSpecificTuple) + public LegacySearchFacade(WixSearchSymbol searchSymbol, IntermediateSymbol searchSpecificSymbol) { - this.SearchTuple = searchTuple; - this.SearchSpecificTuple = searchSpecificTuple; + this.SearchSymbol = searchSymbol; + this.SearchSpecificSymbol = searchSpecificSymbol; } - public IntermediateTuple SearchSpecificTuple { get; } + public IntermediateSymbol SearchSpecificSymbol { get; } /// /// Generates Burn manifest and ParameterInfo-style markup a search. @@ -23,45 +23,45 @@ namespace WixToolset.Core.Burn /// public override void WriteXml(XmlTextWriter writer) { - switch (this.SearchSpecificTuple) + switch (this.SearchSpecificSymbol) { - case WixComponentSearchTuple tuple: - this.WriteComponentSearchXml(writer, tuple); + case WixComponentSearchSymbol symbol: + this.WriteComponentSearchXml(writer, symbol); break; - case WixFileSearchTuple tuple: - this.WriteFileSearchXml(writer, tuple); + case WixFileSearchSymbol symbol: + this.WriteFileSearchXml(writer, symbol); break; - case WixProductSearchTuple tuple: - this.WriteProductSearchXml(writer, tuple); + case WixProductSearchSymbol symbol: + this.WriteProductSearchXml(writer, symbol); break; - case WixRegistrySearchTuple tuple: - this.WriteRegistrySearchXml(writer, tuple); + case WixRegistrySearchSymbol symbol: + this.WriteRegistrySearchXml(writer, symbol); break; } } - private void WriteComponentSearchXml(XmlTextWriter writer, WixComponentSearchTuple searchTuple) + private void WriteComponentSearchXml(XmlTextWriter writer, WixComponentSearchSymbol searchSymbol) { writer.WriteStartElement("MsiComponentSearch"); base.WriteXml(writer); - writer.WriteAttributeString("ComponentId", searchTuple.Guid); + writer.WriteAttributeString("ComponentId", searchSymbol.Guid); - if (!String.IsNullOrEmpty(searchTuple.ProductCode)) + if (!String.IsNullOrEmpty(searchSymbol.ProductCode)) { - writer.WriteAttributeString("ProductCode", searchTuple.ProductCode); + writer.WriteAttributeString("ProductCode", searchSymbol.ProductCode); } - if (0 != (searchTuple.Attributes & WixComponentSearchAttributes.KeyPath)) + if (0 != (searchSymbol.Attributes & WixComponentSearchAttributes.KeyPath)) { writer.WriteAttributeString("Type", "keyPath"); } - else if (0 != (searchTuple.Attributes & WixComponentSearchAttributes.State)) + else if (0 != (searchSymbol.Attributes & WixComponentSearchAttributes.State)) { writer.WriteAttributeString("Type", "state"); } - else if (0 != (searchTuple.Attributes & WixComponentSearchAttributes.WantDirectory)) + else if (0 != (searchSymbol.Attributes & WixComponentSearchAttributes.WantDirectory)) { writer.WriteAttributeString("Type", "directory"); } @@ -69,18 +69,18 @@ namespace WixToolset.Core.Burn writer.WriteEndElement(); } - private void WriteFileSearchXml(XmlTextWriter writer, WixFileSearchTuple searchTuple) + private void WriteFileSearchXml(XmlTextWriter writer, WixFileSearchSymbol searchSymbol) { - writer.WriteStartElement((0 == (searchTuple.Attributes & WixFileSearchAttributes.IsDirectory)) ? "FileSearch" : "DirectorySearch"); + writer.WriteStartElement((0 == (searchSymbol.Attributes & WixFileSearchAttributes.IsDirectory)) ? "FileSearch" : "DirectorySearch"); base.WriteXml(writer); - writer.WriteAttributeString("Path", searchTuple.Path); - if (WixFileSearchAttributes.WantExists == (searchTuple.Attributes & WixFileSearchAttributes.WantExists)) + writer.WriteAttributeString("Path", searchSymbol.Path); + if (WixFileSearchAttributes.WantExists == (searchSymbol.Attributes & WixFileSearchAttributes.WantExists)) { writer.WriteAttributeString("Type", "exists"); } - else if (WixFileSearchAttributes.WantVersion == (searchTuple.Attributes & WixFileSearchAttributes.WantVersion)) + else if (WixFileSearchAttributes.WantVersion == (searchSymbol.Attributes & WixFileSearchAttributes.WantVersion)) { // Can never get here for DirectorySearch. writer.WriteAttributeString("Type", "version"); @@ -92,34 +92,34 @@ namespace WixToolset.Core.Burn writer.WriteEndElement(); } - private void WriteProductSearchXml(XmlTextWriter writer, WixProductSearchTuple tuple) + private void WriteProductSearchXml(XmlTextWriter writer, WixProductSearchSymbol symbol) { writer.WriteStartElement("MsiProductSearch"); base.WriteXml(writer); - if (0 != (tuple.Attributes & WixProductSearchAttributes.UpgradeCode)) + if (0 != (symbol.Attributes & WixProductSearchAttributes.UpgradeCode)) { - writer.WriteAttributeString("UpgradeCode", tuple.Guid); + writer.WriteAttributeString("UpgradeCode", symbol.Guid); } else { - writer.WriteAttributeString("ProductCode", tuple.Guid); + writer.WriteAttributeString("ProductCode", symbol.Guid); } - if (0 != (tuple.Attributes & WixProductSearchAttributes.Version)) + if (0 != (symbol.Attributes & WixProductSearchAttributes.Version)) { writer.WriteAttributeString("Type", "version"); } - else if (0 != (tuple.Attributes & WixProductSearchAttributes.Language)) + else if (0 != (symbol.Attributes & WixProductSearchAttributes.Language)) { writer.WriteAttributeString("Type", "language"); } - else if (0 != (tuple.Attributes & WixProductSearchAttributes.State)) + else if (0 != (symbol.Attributes & WixProductSearchAttributes.State)) { writer.WriteAttributeString("Type", "state"); } - else if (0 != (tuple.Attributes & WixProductSearchAttributes.Assignment)) + else if (0 != (symbol.Attributes & WixProductSearchAttributes.Assignment)) { writer.WriteAttributeString("Type", "assignment"); } @@ -127,13 +127,13 @@ namespace WixToolset.Core.Burn writer.WriteEndElement(); } - private void WriteRegistrySearchXml(XmlTextWriter writer, WixRegistrySearchTuple tuple) + private void WriteRegistrySearchXml(XmlTextWriter writer, WixRegistrySearchSymbol symbol) { writer.WriteStartElement("RegistrySearch"); base.WriteXml(writer); - switch (tuple.Root) + switch (symbol.Root) { case RegistryRootType.ClassesRoot: writer.WriteAttributeString("Root", "HKCR"); @@ -149,25 +149,25 @@ namespace WixToolset.Core.Burn break; } - writer.WriteAttributeString("Key", tuple.Key); + writer.WriteAttributeString("Key", symbol.Key); - if (!String.IsNullOrEmpty(tuple.Value)) + if (!String.IsNullOrEmpty(symbol.Value)) { - writer.WriteAttributeString("Value", tuple.Value); + writer.WriteAttributeString("Value", symbol.Value); } - var existenceOnly = 0 != (tuple.Attributes & WixRegistrySearchAttributes.WantExists); + var existenceOnly = 0 != (symbol.Attributes & WixRegistrySearchAttributes.WantExists); writer.WriteAttributeString("Type", existenceOnly ? "exists" : "value"); - if (0 != (tuple.Attributes & WixRegistrySearchAttributes.Win64)) + if (0 != (symbol.Attributes & WixRegistrySearchAttributes.Win64)) { writer.WriteAttributeString("Win64", "yes"); } if (!existenceOnly) { - if (0 != (tuple.Attributes & WixRegistrySearchAttributes.ExpandEnvironmentVariables)) + if (0 != (symbol.Attributes & WixRegistrySearchAttributes.ExpandEnvironmentVariables)) { writer.WriteAttributeString("ExpandEnvironment", "yes"); } diff --git a/src/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs b/src/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs index e228b296..29815203 100644 --- a/src/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs +++ b/src/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs @@ -8,7 +8,7 @@ namespace WixToolset.Core.Burn.Bind using WixToolset.Data; using WixToolset.Core.Burn.Bundles; using WixToolset.Extensibility.Services; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; internal class ProcessDependencyProvidersCommand { @@ -22,7 +22,7 @@ namespace WixToolset.Core.Burn.Bind public string BundleProviderKey { get; private set; } - public Dictionary DependencyTuplesByKey { get; private set; } + public Dictionary DependencySymbolsByKey { get; private set; } private IMessaging Messaging { get; } @@ -38,42 +38,42 @@ namespace WixToolset.Core.Burn.Bind /// public void Execute() { - var wixDependencyProviderTuples = this.Section.Tuples.OfType(); + var wixDependencyProviderSymbols = this.Section.Symbols.OfType(); - foreach (var wixDependencyProviderTuple in wixDependencyProviderTuples) + foreach (var wixDependencyProviderSymbol in wixDependencyProviderSymbols) { // Sets the provider key for the bundle, if it is not set already. if (String.IsNullOrEmpty(this.BundleProviderKey)) { - if (wixDependencyProviderTuple.Bundle) + if (wixDependencyProviderSymbol.Bundle) { - this.BundleProviderKey = wixDependencyProviderTuple.ProviderKey; + this.BundleProviderKey = wixDependencyProviderSymbol.ProviderKey; } } // Import any authored dependencies. These may merge with imported provides from MSI packages. - var packageId = wixDependencyProviderTuple.Id.Id; + var packageId = wixDependencyProviderSymbol.Id.Id; if (this.Facades.TryGetValue(packageId, out var facade)) { - var dependency = this.Section.AddTuple(new ProvidesDependencyTuple(wixDependencyProviderTuple.SourceLineNumbers, wixDependencyProviderTuple.Id) + var dependency = this.Section.AddSymbol(new ProvidesDependencySymbol(wixDependencyProviderSymbol.SourceLineNumbers, wixDependencyProviderSymbol.Id) { PackageRef = packageId, - Key = wixDependencyProviderTuple.ProviderKey, - Version = wixDependencyProviderTuple.Version, - DisplayName = wixDependencyProviderTuple.DisplayName, - Attributes = (int)wixDependencyProviderTuple.Attributes + Key = wixDependencyProviderSymbol.ProviderKey, + Version = wixDependencyProviderSymbol.Version, + DisplayName = wixDependencyProviderSymbol.DisplayName, + Attributes = (int)wixDependencyProviderSymbol.Attributes }); if (String.IsNullOrEmpty(dependency.Key)) { - switch (facade.SpecificPackageTuple) + switch (facade.SpecificPackageSymbol) { // The WixDependencyExtension allows an empty Key for MSIs and MSPs. - case WixBundleMsiPackageTuple msiPackage: + case WixBundleMsiPackageSymbol msiPackage: dependency.Key = msiPackage.ProductCode; break; - case WixBundleMspPackageTuple mspPackage: + case WixBundleMspPackageSymbol mspPackage: dependency.Key = mspPackage.PatchCode; break; } @@ -81,7 +81,7 @@ namespace WixToolset.Core.Burn.Bind if (String.IsNullOrEmpty(dependency.Version)) { - dependency.Version = facade.PackageTuple.Version; + dependency.Version = facade.PackageSymbol.Version; } // If the version is still missing, a version could not be harvested from the package and was not authored. @@ -92,55 +92,55 @@ namespace WixToolset.Core.Burn.Bind if (String.IsNullOrEmpty(dependency.DisplayName)) { - dependency.DisplayName = facade.PackageTuple.DisplayName; + dependency.DisplayName = facade.PackageSymbol.DisplayName; } } } - this.DependencyTuplesByKey = this.GetDependencyTuplesByKey(); + this.DependencySymbolsByKey = this.GetDependencySymbolsByKey(); // Generate providers for MSI and MSP packages that still do not have providers. foreach (var facade in this.Facades.Values) { string key = null; - //if (WixBundlePackageType.Msi == facade.PackageTuple.Type) - if (facade.SpecificPackageTuple is WixBundleMsiPackageTuple msiPackage) + //if (WixBundlePackageType.Msi == facade.PackageSymbol.Type) + if (facade.SpecificPackageSymbol is WixBundleMsiPackageSymbol msiPackage) { - //var msiPackage = (WixBundleMsiPackageTuple)facade.SpecificPackageTuple; + //var msiPackage = (WixBundleMsiPackageSymbol)facade.SpecificPackageSymbol; key = msiPackage.ProductCode; } - //else if (WixBundlePackageType.Msp == facade.PackageTuple.Type) - else if (facade.SpecificPackageTuple is WixBundleMspPackageTuple mspPackage) + //else if (WixBundlePackageType.Msp == facade.PackageSymbol.Type) + else if (facade.SpecificPackageSymbol is WixBundleMspPackageSymbol mspPackage) { - //var mspPackage = (WixBundleMspPackageTuple)facade.SpecificPackageTuple; + //var mspPackage = (WixBundleMspPackageSymbol)facade.SpecificPackageSymbol; key = mspPackage.PatchCode; } - if (!String.IsNullOrEmpty(key) && !this.DependencyTuplesByKey.ContainsKey(key)) + if (!String.IsNullOrEmpty(key) && !this.DependencySymbolsByKey.ContainsKey(key)) { - var dependency = this.Section.AddTuple(new ProvidesDependencyTuple(facade.PackageTuple.SourceLineNumbers, facade.PackageTuple.Id) + var dependency = this.Section.AddSymbol(new ProvidesDependencySymbol(facade.PackageSymbol.SourceLineNumbers, facade.PackageSymbol.Id) { PackageRef = facade.PackageId, Key = key, - Version = facade.PackageTuple.Version, - DisplayName = facade.PackageTuple.DisplayName + Version = facade.PackageSymbol.Version, + DisplayName = facade.PackageSymbol.DisplayName }); - this.DependencyTuplesByKey.Add(dependency.Key, dependency); + this.DependencySymbolsByKey.Add(dependency.Key, dependency); } } } - private Dictionary GetDependencyTuplesByKey() + private Dictionary GetDependencySymbolsByKey() { - var dependencyTuplesByKey = new Dictionary(); + var dependencySymbolsByKey = new Dictionary(); - var dependencyTuples = this.Section.Tuples.OfType(); + var dependencySymbols = this.Section.Symbols.OfType(); - foreach (var dependency in dependencyTuples) + foreach (var dependency in dependencySymbols) { - if (dependencyTuplesByKey.TryGetValue(dependency.Key, out var collision)) + if (dependencySymbolsByKey.TryGetValue(dependency.Key, out var collision)) { // If not a perfect dependency collision, display an error. if (dependency.Key != collision.Key || @@ -152,11 +152,11 @@ namespace WixToolset.Core.Burn.Bind } else { - dependencyTuplesByKey.Add(dependency.Key, dependency); + dependencySymbolsByKey.Add(dependency.Key, dependency); } } - return dependencyTuplesByKey; + return dependencySymbolsByKey; } } } diff --git a/src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs b/src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs index 0fe60422..fb6f72dd 100644 --- a/src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs +++ b/src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs @@ -3,17 +3,17 @@ namespace WixToolset.Core.Burn { using System.Xml; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; internal class SetVariableSearchFacade : BaseSearchFacade { - public SetVariableSearchFacade(WixSearchTuple searchTuple, WixSetVariableTuple setVariableTuple) + public SetVariableSearchFacade(WixSearchSymbol searchSymbol, WixSetVariableSymbol setVariableSymbol) { - this.SearchTuple = searchTuple; - this.SetVariableTuple = setVariableTuple; + this.SearchSymbol = searchSymbol; + this.SetVariableSymbol = setVariableSymbol; } - private WixSetVariableTuple SetVariableTuple { get; } + private WixSetVariableSymbol SetVariableSymbol { get; } public override void WriteXml(XmlTextWriter writer) { @@ -21,10 +21,10 @@ namespace WixToolset.Core.Burn base.WriteXml(writer); - if (this.SetVariableTuple.Type != null) + if (this.SetVariableSymbol.Type != null) { - writer.WriteAttributeString("Value", this.SetVariableTuple.Value); - writer.WriteAttributeString("Type", this.SetVariableTuple.Type); + writer.WriteAttributeString("Value", this.SetVariableSymbol.Value); + writer.WriteAttributeString("Type", this.SetVariableSymbol.Type); } writer.WriteEndElement(); diff --git a/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs b/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs index 6e08c68e..30edf7de 100644 --- a/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs @@ -7,7 +7,7 @@ namespace WixToolset.Core.Burn.Bundles using System.Diagnostics; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; internal class AutomaticallySlipstreamPatchesCommand { @@ -23,42 +23,42 @@ namespace WixToolset.Core.Burn.Bundles public void Execute() { - var msiPackages = new List(); - var targetsProductCode = new Dictionary>(); - var targetsUpgradeCode = new Dictionary>(); + var msiPackages = new List(); + var targetsProductCode = new Dictionary>(); + var targetsUpgradeCode = new Dictionary>(); foreach (var facade in this.PackageFacades) { // Keep track of all MSI packages. - if (facade.SpecificPackageTuple is WixBundleMsiPackageTuple msiPackage) + if (facade.SpecificPackageSymbol is WixBundleMsiPackageSymbol msiPackage) { msiPackages.Add(msiPackage); } - else if (facade.SpecificPackageTuple is WixBundleMspPackageTuple mspPackage && mspPackage.Slipstream) + else if (facade.SpecificPackageSymbol is WixBundleMspPackageSymbol mspPackage && mspPackage.Slipstream) { - var patchTargetCodeTuples = this.Section.Tuples - .OfType() + var patchTargetCodeSymbols = this.Section.Symbols + .OfType() .Where(r => r.PackageRef == facade.PackageId); // Index target ProductCodes and UpgradeCodes for slipstreamed MSPs. - foreach (var tuple in patchTargetCodeTuples) + foreach (var symbol in patchTargetCodeSymbols) { - if (tuple.TargetsProductCode) + if (symbol.TargetsProductCode) { - if (!targetsProductCode.TryGetValue(tuple.TargetCode, out var tuples)) + if (!targetsProductCode.TryGetValue(symbol.TargetCode, out var symbols)) { - tuples = new List(); - targetsProductCode.Add(tuple.TargetCode, tuples); + symbols = new List(); + targetsProductCode.Add(symbol.TargetCode, symbols); } - tuples.Add(tuple); + symbols.Add(symbol); } - else if (tuple.TargetsUpgradeCode) + else if (symbol.TargetsUpgradeCode) { - if (!targetsUpgradeCode.TryGetValue(tuple.TargetCode, out var tuples)) + if (!targetsUpgradeCode.TryGetValue(symbol.TargetCode, out var symbols)) { - tuples = new List(); - targetsUpgradeCode.Add(tuple.TargetCode, tuples); + symbols = new List(); + targetsUpgradeCode.Add(symbol.TargetCode, symbols); } } } @@ -70,39 +70,39 @@ namespace WixToolset.Core.Burn.Bundles // Loop through the MSI and slipstream patches targeting it. foreach (var msi in msiPackages) { - if (targetsProductCode.TryGetValue(msi.ProductCode, out var tuples)) + if (targetsProductCode.TryGetValue(msi.ProductCode, out var symbols)) { - foreach (var tuple in tuples) + foreach (var symbol in symbols) { - Debug.Assert(tuple.TargetsProductCode); - Debug.Assert(!tuple.TargetsUpgradeCode); + Debug.Assert(symbol.TargetsProductCode); + Debug.Assert(!symbol.TargetsUpgradeCode); - this.TryAddSlipstreamTuple(slipstreamMspIds, msi, tuple); + this.TryAddSlipstreamSymbol(slipstreamMspIds, msi, symbol); } } - if (!String.IsNullOrEmpty(msi.UpgradeCode) && targetsUpgradeCode.TryGetValue(msi.UpgradeCode, out tuples)) + if (!String.IsNullOrEmpty(msi.UpgradeCode) && targetsUpgradeCode.TryGetValue(msi.UpgradeCode, out symbols)) { - foreach (var tuple in tuples) + foreach (var symbol in symbols) { - Debug.Assert(!tuple.TargetsProductCode); - Debug.Assert(tuple.TargetsUpgradeCode); + Debug.Assert(!symbol.TargetsProductCode); + Debug.Assert(symbol.TargetsUpgradeCode); - this.TryAddSlipstreamTuple(slipstreamMspIds, msi, tuple); + this.TryAddSlipstreamSymbol(slipstreamMspIds, msi, symbol); } - tuples = null; + symbols = null; } } } - private bool TryAddSlipstreamTuple(HashSet slipstreamMspIds, WixBundleMsiPackageTuple msiPackage, WixBundlePatchTargetCodeTuple patchTargetCode) + private bool TryAddSlipstreamSymbol(HashSet slipstreamMspIds, WixBundleMsiPackageSymbol msiPackage, WixBundlePatchTargetCodeSymbol patchTargetCode) { var id = new Identifier(AccessModifier.Private, msiPackage.Id.Id, patchTargetCode.PackageRef); if (slipstreamMspIds.Add(id.Id)) { - this.Section.AddTuple(new WixBundleSlipstreamMspTuple(patchTargetCode.SourceLineNumbers) + this.Section.AddSymbol(new WixBundleSlipstreamMspSymbol(patchTargetCode.SourceLineNumbers) { TargetPackageRef = msiPackage.Id.Id, MspPackageRef = patchTargetCode.PackageRef, diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs index 4468fee5..b4648d18 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs @@ -11,24 +11,24 @@ namespace WixToolset.Core.Burn.Bundles using System.Xml; using WixToolset.Data; using WixToolset.Data.Burn; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; internal class CreateBootstrapperApplicationManifestCommand { - public CreateBootstrapperApplicationManifestCommand(IntermediateSection section, WixBundleTuple bundleTuple, IEnumerable chainPackages, int lastUXPayloadIndex, Dictionary payloadTuples, string intermediateFolder, IInternalBurnBackendHelper internalBurnBackendHelper) + public CreateBootstrapperApplicationManifestCommand(IntermediateSection section, WixBundleSymbol bundleSymbol, IEnumerable chainPackages, int lastUXPayloadIndex, Dictionary payloadSymbols, string intermediateFolder, IInternalBurnBackendHelper internalBurnBackendHelper) { this.Section = section; - this.BundleTuple = bundleTuple; + this.BundleSymbol = bundleSymbol; this.ChainPackages = chainPackages; this.LastUXPayloadIndex = lastUXPayloadIndex; - this.Payloads = payloadTuples; + this.Payloads = payloadSymbols; this.IntermediateFolder = intermediateFolder; this.InternalBurnBackendHelper = internalBurnBackendHelper; } private IntermediateSection Section { get; } - private WixBundleTuple BundleTuple { get; } + private WixBundleSymbol BundleSymbol { get; } private IEnumerable ChainPackages { get; } @@ -36,11 +36,11 @@ namespace WixToolset.Core.Burn.Bundles private int LastUXPayloadIndex { get; } - private Dictionary Payloads { get; } + private Dictionary Payloads { get; } private string IntermediateFolder { get; } - public WixBundlePayloadTuple BootstrapperApplicationManifestPayloadRow { get; private set; } + public WixBundlePayloadSymbol BootstrapperApplicationManifestPayloadRow { get; private set; } public string OutputPath { get; private set; } @@ -84,12 +84,12 @@ namespace WixToolset.Core.Burn.Bundles { writer.WriteStartElement("WixBundleProperties"); - writer.WriteAttributeString("DisplayName", this.BundleTuple.Name); - writer.WriteAttributeString("LogPathVariable", this.BundleTuple.LogPathVariable); - writer.WriteAttributeString("Compressed", this.BundleTuple.Compressed == true ? "yes" : "no"); - writer.WriteAttributeString("Id", this.BundleTuple.BundleId.ToUpperInvariant()); - writer.WriteAttributeString("UpgradeCode", this.BundleTuple.UpgradeCode); - writer.WriteAttributeString("PerMachine", this.BundleTuple.PerMachine ? "yes" : "no"); + writer.WriteAttributeString("DisplayName", this.BundleSymbol.Name); + writer.WriteAttributeString("LogPathVariable", this.BundleSymbol.LogPathVariable); + writer.WriteAttributeString("Compressed", this.BundleSymbol.Compressed == true ? "yes" : "no"); + writer.WriteAttributeString("Id", this.BundleSymbol.BundleId.ToUpperInvariant()); + writer.WriteAttributeString("UpgradeCode", this.BundleSymbol.UpgradeCode); + writer.WriteAttributeString("PerMachine", this.BundleSymbol.PerMachine ? "yes" : "no"); writer.WriteEndElement(); } @@ -98,35 +98,35 @@ namespace WixToolset.Core.Burn.Bundles { foreach (var package in this.ChainPackages) { - var packagePayload = this.Payloads[package.PackageTuple.PayloadRef]; + var packagePayload = this.Payloads[package.PackageSymbol.PayloadRef]; - var size = package.PackageTuple.Size.ToString(CultureInfo.InvariantCulture); + var size = package.PackageSymbol.Size.ToString(CultureInfo.InvariantCulture); writer.WriteStartElement("WixPackageProperties"); writer.WriteAttributeString("Package", package.PackageId); - writer.WriteAttributeString("Vital", package.PackageTuple.Vital == true ? "yes" : "no"); + writer.WriteAttributeString("Vital", package.PackageSymbol.Vital == true ? "yes" : "no"); - if (!String.IsNullOrEmpty(package.PackageTuple.DisplayName)) + if (!String.IsNullOrEmpty(package.PackageSymbol.DisplayName)) { - writer.WriteAttributeString("DisplayName", package.PackageTuple.DisplayName); + writer.WriteAttributeString("DisplayName", package.PackageSymbol.DisplayName); } - if (!String.IsNullOrEmpty(package.PackageTuple.Description)) + if (!String.IsNullOrEmpty(package.PackageSymbol.Description)) { - writer.WriteAttributeString("Description", package.PackageTuple.Description); + writer.WriteAttributeString("Description", package.PackageSymbol.Description); } writer.WriteAttributeString("DownloadSize", size); writer.WriteAttributeString("PackageSize", size); - writer.WriteAttributeString("InstalledSize", package.PackageTuple.InstallSize?.ToString(CultureInfo.InvariantCulture) ?? size); - writer.WriteAttributeString("PackageType", package.PackageTuple.Type.ToString()); - writer.WriteAttributeString("Permanent", package.PackageTuple.Permanent ? "yes" : "no"); - writer.WriteAttributeString("LogPathVariable", package.PackageTuple.LogPathVariable); - writer.WriteAttributeString("RollbackLogPathVariable", package.PackageTuple.RollbackLogPathVariable); + writer.WriteAttributeString("InstalledSize", package.PackageSymbol.InstallSize?.ToString(CultureInfo.InvariantCulture) ?? size); + writer.WriteAttributeString("PackageType", package.PackageSymbol.Type.ToString()); + writer.WriteAttributeString("Permanent", package.PackageSymbol.Permanent ? "yes" : "no"); + writer.WriteAttributeString("LogPathVariable", package.PackageSymbol.LogPathVariable); + writer.WriteAttributeString("RollbackLogPathVariable", package.PackageSymbol.RollbackLogPathVariable); writer.WriteAttributeString("Compressed", packagePayload.Compressed == true ? "yes" : "no"); - if (package.SpecificPackageTuple is WixBundleMsiPackageTuple msiPackage) + if (package.SpecificPackageSymbol is WixBundleMsiPackageSymbol msiPackage) { if (!String.IsNullOrEmpty(msiPackage.ProductCode)) { @@ -138,7 +138,7 @@ namespace WixToolset.Core.Burn.Bundles writer.WriteAttributeString("UpgradeCode", msiPackage.UpgradeCode); } } - else if (package.SpecificPackageTuple is WixBundleMspPackageTuple mspPackage) + else if (package.SpecificPackageSymbol is WixBundleMspPackageSymbol mspPackage) { if (!String.IsNullOrEmpty(mspPackage.PatchCode)) { @@ -146,17 +146,17 @@ namespace WixToolset.Core.Burn.Bundles } } - if (!String.IsNullOrEmpty(package.PackageTuple.Version)) + if (!String.IsNullOrEmpty(package.PackageSymbol.Version)) { - writer.WriteAttributeString("Version", package.PackageTuple.Version); + writer.WriteAttributeString("Version", package.PackageSymbol.Version); } - if (!String.IsNullOrEmpty(package.PackageTuple.InstallCondition)) + if (!String.IsNullOrEmpty(package.PackageSymbol.InstallCondition)) { - writer.WriteAttributeString("InstallCondition", package.PackageTuple.InstallCondition); + writer.WriteAttributeString("InstallCondition", package.PackageSymbol.InstallCondition); } - switch (package.PackageTuple.Cache) + switch (package.PackageSymbol.Cache) { case YesNoAlwaysType.No: writer.WriteAttributeString("Cache", "no"); @@ -175,35 +175,35 @@ namespace WixToolset.Core.Burn.Bundles private void WriteFeatureInfo(XmlTextWriter writer) { - var featureTuples = this.Section.Tuples.OfType(); + var featureSymbols = this.Section.Symbols.OfType(); - foreach (var featureTuple in featureTuples) + foreach (var featureSymbol in featureSymbols) { writer.WriteStartElement("WixPackageFeatureInfo"); - writer.WriteAttributeString("Package", featureTuple.PackageRef); - writer.WriteAttributeString("Feature", featureTuple.Name); - writer.WriteAttributeString("Size", featureTuple.Size.ToString(CultureInfo.InvariantCulture)); + writer.WriteAttributeString("Package", featureSymbol.PackageRef); + writer.WriteAttributeString("Feature", featureSymbol.Name); + writer.WriteAttributeString("Size", featureSymbol.Size.ToString(CultureInfo.InvariantCulture)); - if (!String.IsNullOrEmpty(featureTuple.Parent)) + if (!String.IsNullOrEmpty(featureSymbol.Parent)) { - writer.WriteAttributeString("Parent", featureTuple.Parent); + writer.WriteAttributeString("Parent", featureSymbol.Parent); } - if (!String.IsNullOrEmpty(featureTuple.Title)) + if (!String.IsNullOrEmpty(featureSymbol.Title)) { - writer.WriteAttributeString("Title", featureTuple.Title); + writer.WriteAttributeString("Title", featureSymbol.Title); } - if (!String.IsNullOrEmpty(featureTuple.Description)) + if (!String.IsNullOrEmpty(featureSymbol.Description)) { - writer.WriteAttributeString("Description", featureTuple.Description); + writer.WriteAttributeString("Description", featureSymbol.Description); } - writer.WriteAttributeString("Display", featureTuple.Display.ToString(CultureInfo.InvariantCulture)); - writer.WriteAttributeString("Level", featureTuple.Level.ToString(CultureInfo.InvariantCulture)); - writer.WriteAttributeString("Directory", featureTuple.Directory); - writer.WriteAttributeString("Attributes", featureTuple.Attributes.ToString(CultureInfo.InvariantCulture)); + writer.WriteAttributeString("Display", featureSymbol.Display.ToString(CultureInfo.InvariantCulture)); + writer.WriteAttributeString("Level", featureSymbol.Level.ToString(CultureInfo.InvariantCulture)); + writer.WriteAttributeString("Directory", featureSymbol.Directory); + writer.WriteAttributeString("Attributes", featureSymbol.Attributes.ToString(CultureInfo.InvariantCulture)); writer.WriteEndElement(); } @@ -211,43 +211,43 @@ namespace WixToolset.Core.Burn.Bundles private void WritePayloadInfo(XmlTextWriter writer) { - var payloadTuples = this.Section.Tuples.OfType(); + var payloadSymbols = this.Section.Symbols.OfType(); - foreach (var payloadTuple in payloadTuples) + foreach (var payloadSymbol in payloadSymbols) { writer.WriteStartElement("WixPayloadProperties"); - writer.WriteAttributeString("Payload", payloadTuple.Id.Id); + writer.WriteAttributeString("Payload", payloadSymbol.Id.Id); - if (!String.IsNullOrEmpty(payloadTuple.PackageRef)) + if (!String.IsNullOrEmpty(payloadSymbol.PackageRef)) { - writer.WriteAttributeString("Package", payloadTuple.PackageRef); + writer.WriteAttributeString("Package", payloadSymbol.PackageRef); } - if (!String.IsNullOrEmpty(payloadTuple.ContainerRef)) + if (!String.IsNullOrEmpty(payloadSymbol.ContainerRef)) { - writer.WriteAttributeString("Container", payloadTuple.ContainerRef); + writer.WriteAttributeString("Container", payloadSymbol.ContainerRef); } - writer.WriteAttributeString("Name", payloadTuple.Name); - writer.WriteAttributeString("Size", payloadTuple.FileSize.Value.ToString(CultureInfo.InvariantCulture)); + writer.WriteAttributeString("Name", payloadSymbol.Name); + writer.WriteAttributeString("Size", payloadSymbol.FileSize.Value.ToString(CultureInfo.InvariantCulture)); - if (!String.IsNullOrEmpty(payloadTuple.DownloadUrl)) + if (!String.IsNullOrEmpty(payloadSymbol.DownloadUrl)) { - writer.WriteAttributeString("DownloadUrl", payloadTuple.DownloadUrl); + writer.WriteAttributeString("DownloadUrl", payloadSymbol.DownloadUrl); } - writer.WriteAttributeString("LayoutOnly", payloadTuple.LayoutOnly ? "yes" : "no"); + writer.WriteAttributeString("LayoutOnly", payloadSymbol.LayoutOnly ? "yes" : "no"); writer.WriteEndElement(); } } - private WixBundlePayloadTuple CreateBootstrapperApplicationManifestPayloadRow(string baManifestPath) + private WixBundlePayloadSymbol CreateBootstrapperApplicationManifestPayloadRow(string baManifestPath) { var generatedId = Common.GenerateIdentifier("ux", BurnCommon.BADataFileName); - var tuple = this.Section.AddTuple(new WixBundlePayloadTuple(this.BundleTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId)) + var symbol = this.Section.AddSymbol(new WixBundlePayloadSymbol(this.BundleSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId)) { Name = BurnCommon.BADataFileName, SourceFile = new IntermediateFieldPathValue { Path = baManifestPath }, @@ -260,11 +260,11 @@ namespace WixToolset.Core.Burn.Bundles var fileInfo = new FileInfo(baManifestPath); - tuple.FileSize = (int)fileInfo.Length; + symbol.FileSize = (int)fileInfo.Length; - tuple.Hash = BundleHashAlgorithm.Hash(fileInfo); + symbol.Hash = BundleHashAlgorithm.Hash(fileInfo); - return tuple; + return symbol; } } } diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs index 03102d5e..3cf6e0aa 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs @@ -8,19 +8,19 @@ namespace WixToolset.Core.Burn.Bundles using System.Reflection; using WixToolset.Data; using WixToolset.Data.Burn; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; internal class CreateBundleExeCommand { - public CreateBundleExeCommand(IMessaging messaging, IBackendHelper backendHelper, string intermediateFolder, string outputPath, WixBundleTuple bundleTuple, WixBundleContainerTuple uxContainer, IEnumerable containers) + public CreateBundleExeCommand(IMessaging messaging, IBackendHelper backendHelper, string intermediateFolder, string outputPath, WixBundleSymbol bundleSymbol, WixBundleContainerSymbol uxContainer, IEnumerable containers) { this.Messaging = messaging; this.BackendHelper = backendHelper; this.IntermediateFolder = intermediateFolder; this.OutputPath = outputPath; - this.BundleTuple = bundleTuple; + this.BundleSymbol = bundleSymbol; this.UXContainer = uxContainer; this.Containers = containers; } @@ -35,11 +35,11 @@ namespace WixToolset.Core.Burn.Bundles private string OutputPath { get; } - private WixBundleTuple BundleTuple { get; } + private WixBundleSymbol BundleSymbol { get; } - private WixBundleContainerTuple UXContainer { get; } + private WixBundleContainerSymbol UXContainer { get; } - private IEnumerable Containers { get; } + private IEnumerable Containers { get; } public void Execute() { @@ -47,7 +47,7 @@ namespace WixToolset.Core.Burn.Bundles // Copy the burn.exe to a writable location then mark it to be moved to its final build location. - var stubPlatform = this.BundleTuple.Platform.ToString(); + var stubPlatform = this.BundleSymbol.Platform.ToString(); var stubFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), stubPlatform, "burn.exe"); var bundleTempPath = Path.Combine(this.IntermediateFolder, bundleFilename); @@ -59,19 +59,19 @@ namespace WixToolset.Core.Burn.Bundles this.Messaging.Write(ErrorMessages.InsecureBundleFilename(bundleFilename)); } - this.Transfer = this.BackendHelper.CreateFileTransfer(bundleTempPath, this.OutputPath, true, this.BundleTuple.SourceLineNumbers); + this.Transfer = this.BackendHelper.CreateFileTransfer(bundleTempPath, this.OutputPath, true, this.BundleSymbol.SourceLineNumbers); File.Copy(stubFile, bundleTempPath, true); File.SetAttributes(bundleTempPath, FileAttributes.Normal); - this.UpdateBurnResources(bundleTempPath, this.OutputPath, this.BundleTuple); + this.UpdateBurnResources(bundleTempPath, this.OutputPath, this.BundleSymbol); // Update the .wixburn section to point to at the UX and attached container(s) then attach the containers // if they should be attached. using (var writer = BurnWriter.Open(this.Messaging, bundleTempPath)) { var burnStubFile = new FileInfo(bundleTempPath); - writer.InitializeBundleSectionData(burnStubFile.Length, this.BundleTuple.BundleId); + writer.InitializeBundleSectionData(burnStubFile.Length, this.BundleSymbol.BundleId); // Always attach the UX container first writer.AppendContainer(this.UXContainer.WorkingPath, BurnWriter.Container.UX); @@ -91,7 +91,7 @@ namespace WixToolset.Core.Burn.Bundles } } - private void UpdateBurnResources(string bundleTempPath, string outputPath, WixBundleTuple bundleInfo) + private void UpdateBurnResources(string bundleTempPath, string outputPath, WixBundleSymbol bundleInfo) { var resources = new Dtf.Resources.ResourceCollection(); var version = new Dtf.Resources.VersionResource("#1", 1033); diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs index f7acd54c..74ccd895 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs @@ -9,14 +9,14 @@ namespace WixToolset.Core.Burn.Bundles using System.Xml; using WixToolset.Data; using WixToolset.Data.Burn; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; internal class CreateBundleExtensionManifestCommand { - public CreateBundleExtensionManifestCommand(IntermediateSection section, WixBundleTuple bundleTuple, int lastUXPayloadIndex, string intermediateFolder, IInternalBurnBackendHelper internalBurnBackendHelper) + public CreateBundleExtensionManifestCommand(IntermediateSection section, WixBundleSymbol bundleSymbol, int lastUXPayloadIndex, string intermediateFolder, IInternalBurnBackendHelper internalBurnBackendHelper) { this.Section = section; - this.BundleTuple = bundleTuple; + this.BundleSymbol = bundleSymbol; this.LastUXPayloadIndex = lastUXPayloadIndex; this.IntermediateFolder = intermediateFolder; this.InternalBurnBackendHelper = internalBurnBackendHelper; @@ -24,7 +24,7 @@ namespace WixToolset.Core.Burn.Bundles private IntermediateSection Section { get; } - private WixBundleTuple BundleTuple { get; } + private WixBundleSymbol BundleSymbol { get; } private IInternalBurnBackendHelper InternalBurnBackendHelper { get; } @@ -32,7 +32,7 @@ namespace WixToolset.Core.Burn.Bundles private string IntermediateFolder { get; } - public WixBundlePayloadTuple BundleExtensionManifestPayloadRow { get; private set; } + public WixBundlePayloadSymbol BundleExtensionManifestPayloadRow { get; private set; } public string OutputPath { get; private set; } @@ -64,11 +64,11 @@ namespace WixToolset.Core.Burn.Bundles return path; } - private WixBundlePayloadTuple CreateBundleExtensionManifestPayloadRow(string bextManifestPath) + private WixBundlePayloadSymbol CreateBundleExtensionManifestPayloadRow(string bextManifestPath) { var generatedId = Common.GenerateIdentifier("ux", BurnCommon.BundleExtensionDataFileName); - var tuple = this.Section.AddTuple(new WixBundlePayloadTuple(this.BundleTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId)) + var symbol = this.Section.AddSymbol(new WixBundlePayloadSymbol(this.BundleSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId)) { Name = BurnCommon.BundleExtensionDataFileName, SourceFile = new IntermediateFieldPathValue { Path = bextManifestPath }, @@ -81,11 +81,11 @@ namespace WixToolset.Core.Burn.Bundles var fileInfo = new FileInfo(bextManifestPath); - tuple.FileSize = (int)fileInfo.Length; + symbol.FileSize = (int)fileInfo.Length; - tuple.Hash = BundleHashAlgorithm.Hash(fileInfo); + symbol.Hash = BundleHashAlgorithm.Hash(fileInfo); - return tuple; + return symbol; } } } diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs index 9453c7e3..05b15ab6 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs @@ -12,20 +12,20 @@ namespace WixToolset.Core.Burn.Bundles using System.Xml; using WixToolset.Data; using WixToolset.Data.Burn; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; using WixToolset.Extensibility.Services; internal class CreateBurnManifestCommand { - public CreateBurnManifestCommand(IMessaging messaging, IEnumerable backendExtensions, string executableName, IntermediateSection section, WixBundleTuple bundleTuple, IEnumerable containers, WixChainTuple chainTuple, IEnumerable orderedPackages, IEnumerable boundaries, IEnumerable uxPayloads, Dictionary allPayloadsById, IEnumerable orderedSearches, IEnumerable catalogs, string intermediateFolder) + public CreateBurnManifestCommand(IMessaging messaging, IEnumerable backendExtensions, string executableName, IntermediateSection section, WixBundleSymbol bundleSymbol, IEnumerable containers, WixChainSymbol chainSymbol, IEnumerable orderedPackages, IEnumerable boundaries, IEnumerable uxPayloads, Dictionary allPayloadsById, IEnumerable orderedSearches, IEnumerable catalogs, string intermediateFolder) { this.Messaging = messaging; this.BackendExtensions = backendExtensions; this.ExecutableName = executableName; this.Section = section; - this.BundleTuple = bundleTuple; - this.Chain = chainTuple; + this.BundleSymbol = bundleSymbol; + this.Chain = chainSymbol; this.Containers = containers; this.OrderedPackages = orderedPackages; this.RollbackBoundaries = boundaries; @@ -46,23 +46,23 @@ namespace WixToolset.Core.Burn.Bundles private IntermediateSection Section { get; } - private WixBundleTuple BundleTuple { get; } + private WixBundleSymbol BundleSymbol { get; } - private WixChainTuple Chain { get; } + private WixChainSymbol Chain { get; } - private IEnumerable RollbackBoundaries { get; } + private IEnumerable RollbackBoundaries { get; } private IEnumerable OrderedPackages { get; } private IEnumerable OrderedSearches { get; } - private Dictionary Payloads { get; } + private Dictionary Payloads { get; } - private IEnumerable Containers { get; } + private IEnumerable Containers { get; } - private IEnumerable UXContainerPayloads { get; } + private IEnumerable UXContainerPayloads { get; } - private IEnumerable Catalogs { get; } + private IEnumerable Catalogs { get; } private string IntermediateFolder { get; } @@ -77,32 +77,32 @@ namespace WixToolset.Core.Burn.Bundles writer.WriteStartElement("BurnManifest", BurnCommon.BurnNamespace); // Write the condition, if there is one - if (null != this.BundleTuple.Condition) + if (null != this.BundleSymbol.Condition) { - writer.WriteElementString("Condition", this.BundleTuple.Condition); + writer.WriteElementString("Condition", this.BundleSymbol.Condition); } // Write the log element if default logging wasn't disabled. - if (!String.IsNullOrEmpty(this.BundleTuple.LogPrefix)) + if (!String.IsNullOrEmpty(this.BundleSymbol.LogPrefix)) { writer.WriteStartElement("Log"); - if (!String.IsNullOrEmpty(this.BundleTuple.LogPathVariable)) + if (!String.IsNullOrEmpty(this.BundleSymbol.LogPathVariable)) { - writer.WriteAttributeString("PathVariable", this.BundleTuple.LogPathVariable); + writer.WriteAttributeString("PathVariable", this.BundleSymbol.LogPathVariable); } - writer.WriteAttributeString("Prefix", this.BundleTuple.LogPrefix); - writer.WriteAttributeString("Extension", this.BundleTuple.LogExtension); + writer.WriteAttributeString("Prefix", this.BundleSymbol.LogPrefix); + writer.WriteAttributeString("Extension", this.BundleSymbol.LogExtension); writer.WriteEndElement(); } // Get update if specified. - var updateTuple = this.Section.Tuples.OfType().FirstOrDefault(); + var updateSymbol = this.Section.Symbols.OfType().FirstOrDefault(); - if (null != updateTuple) + if (null != updateSymbol) { writer.WriteStartElement("Update"); - writer.WriteAttributeString("Location", updateTuple.Location); + writer.WriteAttributeString("Location", updateSymbol.Location); writer.WriteEndElement(); // } @@ -110,7 +110,7 @@ namespace WixToolset.Core.Burn.Bundles // For the related bundles with duplicated identifiers the second instance is ignored (i.e. the Duplicates // enumeration in the index row list is not used). - var relatedBundles = this.Section.Tuples.OfType(); + var relatedBundles = this.Section.Symbols.OfType(); var distinctRelatedBundles = new HashSet(); foreach (var relatedBundle in relatedBundles) @@ -125,7 +125,7 @@ namespace WixToolset.Core.Burn.Bundles } // Write the variables - var variables = this.Section.Tuples.OfType(); + var variables = this.Section.Symbols.OfType(); foreach (var variable in variables) { @@ -149,7 +149,7 @@ namespace WixToolset.Core.Burn.Bundles // write the UX element writer.WriteStartElement("UX"); - if (!String.IsNullOrEmpty(this.BundleTuple.SplashScreenSourceFile)) + if (!String.IsNullOrEmpty(this.BundleSymbol.SplashScreenSourceFile)) { writer.WriteAttributeString("SplashScreen", "yes"); } @@ -214,66 +214,66 @@ namespace WixToolset.Core.Burn.Bundles // Write the registration information... writer.WriteStartElement("Registration"); - writer.WriteAttributeString("Id", this.BundleTuple.BundleId); + writer.WriteAttributeString("Id", this.BundleSymbol.BundleId); writer.WriteAttributeString("ExecutableName", this.ExecutableName); - writer.WriteAttributeString("PerMachine", this.BundleTuple.PerMachine ? "yes" : "no"); - writer.WriteAttributeString("Tag", this.BundleTuple.Tag); - writer.WriteAttributeString("Version", this.BundleTuple.Version); - writer.WriteAttributeString("ProviderKey", this.BundleTuple.ProviderKey); + writer.WriteAttributeString("PerMachine", this.BundleSymbol.PerMachine ? "yes" : "no"); + writer.WriteAttributeString("Tag", this.BundleSymbol.Tag); + writer.WriteAttributeString("Version", this.BundleSymbol.Version); + writer.WriteAttributeString("ProviderKey", this.BundleSymbol.ProviderKey); writer.WriteStartElement("Arp"); - writer.WriteAttributeString("Register", (this.BundleTuple.DisableModify || this.BundleTuple.SingleChangeUninstallButton) && this.BundleTuple.DisableRemove ? "no" : "yes"); // do not register if disabled modify and remove. - writer.WriteAttributeString("DisplayName", this.BundleTuple.Name); - writer.WriteAttributeString("DisplayVersion", this.BundleTuple.Version); + writer.WriteAttributeString("Register", (this.BundleSymbol.DisableModify || this.BundleSymbol.SingleChangeUninstallButton) && this.BundleSymbol.DisableRemove ? "no" : "yes"); // do not register if disabled modify and remove. + writer.WriteAttributeString("DisplayName", this.BundleSymbol.Name); + writer.WriteAttributeString("DisplayVersion", this.BundleSymbol.Version); - if (!String.IsNullOrEmpty(this.BundleTuple.Manufacturer)) + if (!String.IsNullOrEmpty(this.BundleSymbol.Manufacturer)) { - writer.WriteAttributeString("Publisher", this.BundleTuple.Manufacturer); + writer.WriteAttributeString("Publisher", this.BundleSymbol.Manufacturer); } - if (!String.IsNullOrEmpty(this.BundleTuple.HelpUrl)) + if (!String.IsNullOrEmpty(this.BundleSymbol.HelpUrl)) { - writer.WriteAttributeString("HelpLink", this.BundleTuple.HelpUrl); + writer.WriteAttributeString("HelpLink", this.BundleSymbol.HelpUrl); } - if (!String.IsNullOrEmpty(this.BundleTuple.HelpTelephone)) + if (!String.IsNullOrEmpty(this.BundleSymbol.HelpTelephone)) { - writer.WriteAttributeString("HelpTelephone", this.BundleTuple.HelpTelephone); + writer.WriteAttributeString("HelpTelephone", this.BundleSymbol.HelpTelephone); } - if (!String.IsNullOrEmpty(this.BundleTuple.AboutUrl)) + if (!String.IsNullOrEmpty(this.BundleSymbol.AboutUrl)) { - writer.WriteAttributeString("AboutUrl", this.BundleTuple.AboutUrl); + writer.WriteAttributeString("AboutUrl", this.BundleSymbol.AboutUrl); } - if (!String.IsNullOrEmpty(this.BundleTuple.UpdateUrl)) + if (!String.IsNullOrEmpty(this.BundleSymbol.UpdateUrl)) { - writer.WriteAttributeString("UpdateUrl", this.BundleTuple.UpdateUrl); + writer.WriteAttributeString("UpdateUrl", this.BundleSymbol.UpdateUrl); } - if (!String.IsNullOrEmpty(this.BundleTuple.ParentName)) + if (!String.IsNullOrEmpty(this.BundleSymbol.ParentName)) { - writer.WriteAttributeString("ParentDisplayName", this.BundleTuple.ParentName); + writer.WriteAttributeString("ParentDisplayName", this.BundleSymbol.ParentName); } - if (this.BundleTuple.DisableModify) + if (this.BundleSymbol.DisableModify) { writer.WriteAttributeString("DisableModify", "yes"); } - if (this.BundleTuple.DisableRemove) + if (this.BundleSymbol.DisableRemove) { writer.WriteAttributeString("DisableRemove", "yes"); } - if (this.BundleTuple.SingleChangeUninstallButton) + if (this.BundleSymbol.SingleChangeUninstallButton) { writer.WriteAttributeString("DisableModify", "button"); } writer.WriteEndElement(); // // Get update registration if specified. - var updateRegistrationInfo = this.Section.Tuples.OfType().FirstOrDefault(); + var updateRegistrationInfo = this.Section.Symbols.OfType().FirstOrDefault(); if (null != updateRegistrationInfo) { @@ -327,28 +327,28 @@ namespace WixToolset.Core.Burn.Bundles } // Index a few tables by package. - var targetCodesByPatch = this.Section.Tuples.OfType().ToLookup(r => r.PackageRef); - var msiFeaturesByPackage = this.Section.Tuples.OfType().ToLookup(r => r.PackageRef); - var msiPropertiesByPackage = this.Section.Tuples.OfType().ToLookup(r => r.PackageRef); + var targetCodesByPatch = this.Section.Symbols.OfType().ToLookup(r => r.PackageRef); + var msiFeaturesByPackage = this.Section.Symbols.OfType().ToLookup(r => r.PackageRef); + var msiPropertiesByPackage = this.Section.Symbols.OfType().ToLookup(r => r.PackageRef); var payloadsByPackage = this.Payloads.Values.ToLookup(p => p.PackageRef); - var relatedPackagesByPackage = this.Section.Tuples.OfType().ToLookup(r => r.PackageRef); - var slipstreamMspsByPackage = this.Section.Tuples.OfType().ToLookup(r => r.MspPackageRef); - var exitCodesByPackage = this.Section.Tuples.OfType().ToLookup(r => r.ChainPackageId); - var commandLinesByPackage = this.Section.Tuples.OfType().ToLookup(r => r.WixBundlePackageRef); + var relatedPackagesByPackage = this.Section.Symbols.OfType().ToLookup(r => r.PackageRef); + var slipstreamMspsByPackage = this.Section.Symbols.OfType().ToLookup(r => r.MspPackageRef); + var exitCodesByPackage = this.Section.Symbols.OfType().ToLookup(r => r.ChainPackageId); + var commandLinesByPackage = this.Section.Symbols.OfType().ToLookup(r => r.WixBundlePackageRef); - var dependenciesByPackage = this.Section.Tuples.OfType().ToLookup(p => p.PackageRef); + var dependenciesByPackage = this.Section.Symbols.OfType().ToLookup(p => p.PackageRef); // Build up the list of target codes from all the MSPs in the chain. - var targetCodes = new List(); + var targetCodes = new List(); foreach (var package in this.OrderedPackages) { - writer.WriteStartElement(String.Format(CultureInfo.InvariantCulture, "{0}Package", package.PackageTuple.Type)); + writer.WriteStartElement(String.Format(CultureInfo.InvariantCulture, "{0}Package", package.PackageSymbol.Type)); writer.WriteAttributeString("Id", package.PackageId); - switch (package.PackageTuple.Cache) + switch (package.PackageSymbol.Cache) { case YesNoAlwaysType.No: writer.WriteAttributeString("Cache", "no"); @@ -361,39 +361,39 @@ namespace WixToolset.Core.Burn.Bundles break; } - writer.WriteAttributeString("CacheId", package.PackageTuple.CacheId); - writer.WriteAttributeString("InstallSize", Convert.ToString(package.PackageTuple.InstallSize)); - writer.WriteAttributeString("Size", Convert.ToString(package.PackageTuple.Size)); - writer.WriteAttributeString("PerMachine", YesNoDefaultType.Yes == package.PackageTuple.PerMachine ? "yes" : "no"); - writer.WriteAttributeString("Permanent", package.PackageTuple.Permanent ? "yes" : "no"); - writer.WriteAttributeString("Vital", package.PackageTuple.Vital == false ? "no" : "yes"); + writer.WriteAttributeString("CacheId", package.PackageSymbol.CacheId); + writer.WriteAttributeString("InstallSize", Convert.ToString(package.PackageSymbol.InstallSize)); + writer.WriteAttributeString("Size", Convert.ToString(package.PackageSymbol.Size)); + writer.WriteAttributeString("PerMachine", YesNoDefaultType.Yes == package.PackageSymbol.PerMachine ? "yes" : "no"); + writer.WriteAttributeString("Permanent", package.PackageSymbol.Permanent ? "yes" : "no"); + writer.WriteAttributeString("Vital", package.PackageSymbol.Vital == false ? "no" : "yes"); - if (null != package.PackageTuple.RollbackBoundaryRef) + if (null != package.PackageSymbol.RollbackBoundaryRef) { - writer.WriteAttributeString("RollbackBoundaryForward", package.PackageTuple.RollbackBoundaryRef); + writer.WriteAttributeString("RollbackBoundaryForward", package.PackageSymbol.RollbackBoundaryRef); } - if (!String.IsNullOrEmpty(package.PackageTuple.RollbackBoundaryBackwardRef)) + if (!String.IsNullOrEmpty(package.PackageSymbol.RollbackBoundaryBackwardRef)) { - writer.WriteAttributeString("RollbackBoundaryBackward", package.PackageTuple.RollbackBoundaryBackwardRef); + writer.WriteAttributeString("RollbackBoundaryBackward", package.PackageSymbol.RollbackBoundaryBackwardRef); } - if (!String.IsNullOrEmpty(package.PackageTuple.LogPathVariable)) + if (!String.IsNullOrEmpty(package.PackageSymbol.LogPathVariable)) { - writer.WriteAttributeString("LogPathVariable", package.PackageTuple.LogPathVariable); + writer.WriteAttributeString("LogPathVariable", package.PackageSymbol.LogPathVariable); } - if (!String.IsNullOrEmpty(package.PackageTuple.RollbackLogPathVariable)) + if (!String.IsNullOrEmpty(package.PackageSymbol.RollbackLogPathVariable)) { - writer.WriteAttributeString("RollbackLogPathVariable", package.PackageTuple.RollbackLogPathVariable); + writer.WriteAttributeString("RollbackLogPathVariable", package.PackageSymbol.RollbackLogPathVariable); } - if (!String.IsNullOrEmpty(package.PackageTuple.InstallCondition)) + if (!String.IsNullOrEmpty(package.PackageSymbol.InstallCondition)) { - writer.WriteAttributeString("InstallCondition", package.PackageTuple.InstallCondition); + writer.WriteAttributeString("InstallCondition", package.PackageSymbol.InstallCondition); } - if (package.SpecificPackageTuple is WixBundleExePackageTuple exePackage) // EXE + if (package.SpecificPackageSymbol is WixBundleExePackageSymbol exePackage) // EXE { writer.WriteAttributeString("DetectCondition", exePackage.DetectCondition); writer.WriteAttributeString("InstallArguments", exePackage.InstallCommand); @@ -405,7 +405,7 @@ namespace WixToolset.Core.Burn.Bundles writer.WriteAttributeString("Protocol", exePackage.ExeProtocol); } } - else if (package.SpecificPackageTuple is WixBundleMsiPackageTuple msiPackage) // MSI + else if (package.SpecificPackageSymbol is WixBundleMsiPackageSymbol msiPackage) // MSI { writer.WriteAttributeString("ProductCode", msiPackage.ProductCode); writer.WriteAttributeString("Language", msiPackage.ProductLanguage.ToString(CultureInfo.InvariantCulture)); @@ -415,7 +415,7 @@ namespace WixToolset.Core.Burn.Bundles writer.WriteAttributeString("UpgradeCode", msiPackage.UpgradeCode); } } - else if (package.SpecificPackageTuple is WixBundleMspPackageTuple mspPackage) // MSP + else if (package.SpecificPackageSymbol is WixBundleMspPackageSymbol mspPackage) // MSP { writer.WriteAttributeString("PatchCode", mspPackage.PatchCode); writer.WriteAttributeString("PatchXml", mspPackage.PatchXml); @@ -436,7 +436,7 @@ namespace WixToolset.Core.Burn.Bundles } } } - else if (package.SpecificPackageTuple is WixBundleMsuPackageTuple msuPackage) // MSU + else if (package.SpecificPackageSymbol is WixBundleMsuPackageSymbol msuPackage) // MSU { writer.WriteAttributeString("DetectCondition", msuPackage.DetectCondition); writer.WriteAttributeString("KB", msuPackage.MsuKB); @@ -567,14 +567,14 @@ namespace WixToolset.Core.Burn.Bundles // Write any contained Payloads with the PackagePayload being first writer.WriteStartElement("PayloadRef"); - writer.WriteAttributeString("Id", package.PackageTuple.PayloadRef); + writer.WriteAttributeString("Id", package.PackageSymbol.PayloadRef); writer.WriteEndElement(); var packagePayloads = payloadsByPackage[package.PackageId]; foreach (var payload in packagePayloads) { - if (payload.Id.Id != package.PackageTuple.PayloadRef) + if (payload.Id.Id != package.PackageSymbol.PayloadRef) { writer.WriteStartElement("PayloadRef"); writer.WriteAttributeString("Id", payload.Id.Id); @@ -598,7 +598,7 @@ namespace WixToolset.Core.Burn.Bundles } // Write the ApprovedExeForElevation elements. - var approvedExesForElevation = this.Section.Tuples.OfType(); + var approvedExesForElevation = this.Section.Symbols.OfType(); foreach (var approvedExeForElevation in approvedExesForElevation) { @@ -620,7 +620,7 @@ namespace WixToolset.Core.Burn.Bundles } // Write the BundleExtension elements. - var bundleExtensions = this.Section.Tuples.OfType(); + var bundleExtensions = this.Section.Symbols.OfType(); foreach (var bundleExtension in bundleExtensions) { @@ -635,7 +635,7 @@ namespace WixToolset.Core.Burn.Bundles } } - private void WriteBurnManifestContainerAttributes(XmlTextWriter writer, string executableName, WixBundleContainerTuple container) + private void WriteBurnManifestContainerAttributes(XmlTextWriter writer, string executableName, WixBundleContainerSymbol container) { writer.WriteAttributeString("Id", container.Id.Id); writer.WriteAttributeString("FileSize", container.Size.Value.ToString(CultureInfo.InvariantCulture)); @@ -669,7 +669,7 @@ namespace WixToolset.Core.Burn.Bundles } } - private void WriteBurnManifestPayloadAttributes(XmlTextWriter writer, WixBundlePayloadTuple payload, bool embeddedOnly, Dictionary allPayloads) + private void WriteBurnManifestPayloadAttributes(XmlTextWriter writer, WixBundlePayloadSymbol payload, bool embeddedOnly, Dictionary allPayloads) { Debug.Assert(!embeddedOnly || PackagingType.Embedded == payload.Packaging); diff --git a/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs index 937721a6..a23a116b 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs @@ -8,21 +8,21 @@ namespace WixToolset.Core.Burn.Bundles using System.Linq; using WixToolset.Core.Native; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; /// /// Creates cabinet files. /// internal class CreateContainerCommand { - public CreateContainerCommand(IEnumerable payloads, string outputPath, CompressionLevel? compressionLevel) + public CreateContainerCommand(IEnumerable payloads, string outputPath, CompressionLevel? compressionLevel) { this.Payloads = payloads; this.OutputPath = outputPath; this.CompressionLevel = compressionLevel; } - public CreateContainerCommand(string manifestPath, IEnumerable payloads, string outputPath, CompressionLevel? compressionLevel) + public CreateContainerCommand(string manifestPath, IEnumerable payloads, string outputPath, CompressionLevel? compressionLevel) { this.ManifestFile = manifestPath; this.Payloads = payloads; @@ -36,7 +36,7 @@ namespace WixToolset.Core.Burn.Bundles private string OutputPath { get; } - private IEnumerable Payloads { get; } + private IEnumerable Payloads { get; } public string Hash { get; private set; } diff --git a/src/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs b/src/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs index babac5e2..3e54013a 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs @@ -8,18 +8,18 @@ namespace WixToolset.Core.Burn.Bundles using System.Linq; using WixToolset.Data; using WixToolset.Data.Burn; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; internal class CreateNonUXContainers { - public CreateNonUXContainers(IBackendHelper backendHelper, IntermediateSection section, WixBootstrapperApplicationTuple bootstrapperApplicationTuple, Dictionary payloadTuples, string intermediateFolder, string layoutFolder, CompressionLevel? defaultCompressionLevel) + public CreateNonUXContainers(IBackendHelper backendHelper, IntermediateSection section, WixBootstrapperApplicationSymbol bootstrapperApplicationSymbol, Dictionary payloadSymbols, string intermediateFolder, string layoutFolder, CompressionLevel? defaultCompressionLevel) { this.BackendHelper = backendHelper; this.Section = section; - this.BootstrapperApplicationTuple = bootstrapperApplicationTuple; - this.PayloadTuples = payloadTuples; + this.BootstrapperApplicationSymbol = bootstrapperApplicationSymbol; + this.PayloadSymbols = payloadSymbols; this.IntermediateFolder = intermediateFolder; this.LayoutFolder = layoutFolder; this.DefaultCompressionLevel = defaultCompressionLevel; @@ -29,19 +29,19 @@ namespace WixToolset.Core.Burn.Bundles public IEnumerable TrackedFiles { get; private set; } - public WixBundleContainerTuple UXContainer { get; set; } + public WixBundleContainerSymbol UXContainer { get; set; } - public IEnumerable UXContainerPayloads { get; private set; } + public IEnumerable UXContainerPayloads { get; private set; } - public IEnumerable Containers { get; private set; } + public IEnumerable Containers { get; private set; } private IBackendHelper BackendHelper { get; } private IntermediateSection Section { get; } - private WixBootstrapperApplicationTuple BootstrapperApplicationTuple { get; } + private WixBootstrapperApplicationSymbol BootstrapperApplicationSymbol { get; } - private Dictionary PayloadTuples { get; } + private Dictionary PayloadSymbols { get; } private string IntermediateFolder { get; } @@ -53,15 +53,15 @@ namespace WixToolset.Core.Burn.Bundles { var fileTransfers = new List(); var trackedFiles = new List(); - var uxPayloadTuples = new List(); + var uxPayloadSymbols = new List(); var attachedContainerIndex = 1; // count starts at one because UX container is "0". - var containerTuples = this.Section.Tuples.OfType().ToList(); + var containerSymbols = this.Section.Symbols.OfType().ToList(); - var payloadsByContainer = this.PayloadTuples.Values.ToLookup(p => p.ContainerRef); + var payloadsByContainer = this.PayloadSymbols.Values.ToLookup(p => p.ContainerRef); - foreach (var container in containerTuples) + foreach (var container in containerSymbols) { var containerId = container.Id.Id; @@ -83,17 +83,17 @@ namespace WixToolset.Core.Burn.Bundles // Gather the list of UX payloads but ensure the BootstrapperApplication Payload is the first // in the list since that is the Payload that Burn attempts to load. - var baPayloadId = this.BootstrapperApplicationTuple.Id.Id; + var baPayloadId = this.BootstrapperApplicationSymbol.Id.Id; foreach (var uxPayload in containerPayloads) { if (uxPayload.Id.Id == baPayloadId) { - uxPayloadTuples.Insert(0, uxPayload); + uxPayloadSymbols.Insert(0, uxPayload); } else { - uxPayloadTuples.Add(uxPayload); + uxPayloadSymbols.Add(uxPayload); } } } @@ -120,13 +120,13 @@ namespace WixToolset.Core.Burn.Bundles } } - this.Containers = containerTuples; - this.UXContainerPayloads = uxPayloadTuples; + this.Containers = containerSymbols; + this.UXContainerPayloads = uxPayloadSymbols; this.FileTransfers = fileTransfers; this.TrackedFiles = trackedFiles; } - private void CreateContainer(WixBundleContainerTuple container, IEnumerable containerPayloads) + private void CreateContainer(WixBundleContainerSymbol container, IEnumerable containerPayloads) { var command = new CreateContainerCommand(containerPayloads, container.WorkingPath, this.DefaultCompressionLevel); command.Execute(); diff --git a/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs b/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs index 71e4cfea..24d1e8d8 100644 --- a/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs @@ -5,17 +5,17 @@ namespace WixToolset.Core.Burn.Bundles using System.Collections.Generic; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; internal class GetPackageFacadesCommand { - public GetPackageFacadesCommand(IEnumerable chainPackageTuples, IntermediateSection section) + public GetPackageFacadesCommand(IEnumerable chainPackageSymbols, IntermediateSection section) { - this.ChainPackageTuples = chainPackageTuples; + this.ChainPackageSymbols = chainPackageSymbols; this.Section = section; } - private IEnumerable ChainPackageTuples { get; } + private IEnumerable ChainPackageSymbols { get; } private IntermediateSection Section { get; } @@ -23,14 +23,14 @@ namespace WixToolset.Core.Burn.Bundles public void Execute() { - var exePackages = this.Section.Tuples.OfType().ToDictionary(t => t.Id.Id); - var msiPackages = this.Section.Tuples.OfType().ToDictionary(t => t.Id.Id); - var mspPackages = this.Section.Tuples.OfType().ToDictionary(t => t.Id.Id); - var msuPackages = this.Section.Tuples.OfType().ToDictionary(t => t.Id.Id); + var exePackages = this.Section.Symbols.OfType().ToDictionary(t => t.Id.Id); + var msiPackages = this.Section.Symbols.OfType().ToDictionary(t => t.Id.Id); + var mspPackages = this.Section.Symbols.OfType().ToDictionary(t => t.Id.Id); + var msuPackages = this.Section.Symbols.OfType().ToDictionary(t => t.Id.Id); var facades = new Dictionary(); - foreach (var package in this.ChainPackageTuples) + foreach (var package in this.ChainPackageSymbols) { var id = package.Id.Id; switch (package.Type) diff --git a/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs b/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs index 8ead0952..9e27d5a3 100644 --- a/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs @@ -5,35 +5,35 @@ namespace WixToolset.Core.Burn.Bundles using System; using System.Collections.Generic; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Services; internal class OrderPackagesAndRollbackBoundariesCommand { - public OrderPackagesAndRollbackBoundariesCommand(IMessaging messaging, IEnumerable groupTuples, Dictionary boundaryTuples, IDictionary packageFacades) + public OrderPackagesAndRollbackBoundariesCommand(IMessaging messaging, IEnumerable groupSymbols, Dictionary boundarySymbols, IDictionary packageFacades) { this.Messaging = messaging; - this.GroupTuples = groupTuples; - this.Boundaries = boundaryTuples; + this.GroupSymbols = groupSymbols; + this.Boundaries = boundarySymbols; this.PackageFacades = packageFacades; } private IMessaging Messaging { get; } - public IEnumerable GroupTuples { get; } + public IEnumerable GroupSymbols { get; } - public Dictionary Boundaries { get; } + public Dictionary Boundaries { get; } public IDictionary PackageFacades { get; } public IEnumerable OrderedPackageFacades { get; private set; } - public IEnumerable UsedRollbackBoundaries { get; private set; } + public IEnumerable UsedRollbackBoundaries { get; private set; } public void Execute() { var orderedFacades = new List(); - var usedBoundaries = new List(); + var usedBoundaries = new List(); // Process the chain of packages to add them in the correct order // and assign the forward rollback boundaries as appropriate. Remember @@ -44,41 +44,41 @@ namespace WixToolset.Core.Burn.Bundles // We handle uninstall (aka: backwards) rollback boundaries after // we get these install/repair (aka: forward) rollback boundaries // defined. - WixBundleRollbackBoundaryTuple previousRollbackBoundary = null; - WixBundleRollbackBoundaryTuple lastRollbackBoundary = null; + WixBundleRollbackBoundarySymbol previousRollbackBoundary = null; + WixBundleRollbackBoundarySymbol lastRollbackBoundary = null; var boundaryHadX86Package = false; - foreach (var groupTuple in this.GroupTuples) + foreach (var groupSymbol in this.GroupSymbols) { - if (ComplexReferenceChildType.Package == groupTuple.ChildType && ComplexReferenceParentType.PackageGroup == groupTuple.ParentType && "WixChain" == groupTuple.ParentId) + if (ComplexReferenceChildType.Package == groupSymbol.ChildType && ComplexReferenceParentType.PackageGroup == groupSymbol.ParentType && "WixChain" == groupSymbol.ParentId) { - if (this.PackageFacades.TryGetValue(groupTuple.ChildId, out var facade)) + if (this.PackageFacades.TryGetValue(groupSymbol.ChildId, out var facade)) { if (null != previousRollbackBoundary) { usedBoundaries.Add(previousRollbackBoundary); - facade.PackageTuple.RollbackBoundaryRef = previousRollbackBoundary.Id.Id; + facade.PackageSymbol.RollbackBoundaryRef = previousRollbackBoundary.Id.Id; previousRollbackBoundary = null; - boundaryHadX86Package = facade.PackageTuple.Win64; + boundaryHadX86Package = facade.PackageSymbol.Win64; } // Error if MSI transaction has x86 package preceding x64 packages if ((lastRollbackBoundary != null) && lastRollbackBoundary.Transaction == true - && boundaryHadX86Package - && facade.PackageTuple.Win64) + && boundaryHadX86Package + && facade.PackageSymbol.Win64) { this.Messaging.Write(ErrorMessages.MsiTransactionX86BeforeX64(lastRollbackBoundary.SourceLineNumbers)); } - boundaryHadX86Package |= facade.PackageTuple.Win64; + boundaryHadX86Package |= facade.PackageSymbol.Win64; orderedFacades.Add(facade); } else // must be a rollback boundary. { // Discard the next rollback boundary if we have a previously defined boundary. - var nextRollbackBoundary = this.Boundaries[groupTuple.ChildId]; + var nextRollbackBoundary = this.Boundaries[groupSymbol.ChildId]; if (null != previousRollbackBoundary) { this.Messaging.Write(WarningMessages.DiscardedRollbackBoundary(nextRollbackBoundary.SourceLineNumbers, nextRollbackBoundary.Id.Id)); @@ -131,14 +131,14 @@ namespace WixToolset.Core.Burn.Bundles foreach (PackageFacade package in orderedFacades) { - if (null != package.PackageTuple.RollbackBoundaryRef) + if (null != package.PackageSymbol.RollbackBoundaryRef) { if (null != previousFacade) { - previousFacade.PackageTuple.RollbackBoundaryBackwardRef = previousRollbackBoundaryId; + previousFacade.PackageSymbol.RollbackBoundaryBackwardRef = previousRollbackBoundaryId; } - previousRollbackBoundaryId = package.PackageTuple.RollbackBoundaryRef; + previousRollbackBoundaryId = package.PackageSymbol.RollbackBoundaryRef; } previousFacade = package; @@ -146,7 +146,7 @@ namespace WixToolset.Core.Burn.Bundles if (!String.IsNullOrEmpty(previousRollbackBoundaryId) && null != previousFacade) { - previousFacade.PackageTuple.RollbackBoundaryBackwardRef = previousRollbackBoundaryId; + previousFacade.PackageSymbol.RollbackBoundaryBackwardRef = previousRollbackBoundaryId; } this.OrderedPackageFacades = orderedFacades; diff --git a/src/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs b/src/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs index 874258bf..dcb4733e 100644 --- a/src/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs @@ -8,7 +8,7 @@ namespace WixToolset.Core.Burn.Bundles using System.Linq; using WixToolset.Data; using WixToolset.Data.Burn; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Services; internal class OrderSearchesCommand @@ -23,32 +23,32 @@ namespace WixToolset.Core.Burn.Bundles private IntermediateSection Section { get; } - public IDictionary> ExtensionSearchTuplesByExtensionId { get; private set; } + public IDictionary> ExtensionSearchSymbolsByExtensionId { get; private set; } public IList OrderedSearchFacades { get; private set; } public void Execute() { - this.ExtensionSearchTuplesByExtensionId = new Dictionary>(); + this.ExtensionSearchSymbolsByExtensionId = new Dictionary>(); this.OrderedSearchFacades = new List(); - var searchRelationTuples = this.Section.Tuples.OfType().ToList(); - var searchTuples = this.Section.Tuples.OfType().ToList(); - if (searchTuples.Count == 0) + var searchRelationSymbols = this.Section.Symbols.OfType().ToList(); + var searchSymbols = this.Section.Symbols.OfType().ToList(); + if (searchSymbols.Count == 0) { // nothing to do! return; } - var tupleDictionary = searchTuples.ToDictionary(t => t.Id.Id); + var symbolDictionary = searchSymbols.ToDictionary(t => t.Id.Id); var constraints = new Constraints(); - if (searchRelationTuples.Count > 0) + if (searchRelationSymbols.Count > 0) { // add relational info to our data... - foreach (var searchRelationTuple in searchRelationTuples) + foreach (var searchRelationSymbol in searchRelationSymbols) { - constraints.AddConstraint(searchRelationTuple.Id.Id, searchRelationTuple.ParentSearchRef); + constraints.AddConstraint(searchRelationSymbol.Id.Id, searchRelationSymbol.ParentSearchRef); } } @@ -67,10 +67,10 @@ namespace WixToolset.Core.Burn.Bundles // lexicographically at each step to ensure a deterministic ordering // based on 'after' dependencies and ID. var sorter = new TopologicalSort(); - var sortedIds = sorter.Sort(tupleDictionary.Keys, constraints); + var sortedIds = sorter.Sort(symbolDictionary.Keys, constraints); // Now, create the search facades with the searches in order... - this.OrderSearches(sortedIds, tupleDictionary); + this.OrderSearches(sortedIds, symbolDictionary); } /// @@ -313,49 +313,49 @@ namespace WixToolset.Core.Burn.Bundles } } - private void OrderSearches(List sortedIds, Dictionary searchTupleDictionary) + private void OrderSearches(List sortedIds, Dictionary searchSymbolDictionary) { // TODO: Although the WixSearch tables are defined in the Util extension, // the Bundle Binder has to know all about them. We hope to revisit all // of this in the 4.0 timeframe. - var legacySearchesById = this.Section.Tuples - .Where(t => t.Definition.Type == TupleDefinitionType.WixComponentSearch || - t.Definition.Type == TupleDefinitionType.WixFileSearch || - t.Definition.Type == TupleDefinitionType.WixProductSearch || - t.Definition.Type == TupleDefinitionType.WixRegistrySearch) + var legacySearchesById = this.Section.Symbols + .Where(t => t.Definition.Type == SymbolDefinitionType.WixComponentSearch || + t.Definition.Type == SymbolDefinitionType.WixFileSearch || + t.Definition.Type == SymbolDefinitionType.WixProductSearch || + t.Definition.Type == SymbolDefinitionType.WixRegistrySearch) .ToDictionary(t => t.Id.Id); - var setVariablesById = this.Section.Tuples - .OfType() + var setVariablesById = this.Section.Symbols + .OfType() .ToDictionary(t => t.Id.Id); - var extensionSearchesById = this.Section.Tuples - .Where(t => t.Definition.HasTag(BurnConstants.BundleExtensionSearchTupleDefinitionTag)) + var extensionSearchesById = this.Section.Symbols + .Where(t => t.Definition.HasTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag)) .ToDictionary(t => t.Id.Id); foreach (var searchId in sortedIds) { - var searchTuple = searchTupleDictionary[searchId]; - if (legacySearchesById.TryGetValue(searchId, out var specificSearchTuple)) + var searchSymbol = searchSymbolDictionary[searchId]; + if (legacySearchesById.TryGetValue(searchId, out var specificSearchSymbol)) { - this.OrderedSearchFacades.Add(new LegacySearchFacade(searchTuple, specificSearchTuple)); + this.OrderedSearchFacades.Add(new LegacySearchFacade(searchSymbol, specificSearchSymbol)); } - else if (setVariablesById.TryGetValue(searchId, out var setVariableTuple)) + else if (setVariablesById.TryGetValue(searchId, out var setVariableSymbol)) { - this.OrderedSearchFacades.Add(new SetVariableSearchFacade(searchTuple, setVariableTuple)); + this.OrderedSearchFacades.Add(new SetVariableSearchFacade(searchSymbol, setVariableSymbol)); } - else if (extensionSearchesById.TryGetValue(searchId, out var extensionSearchTuple)) + else if (extensionSearchesById.TryGetValue(searchId, out var extensionSearchSymbol)) { - this.OrderedSearchFacades.Add(new ExtensionSearchFacade(searchTuple)); + this.OrderedSearchFacades.Add(new ExtensionSearchFacade(searchSymbol)); - if (!this.ExtensionSearchTuplesByExtensionId.TryGetValue(searchTuple.BundleExtensionRef, out var extensionSearchTuples)) + if (!this.ExtensionSearchSymbolsByExtensionId.TryGetValue(searchSymbol.BundleExtensionRef, out var extensionSearchSymbols)) { - extensionSearchTuples = new List(); - this.ExtensionSearchTuplesByExtensionId[searchTuple.BundleExtensionRef] = extensionSearchTuples; + extensionSearchSymbols = new List(); + this.ExtensionSearchSymbolsByExtensionId[searchSymbol.BundleExtensionRef] = extensionSearchSymbols; } - extensionSearchTuples.Add(extensionSearchTuple); + extensionSearchSymbols.Add(extensionSearchSymbol); } else { - this.Messaging.Write(ErrorMessages.MissingBundleSearch(searchTuple.SourceLineNumbers, searchId)); + this.Messaging.Write(ErrorMessages.MissingBundleSearch(searchSymbol.SourceLineNumbers, searchId)); } } } diff --git a/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs b/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs index 8b1711a1..471262de 100644 --- a/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs +++ b/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs @@ -4,22 +4,22 @@ namespace WixToolset.Core.Burn.Bundles { using System.Diagnostics; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; internal class PackageFacade { - public PackageFacade(WixBundlePackageTuple packageTuple, IntermediateTuple specificPackageTuple) + public PackageFacade(WixBundlePackageSymbol packageSymbol, IntermediateSymbol specificPackageSymbol) { - Debug.Assert(packageTuple.Id.Id == specificPackageTuple.Id.Id); + Debug.Assert(packageSymbol.Id.Id == specificPackageSymbol.Id.Id); - this.PackageTuple = packageTuple; - this.SpecificPackageTuple = specificPackageTuple; + this.PackageSymbol = packageSymbol; + this.SpecificPackageSymbol = specificPackageSymbol; } - public string PackageId => this.PackageTuple.Id.Id; + public string PackageId => this.PackageSymbol.Id.Id; - public WixBundlePackageTuple PackageTuple { get; } + public WixBundlePackageSymbol PackageSymbol { get; } - public IntermediateTuple SpecificPackageTuple { get; } + public IntermediateSymbol SpecificPackageSymbol { get; } } } diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs index 56254a06..8d8ea986 100644 --- a/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs @@ -4,20 +4,20 @@ namespace WixToolset.Core.Burn.Bundles { using System; using System.Collections.Generic; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; /// /// Initializes package state from the Exe contents. /// internal class ProcessExePackageCommand { - public ProcessExePackageCommand(PackageFacade facade, Dictionary payloadTuples) + public ProcessExePackageCommand(PackageFacade facade, Dictionary payloadSymbols) { - this.AuthoredPayloads = payloadTuples; + this.AuthoredPayloads = payloadSymbols; this.Facade = facade; } - public Dictionary AuthoredPayloads { get; } + public Dictionary AuthoredPayloads { get; } public PackageFacade Facade { get; } @@ -26,14 +26,14 @@ namespace WixToolset.Core.Burn.Bundles /// public void Execute() { - var packagePayload = this.AuthoredPayloads[this.Facade.PackageTuple.PayloadRef]; + var packagePayload = this.AuthoredPayloads[this.Facade.PackageSymbol.PayloadRef]; - if (String.IsNullOrEmpty(this.Facade.PackageTuple.CacheId)) + if (String.IsNullOrEmpty(this.Facade.PackageSymbol.CacheId)) { - this.Facade.PackageTuple.CacheId = packagePayload.Hash; + this.Facade.PackageSymbol.CacheId = packagePayload.Hash; } - this.Facade.PackageTuple.Version = packagePayload.Version; + this.Facade.PackageSymbol.Version = packagePayload.Version; } } } diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs index 0754fbc6..3eb97ee6 100644 --- a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs @@ -12,7 +12,7 @@ namespace WixToolset.Core.Burn.Bundles using WixToolset.Extensibility; using Dtf = WixToolset.Dtf.WindowsInstaller; using WixToolset.Extensibility.Services; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility.Data; @@ -23,7 +23,7 @@ namespace WixToolset.Core.Burn.Bundles { private const string PropertySqlFormat = "SELECT `Value` FROM `Property` WHERE `Property` = '{0}'"; - public ProcessMsiPackageCommand(IWixToolsetServiceProvider serviceProvider, IEnumerable backendExtensions, IntermediateSection section, PackageFacade facade, Dictionary payloadTuples) + public ProcessMsiPackageCommand(IWixToolsetServiceProvider serviceProvider, IEnumerable backendExtensions, IntermediateSection section, PackageFacade facade, Dictionary payloadSymbols) { this.Messaging = serviceProvider.GetService(); this.BackendHelper = serviceProvider.GetService(); @@ -31,7 +31,7 @@ namespace WixToolset.Core.Burn.Bundles this.BackendExtensions = backendExtensions; - this.AuthoredPayloads = payloadTuples; + this.AuthoredPayloads = payloadSymbols; this.Section = section; this.Facade = facade; } @@ -44,7 +44,7 @@ namespace WixToolset.Core.Burn.Bundles private IEnumerable BackendExtensions { get; } - private Dictionary AuthoredPayloads { get; } + private Dictionary AuthoredPayloads { get; } private PackageFacade Facade { get; } @@ -55,9 +55,9 @@ namespace WixToolset.Core.Burn.Bundles /// public void Execute() { - var packagePayload = this.AuthoredPayloads[this.Facade.PackageTuple.PayloadRef]; + var packagePayload = this.AuthoredPayloads[this.Facade.PackageSymbol.PayloadRef]; - var msiPackage = (WixBundleMsiPackageTuple)this.Facade.SpecificPackageTuple; + var msiPackage = (WixBundleMsiPackageSymbol)this.Facade.SpecificPackageSymbol; var sourcePath = packagePayload.SourceFile.Path; var longNamesInImage = false; @@ -82,8 +82,8 @@ namespace WixToolset.Core.Burn.Bundles var perMachine = (0 == (sumInfo.WordCount & 8)); var x64 = (sumInfo.Template.Contains("x64") || sumInfo.Template.Contains("Intel64")); - this.Facade.PackageTuple.PerMachine = perMachine ? YesNoDefaultType.Yes : YesNoDefaultType.No; - this.Facade.PackageTuple.Win64 = x64; + this.Facade.PackageSymbol.PerMachine = perMachine ? YesNoDefaultType.Yes : YesNoDefaultType.No; + this.Facade.PackageSymbol.Win64 = x64; } using (var db = new Dtf.Database(sourcePath)) @@ -111,33 +111,33 @@ namespace WixToolset.Core.Burn.Bundles if (!String.IsNullOrEmpty(version) && Common.IsValidModuleOrBundleVersion(version)) { - this.Messaging.Write(WarningMessages.VersionTruncated(this.Facade.PackageTuple.SourceLineNumbers, msiPackage.ProductVersion, sourcePath, version)); + this.Messaging.Write(WarningMessages.VersionTruncated(this.Facade.PackageSymbol.SourceLineNumbers, msiPackage.ProductVersion, sourcePath, version)); msiPackage.ProductVersion = version; } else { - this.Messaging.Write(ErrorMessages.InvalidProductVersion(this.Facade.PackageTuple.SourceLineNumbers, msiPackage.ProductVersion, sourcePath)); + this.Messaging.Write(ErrorMessages.InvalidProductVersion(this.Facade.PackageSymbol.SourceLineNumbers, msiPackage.ProductVersion, sourcePath)); } } - if (String.IsNullOrEmpty(this.Facade.PackageTuple.CacheId)) + if (String.IsNullOrEmpty(this.Facade.PackageSymbol.CacheId)) { - this.Facade.PackageTuple.CacheId = String.Format("{0}v{1}", msiPackage.ProductCode, msiPackage.ProductVersion); + this.Facade.PackageSymbol.CacheId = String.Format("{0}v{1}", msiPackage.ProductCode, msiPackage.ProductVersion); } - if (String.IsNullOrEmpty(this.Facade.PackageTuple.DisplayName)) + if (String.IsNullOrEmpty(this.Facade.PackageSymbol.DisplayName)) { - this.Facade.PackageTuple.DisplayName = ProcessMsiPackageCommand.GetProperty(db, "ProductName"); + this.Facade.PackageSymbol.DisplayName = ProcessMsiPackageCommand.GetProperty(db, "ProductName"); } - if (String.IsNullOrEmpty(this.Facade.PackageTuple.Description)) + if (String.IsNullOrEmpty(this.Facade.PackageSymbol.Description)) { - this.Facade.PackageTuple.Description = ProcessMsiPackageCommand.GetProperty(db, "ARPCOMMENTS"); + this.Facade.PackageSymbol.Description = ProcessMsiPackageCommand.GetProperty(db, "ARPCOMMENTS"); } - if (String.IsNullOrEmpty(this.Facade.PackageTuple.Version)) + if (String.IsNullOrEmpty(this.Facade.PackageSymbol.Version)) { - this.Facade.PackageTuple.Version = msiPackage.ProductVersion; + this.Facade.PackageSymbol.Version = msiPackage.ProductVersion; } var payloadNames = this.GetPayloadTargetNames(packagePayload.Id.Id); @@ -168,7 +168,7 @@ namespace WixToolset.Core.Burn.Bundles // Add all external files as package payloads and calculate the total install size as the rollup of // File table's sizes. - this.Facade.PackageTuple.InstallSize = this.ImportExternalFileAsPayloadsAndReturnInstallSize(db, packagePayload, longNamesInImage, compressed, payloadNames); + this.Facade.PackageSymbol.InstallSize = this.ImportExternalFileAsPayloadsAndReturnInstallSize(db, packagePayload, longNamesInImage, compressed, payloadNames); // Add all dependency providers from the MSI. this.ImportDependencyProviders(msiPackage, db); @@ -176,13 +176,13 @@ namespace WixToolset.Core.Burn.Bundles } catch (Dtf.InstallerException e) { - this.Messaging.Write(ErrorMessages.UnableToReadPackageInformation(this.Facade.PackageTuple.SourceLineNumbers, sourcePath, e.Message)); + this.Messaging.Write(ErrorMessages.UnableToReadPackageInformation(this.Facade.PackageSymbol.SourceLineNumbers, sourcePath, e.Message)); } } private ISet GetPayloadTargetNames(string packageId) { - var payloadNames = this.Section.Tuples.OfType() + var payloadNames = this.Section.Symbols.OfType() .Where(p => p.PackageRef == packageId) .Select(p => p.Name); @@ -191,21 +191,21 @@ namespace WixToolset.Core.Burn.Bundles private ISet GetMsiPropertyNames(string packageId) { - var properties = this.Section.Tuples.OfType() + var properties = this.Section.Symbols.OfType() .Where(p => p.Id.Id == packageId) .Select(p => p.Name); return new HashSet(properties, StringComparer.Ordinal); } - private void SetPerMachineAppropriately(Dtf.Database db, WixBundleMsiPackageTuple msiPackage, string sourcePath) + private void SetPerMachineAppropriately(Dtf.Database db, WixBundleMsiPackageSymbol msiPackage, string sourcePath) { if (msiPackage.ForcePerMachine) { - if (YesNoDefaultType.No == this.Facade.PackageTuple.PerMachine) + if (YesNoDefaultType.No == this.Facade.PackageSymbol.PerMachine) { - this.Messaging.Write(WarningMessages.PerUserButForcingPerMachine(this.Facade.PackageTuple.SourceLineNumbers, sourcePath)); - this.Facade.PackageTuple.PerMachine = YesNoDefaultType.Yes; // ensure that we think the package is per-machine. + this.Messaging.Write(WarningMessages.PerUserButForcingPerMachine(this.Facade.PackageSymbol.SourceLineNumbers, sourcePath)); + this.Facade.PackageSymbol.PerMachine = YesNoDefaultType.Yes; // ensure that we think the package is per-machine. } // Force ALLUSERS=1 via the MSI command-line. @@ -218,34 +218,34 @@ namespace WixToolset.Core.Burn.Bundles if (String.IsNullOrEmpty(allusers)) { // Not forced per-machine and no ALLUSERS property, flip back to per-user. - if (YesNoDefaultType.Yes == this.Facade.PackageTuple.PerMachine) + if (YesNoDefaultType.Yes == this.Facade.PackageSymbol.PerMachine) { - this.Messaging.Write(WarningMessages.ImplicitlyPerUser(this.Facade.PackageTuple.SourceLineNumbers, sourcePath)); - this.Facade.PackageTuple.PerMachine = YesNoDefaultType.No; + this.Messaging.Write(WarningMessages.ImplicitlyPerUser(this.Facade.PackageSymbol.SourceLineNumbers, sourcePath)); + this.Facade.PackageSymbol.PerMachine = YesNoDefaultType.No; } } else if (allusers.Equals("1", StringComparison.Ordinal)) { - if (YesNoDefaultType.No == this.Facade.PackageTuple.PerMachine) + if (YesNoDefaultType.No == this.Facade.PackageSymbol.PerMachine) { - this.Messaging.Write(ErrorMessages.PerUserButAllUsersEquals1(this.Facade.PackageTuple.SourceLineNumbers, sourcePath)); + this.Messaging.Write(ErrorMessages.PerUserButAllUsersEquals1(this.Facade.PackageSymbol.SourceLineNumbers, sourcePath)); } } else if (allusers.Equals("2", StringComparison.Ordinal)) { - this.Messaging.Write(WarningMessages.DiscouragedAllUsersValue(this.Facade.PackageTuple.SourceLineNumbers, sourcePath, (YesNoDefaultType.Yes == this.Facade.PackageTuple.PerMachine) ? "machine" : "user")); + this.Messaging.Write(WarningMessages.DiscouragedAllUsersValue(this.Facade.PackageSymbol.SourceLineNumbers, sourcePath, (YesNoDefaultType.Yes == this.Facade.PackageSymbol.PerMachine) ? "machine" : "user")); } else { - this.Messaging.Write(ErrorMessages.UnsupportedAllUsersValue(this.Facade.PackageTuple.SourceLineNumbers, sourcePath, allusers)); + this.Messaging.Write(ErrorMessages.UnsupportedAllUsersValue(this.Facade.PackageSymbol.SourceLineNumbers, sourcePath, allusers)); } } } - private void SetPackageVisibility(Dtf.Database db, WixBundleMsiPackageTuple msiPackage, ISet msiPropertyNames) + private void SetPackageVisibility(Dtf.Database db, WixBundleMsiPackageSymbol msiPackage, ISet msiPropertyNames) { var alreadyVisible = !ProcessMsiPackageCommand.HasProperty(db, "ARPSYSTEMCOMPONENT"); - var visible = (this.Facade.PackageTuple.Attributes & WixBundlePackageAttributes.Visible) == WixBundlePackageAttributes.Visible; + var visible = (this.Facade.PackageSymbol.Attributes & WixBundlePackageAttributes.Visible) == WixBundlePackageAttributes.Visible; // If not already set to the correct visibility. if (alreadyVisible != visible) @@ -283,7 +283,7 @@ namespace WixToolset.Core.Burn.Bundles attributes |= (recordAttributes & WindowsInstallerConstants.MsidbUpgradeAttributesVersionMaxInclusive) == WindowsInstallerConstants.MsidbUpgradeAttributesVersionMaxInclusive ? WixBundleRelatedPackageAttributes.MaxInclusive : 0; attributes |= (recordAttributes & WindowsInstallerConstants.MsidbUpgradeAttributesLanguagesExclusive) == WindowsInstallerConstants.MsidbUpgradeAttributesLanguagesExclusive ? WixBundleRelatedPackageAttributes.LangInclusive : 0; - this.Section.AddTuple(new WixBundleRelatedPackageTuple(this.Facade.PackageTuple.SourceLineNumbers) + this.Section.AddSymbol(new WixBundleRelatedPackageSymbol(this.Facade.PackageSymbol.SourceLineNumbers) { PackageRef = this.Facade.PackageId, RelatedId = record.GetString(1), @@ -358,7 +358,7 @@ namespace WixToolset.Core.Burn.Bundles } } - this.Section.AddTuple(new WixBundleMsiFeatureTuple(this.Facade.PackageTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, this.Facade.PackageId, featureName)) + this.Section.AddSymbol(new WixBundleMsiFeatureSymbol(this.Facade.PackageSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, this.Facade.PackageId, featureName)) { PackageRef = this.Facade.PackageId, Name = featureName, @@ -379,7 +379,7 @@ namespace WixToolset.Core.Burn.Bundles } } - private void ImportExternalCabinetAsPayloads(Dtf.Database db, WixBundlePayloadTuple packagePayload, ISet payloadNames) + private void ImportExternalCabinetAsPayloads(Dtf.Database db, WixBundlePayloadSymbol packagePayload, ISet payloadNames) { if (db.Tables.Contains("Media")) { @@ -395,9 +395,9 @@ namespace WixToolset.Core.Burn.Bundles if (!payloadNames.Contains(cabinetName)) { var generatedId = Common.GenerateIdentifier("cab", packagePayload.Id.Id, cabinet); - var payloadSourceFile = this.ResolveRelatedFile(packagePayload.SourceFile.Path, packagePayload.UnresolvedSourceFile, cabinet, "Cabinet", this.Facade.PackageTuple.SourceLineNumbers, BindStage.Normal); + var payloadSourceFile = this.ResolveRelatedFile(packagePayload.SourceFile.Path, packagePayload.UnresolvedSourceFile, cabinet, "Cabinet", this.Facade.PackageSymbol.SourceLineNumbers, BindStage.Normal); - this.Section.AddTuple(new WixBundlePayloadTuple(this.Facade.PackageTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId)) + this.Section.AddSymbol(new WixBundlePayloadSymbol(this.Facade.PackageSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId)) { Name = cabinetName, SourceFile = new IntermediateFieldPathValue { Path = payloadSourceFile }, @@ -416,7 +416,7 @@ namespace WixToolset.Core.Burn.Bundles } } - private long ImportExternalFileAsPayloadsAndReturnInstallSize(Dtf.Database db, WixBundlePayloadTuple packagePayload, bool longNamesInImage, bool compressed, ISet payloadNames) + private long ImportExternalFileAsPayloadsAndReturnInstallSize(Dtf.Database db, WixBundlePayloadSymbol packagePayload, bool longNamesInImage, bool compressed, ISet payloadNames) { long size = 0; @@ -473,9 +473,9 @@ namespace WixToolset.Core.Burn.Bundles if (!payloadNames.Contains(name)) { var generatedId = Common.GenerateIdentifier("f", packagePayload.Id.Id, record.GetString(2)); - var payloadSourceFile = this.ResolveRelatedFile(packagePayload.SourceFile.Path, packagePayload.UnresolvedSourceFile, fileSourcePath, "File", this.Facade.PackageTuple.SourceLineNumbers, BindStage.Normal); + var payloadSourceFile = this.ResolveRelatedFile(packagePayload.SourceFile.Path, packagePayload.UnresolvedSourceFile, fileSourcePath, "File", this.Facade.PackageSymbol.SourceLineNumbers, BindStage.Normal); - this.Section.AddTuple(new WixBundlePayloadTuple(this.Facade.PackageTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId)) + this.Section.AddSymbol(new WixBundlePayloadSymbol(this.Facade.PackageSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId)) { Name = name, SourceFile = new IntermediateFieldPathValue { Path = payloadSourceFile }, @@ -500,9 +500,9 @@ namespace WixToolset.Core.Burn.Bundles return size; } - private void AddMsiProperty(WixBundleMsiPackageTuple msiPackage, string name, string value) + private void AddMsiProperty(WixBundleMsiPackageSymbol msiPackage, string name, string value) { - this.Section.AddTuple(new WixBundleMsiPropertyTuple(msiPackage.SourceLineNumbers, new Identifier(AccessModifier.Private, msiPackage.Id.Id, name)) + this.Section.AddSymbol(new WixBundleMsiPropertySymbol(msiPackage.SourceLineNumbers, new Identifier(AccessModifier.Private, msiPackage.Id.Id, name)) { PackageRef = msiPackage.Id.Id, Name = name, @@ -510,7 +510,7 @@ namespace WixToolset.Core.Burn.Bundles }); } - private void ImportDependencyProviders(WixBundleMsiPackageTuple msiPackage, Dtf.Database db) + private void ImportDependencyProviders(WixBundleMsiPackageSymbol msiPackage, Dtf.Database db) { if (db.Tables.Contains("WixDependencyProvider")) { @@ -529,12 +529,12 @@ namespace WixToolset.Core.Burn.Bundles } // Import the provider key and attributes. - this.Section.AddTuple(new ProvidesDependencyTuple(msiPackage.SourceLineNumbers) + this.Section.AddSymbol(new ProvidesDependencySymbol(msiPackage.SourceLineNumbers) { PackageRef = msiPackage.Id.Id, Key = record.GetString(1), Version = record.GetString(2) ?? msiPackage.ProductVersion, - DisplayName = record.GetString(3) ?? this.Facade.PackageTuple.DisplayName, + DisplayName = record.GetString(3) ?? this.Facade.PackageSymbol.DisplayName, Attributes = record.GetInteger(4), Imported = true }); diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs index 5acffe33..f528ce20 100644 --- a/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs @@ -10,7 +10,7 @@ namespace WixToolset.Core.Burn.Bundles using System.Text; using System.Xml; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Services; using Dtf = WixToolset.Dtf.WindowsInstaller; @@ -22,18 +22,18 @@ namespace WixToolset.Core.Burn.Bundles private const string PatchMetadataFormat = "SELECT `Value` FROM `MsiPatchMetadata` WHERE `Property` = '{0}'"; private static readonly Encoding XmlOutputEncoding = new UTF8Encoding(false); - public ProcessMspPackageCommand(IMessaging messaging, IntermediateSection section, PackageFacade facade, Dictionary payloadTuples) + public ProcessMspPackageCommand(IMessaging messaging, IntermediateSection section, PackageFacade facade, Dictionary payloadSymbols) { this.Messaging = messaging; - this.AuthoredPayloads = payloadTuples; + this.AuthoredPayloads = payloadSymbols; this.Section = section; this.Facade = facade; } public IMessaging Messaging { get; } - public Dictionary AuthoredPayloads { private get; set; } + public Dictionary AuthoredPayloads { private get; set; } public PackageFacade Facade { private get; set; } @@ -44,9 +44,9 @@ namespace WixToolset.Core.Burn.Bundles /// public void Execute() { - var packagePayload = this.AuthoredPayloads[this.Facade.PackageTuple.PayloadRef]; + var packagePayload = this.AuthoredPayloads[this.Facade.PackageSymbol.PayloadRef]; - var mspPackage = (WixBundleMspPackageTuple)this.Facade.SpecificPackageTuple; + var mspPackage = (WixBundleMspPackageSymbol)this.Facade.SpecificPackageSymbol; var sourcePath = packagePayload.SourceFile.Path; @@ -60,14 +60,14 @@ namespace WixToolset.Core.Burn.Bundles using (var db = new Dtf.Database(sourcePath)) { - if (String.IsNullOrEmpty(this.Facade.PackageTuple.DisplayName)) + if (String.IsNullOrEmpty(this.Facade.PackageSymbol.DisplayName)) { - this.Facade.PackageTuple.DisplayName = ProcessMspPackageCommand.GetPatchMetadataProperty(db, "DisplayName"); + this.Facade.PackageSymbol.DisplayName = ProcessMspPackageCommand.GetPatchMetadataProperty(db, "DisplayName"); } - if (String.IsNullOrEmpty(this.Facade.PackageTuple.Description)) + if (String.IsNullOrEmpty(this.Facade.PackageSymbol.Description)) { - this.Facade.PackageTuple.Description = ProcessMspPackageCommand.GetPatchMetadataProperty(db, "Description"); + this.Facade.PackageSymbol.Description = ProcessMspPackageCommand.GetPatchMetadataProperty(db, "Description"); } mspPackage.Manufacturer = ProcessMspPackageCommand.GetPatchMetadataProperty(db, "ManufacturerName"); @@ -81,13 +81,13 @@ namespace WixToolset.Core.Burn.Bundles return; } - if (String.IsNullOrEmpty(this.Facade.PackageTuple.CacheId)) + if (String.IsNullOrEmpty(this.Facade.PackageSymbol.CacheId)) { - this.Facade.PackageTuple.CacheId = mspPackage.PatchCode; + this.Facade.PackageSymbol.CacheId = mspPackage.PatchCode; } } - private void ProcessPatchXml(WixBundlePayloadTuple packagePayload, WixBundleMspPackageTuple mspPackage, string sourcePath) + private void ProcessPatchXml(WixBundlePayloadSymbol packagePayload, WixBundleMspPackageSymbol mspPackage, string sourcePath) { var uniqueTargetCodes = new HashSet(); @@ -127,7 +127,7 @@ namespace WixToolset.Core.Burn.Bundles if (uniqueTargetCodes.Add(targetCode)) { - this.Section.AddTuple(new WixBundlePatchTargetCodeTuple(packagePayload.SourceLineNumbers) + this.Section.AddSymbol(new WixBundlePatchTargetCodeSymbol(packagePayload.SourceLineNumbers) { PackageRef = packagePayload.Id.Id, TargetCode = targetCode, diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs index 6a39f42f..af4ab3a8 100644 --- a/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs @@ -5,33 +5,33 @@ namespace WixToolset.Core.Burn.Bundles using System; using System.Collections.Generic; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; /// /// Processes the Msu packages to add properties and payloads from the Msu packages. /// internal class ProcessMsuPackageCommand { - public ProcessMsuPackageCommand(PackageFacade facade, Dictionary payloadTuples) + public ProcessMsuPackageCommand(PackageFacade facade, Dictionary payloadSymbols) { - this.AuthoredPayloads = payloadTuples; + this.AuthoredPayloads = payloadSymbols; this.Facade = facade; } - public Dictionary AuthoredPayloads { private get; set; } + public Dictionary AuthoredPayloads { private get; set; } public PackageFacade Facade { private get; set; } public void Execute() { - var packagePayload = this.AuthoredPayloads[this.Facade.PackageTuple.PayloadRef]; + var packagePayload = this.AuthoredPayloads[this.Facade.PackageSymbol.PayloadRef]; - if (String.IsNullOrEmpty(this.Facade.PackageTuple.CacheId)) + if (String.IsNullOrEmpty(this.Facade.PackageSymbol.CacheId)) { - this.Facade.PackageTuple.CacheId = packagePayload.Hash; + this.Facade.PackageSymbol.CacheId = packagePayload.Hash; } - this.Facade.PackageTuple.PerMachine = YesNoDefaultType.Yes; // MSUs are always per-machine. + this.Facade.PackageSymbol.PerMachine = YesNoDefaultType.Yes; // MSUs are always per-machine. } } } diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs index 7f3a2501..475b04b8 100644 --- a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs @@ -11,7 +11,7 @@ namespace WixToolset.Core.Burn.Bundles using System.Text; using WixToolset.Data; using WixToolset.Data.Burn; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; @@ -19,7 +19,7 @@ namespace WixToolset.Core.Burn.Bundles { private static readonly Version EmptyVersion = new Version(0, 0, 0, 0); - public ProcessPayloadsCommand(IWixToolsetServiceProvider serviceProvider, IBackendHelper backendHelper, IEnumerable payloads, PackagingType defaultPackaging, string layoutDirectory) + public ProcessPayloadsCommand(IWixToolsetServiceProvider serviceProvider, IBackendHelper backendHelper, IEnumerable payloads, PackagingType defaultPackaging, string layoutDirectory) { this.Messaging = serviceProvider.GetService(); @@ -37,7 +37,7 @@ namespace WixToolset.Core.Burn.Bundles private IBackendHelper BackendHelper { get; } - private IEnumerable Payloads { get; } + private IEnumerable Payloads { get; } private PackagingType DefaultPackaging { get; } @@ -92,7 +92,7 @@ namespace WixToolset.Core.Burn.Bundles this.TrackedFiles = trackedFiles; } - private void UpdatePayloadPackagingType(WixBundlePayloadTuple payload) + private void UpdatePayloadPackagingType(WixBundlePayloadSymbol payload) { if (!payload.Packaging.HasValue || PackagingType.Unknown == payload.Packaging) { @@ -118,7 +118,7 @@ namespace WixToolset.Core.Burn.Bundles } } - private void UpdatePayloadFileInformation(WixBundlePayloadTuple payload, IntermediateFieldPathValue sourceFile) + private void UpdatePayloadFileInformation(WixBundlePayloadSymbol payload, IntermediateFieldPathValue sourceFile) { var fileInfo = new FileInfo(sourceFile.Path); @@ -165,7 +165,7 @@ namespace WixToolset.Core.Burn.Bundles } } - private void UpdatePayloadVersionInformation(WixBundlePayloadTuple payload, IntermediateFieldPathValue sourceFile) + private void UpdatePayloadVersionInformation(WixBundlePayloadSymbol payload, IntermediateFieldPathValue sourceFile) { var versionInfo = FileVersionInfo.GetVersionInfo(sourceFile.Path); diff --git a/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs b/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs index 2b17f985..e7c97ea7 100644 --- a/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs @@ -9,12 +9,12 @@ namespace WixToolset.Core.Burn.Bundles using System.Runtime.InteropServices; using System.Text; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Services; internal class VerifyPayloadsWithCatalogCommand { - public VerifyPayloadsWithCatalogCommand(IMessaging messaging, IEnumerable catalogs, IEnumerable payloads) + public VerifyPayloadsWithCatalogCommand(IMessaging messaging, IEnumerable catalogs, IEnumerable payloads) { this.Messaging = messaging; this.Catalogs = catalogs; @@ -23,9 +23,9 @@ namespace WixToolset.Core.Burn.Bundles private IMessaging Messaging { get; } - private IEnumerable Catalogs { get; } + private IEnumerable Catalogs { get; } - private IEnumerable Payloads { get; } + private IEnumerable Payloads { get; } public void Execute() { diff --git a/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs b/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs index 10ac9931..7d3acff9 100644 --- a/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs +++ b/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs @@ -24,9 +24,9 @@ namespace WixToolset.Core.Burn.ExtensibilityServices this.BootstrapperApplicationManifestData.AddXml(xml); } - public void AddBootstrapperApplicationData(IntermediateTuple tuple, bool tupleIdIsIdAttribute = false) + public void AddBootstrapperApplicationData(IntermediateSymbol symbol, bool symbolIdIsIdAttribute = false) { - this.BootstrapperApplicationManifestData.AddTuple(tuple, tupleIdIsIdAttribute, BurnCommon.BADataNamespace); + this.BootstrapperApplicationManifestData.AddSymbol(symbol, symbolIdIsIdAttribute, BurnCommon.BADataNamespace); } public void AddBundleExtensionData(string extensionId, string xml) @@ -35,10 +35,10 @@ namespace WixToolset.Core.Burn.ExtensibilityServices manifestData.AddXml(xml); } - public void AddBundleExtensionData(string extensionId, IntermediateTuple tuple, bool tupleIdIsIdAttribute = false) + public void AddBundleExtensionData(string extensionId, IntermediateSymbol symbol, bool symbolIdIsIdAttribute = false) { var manifestData = this.GetBundleExtensionManifestData(extensionId); - manifestData.AddTuple(tuple, tupleIdIsIdAttribute, BurnCommon.BundleExtensionDataNamespace); + manifestData.AddSymbol(symbol, symbolIdIsIdAttribute, BurnCommon.BundleExtensionDataNamespace); } public void WriteBootstrapperApplicationData(XmlWriter writer) @@ -90,21 +90,21 @@ namespace WixToolset.Core.Burn.ExtensibilityServices private StringBuilder Builder { get; } - public void AddTuple(IntermediateTuple tuple, bool tupleIdIsIdAttribute, string ns) + public void AddSymbol(IntermediateSymbol symbol, bool symbolIdIsIdAttribute, string ns) { // There might be a more efficient way to do this, // but this is an easy way to ensure we're creating valid XML. var sb = new StringBuilder(); using (var writer = XmlWriter.Create(sb, WriterSettings)) { - writer.WriteStartElement(tuple.Definition.Name, ns); + writer.WriteStartElement(symbol.Definition.Name, ns); - if (tupleIdIsIdAttribute && tuple.Id != null) + if (symbolIdIsIdAttribute && symbol.Id != null) { - writer.WriteAttributeString("Id", tuple.Id.Id); + writer.WriteAttributeString("Id", symbol.Id.Id); } - foreach (var field in tuple.Fields) + foreach (var field in symbol.Fields) { if (!field.IsNull()) { diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AddBackSuppressedSequenceTablesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AddBackSuppressedSequenceTablesCommand.cs index d83e3684..cbba6030 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/AddBackSuppressedSequenceTablesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/AddBackSuppressedSequenceTablesCommand.cs @@ -4,7 +4,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind { using System; using System.Collections.Generic; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; /// diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AddCreateFoldersCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AddCreateFoldersCommand.cs index ba844da4..c4fddb3e 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/AddCreateFoldersCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/AddCreateFoldersCommand.cs @@ -5,10 +5,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Collections.Generic; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; /// - /// Add CreateFolder tuples, if not already present, for null-keypath components. + /// Add CreateFolder symbols, if not already present, for null-keypath components. /// internal class AddCreateFoldersCommand { @@ -21,15 +21,15 @@ namespace WixToolset.Core.WindowsInstaller.Bind public void Execute() { - var createFolderTuplesByComponentRef = new HashSet(this.Section.Tuples.OfType().Select(t => t.ComponentRef)); - foreach (var componentTuple in this.Section.Tuples.OfType().Where(t => t.KeyPathType == ComponentKeyPathType.Directory).ToList()) + var createFolderSymbolsByComponentRef = new HashSet(this.Section.Symbols.OfType().Select(t => t.ComponentRef)); + foreach (var componentSymbol in this.Section.Symbols.OfType().Where(t => t.KeyPathType == ComponentKeyPathType.Directory).ToList()) { - if (!createFolderTuplesByComponentRef.Contains(componentTuple.Id.Id)) + if (!createFolderSymbolsByComponentRef.Contains(componentSymbol.Id.Id)) { - this.Section.AddTuple(new CreateFolderTuple(componentTuple.SourceLineNumbers) + this.Section.AddSymbol(new CreateFolderSymbol(componentSymbol.SourceLineNumbers) { - DirectoryRef = componentTuple.DirectoryRef, - ComponentRef = componentTuple.Id.Id, + DirectoryRef = componentSymbol.DirectoryRef, + ComponentRef = componentSymbol.Id.Id, }); } } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs index 773b3225..eccc97d2 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs @@ -8,7 +8,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Linq; using WixToolset.Core.Bind; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Services; /// @@ -40,7 +40,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// /// Gets cabinets with their file rows. /// - public Dictionary> FileFacadesByCabinetMedia { get; private set; } + public Dictionary> FileFacadesByCabinetMedia { get; private set; } /// /// Get uncompressed file rows. This will contain file rows of File elements that are marked with compression=no. @@ -50,49 +50,49 @@ namespace WixToolset.Core.WindowsInstaller.Bind public void Execute() { - var mediaTuples = this.Section.Tuples.OfType().ToList(); - var mediaTemplateTuples = this.Section.Tuples.OfType().ToList(); + var mediaSymbols = this.Section.Symbols.OfType().ToList(); + var mediaTemplateSymbols = this.Section.Symbols.OfType().ToList(); - // If both tuples are authored, it is an error. - if (mediaTemplateTuples.Count > 0 && mediaTuples.Count > 1) + // If both symbols are authored, it is an error. + if (mediaTemplateSymbols.Count > 0 && mediaSymbols.Count > 1) { throw new WixException(ErrorMessages.MediaTableCollision(null)); } - // If neither tuple is authored, default to a media template. - if (SectionType.Product == this.Section.Type && mediaTemplateTuples.Count == 0 && mediaTuples.Count == 0) + // If neither symbol is authored, default to a media template. + if (SectionType.Product == this.Section.Type && mediaTemplateSymbols.Count == 0 && mediaSymbols.Count == 0) { - var mediaTemplate = new WixMediaTemplateTuple() + var mediaTemplate = new WixMediaTemplateSymbol() { CabinetTemplate = "cab{0}.cab", }; - this.Section.AddTuple(mediaTemplate); - mediaTemplateTuples.Add(mediaTemplate); + this.Section.AddSymbol(mediaTemplate); + mediaTemplateSymbols.Add(mediaTemplate); } // When building merge module, all the files go to "#MergeModule.CABinet". if (SectionType.Module == this.Section.Type) { - var mergeModuleMediaTuple = this.Section.AddTuple(new MediaTuple + var mergeModuleMediaSymbol = this.Section.AddSymbol(new MediaSymbol { Cabinet = "#MergeModule.CABinet", }); - this.FileFacadesByCabinetMedia = new Dictionary> + this.FileFacadesByCabinetMedia = new Dictionary> { - { mergeModuleMediaTuple, this.FileFacades } + { mergeModuleMediaSymbol, this.FileFacades } }; this.UncompressedFileFacades = Array.Empty(); } - else if (mediaTemplateTuples.Count == 0) + else if (mediaTemplateSymbols.Count == 0) { - var filesByCabinetMedia = new Dictionary>(); + var filesByCabinetMedia = new Dictionary>(); var uncompressedFiles = new List(); - this.ManuallyAssignFiles(mediaTuples, filesByCabinetMedia, uncompressedFiles); + this.ManuallyAssignFiles(mediaSymbols, filesByCabinetMedia, uncompressedFiles); this.FileFacadesByCabinetMedia = filesByCabinetMedia.ToDictionary(kvp => kvp.Key, kvp => (IEnumerable)kvp.Value); @@ -100,11 +100,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind } else { - var filesByCabinetMedia = new Dictionary>(); + var filesByCabinetMedia = new Dictionary>(); var uncompressedFiles = new List(); - this.AutoAssignFiles(mediaTuples, filesByCabinetMedia, uncompressedFiles); + this.AutoAssignFiles(mediaSymbols, filesByCabinetMedia, uncompressedFiles); this.FileFacadesByCabinetMedia = filesByCabinetMedia.ToDictionary(kvp => kvp.Key, kvp => (IEnumerable)kvp.Value); @@ -116,7 +116,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// Assign files to cabinets based on MediaTemplate authoring. /// /// FileRowCollection - private void AutoAssignFiles(List mediaTable, Dictionary> filesByCabinetMedia, List uncompressedFiles) + private void AutoAssignFiles(List mediaTable, Dictionary> filesByCabinetMedia, List uncompressedFiles) { const int MaxCabIndex = 999; @@ -125,15 +125,15 @@ namespace WixToolset.Core.WindowsInstaller.Bind var maxPreCabSizeInMB = 0; var currentCabIndex = 0; - MediaTuple currentMediaRow = null; + MediaSymbol currentMediaRow = null; - var mediaTemplateTable = this.Section.Tuples.OfType(); + var mediaTemplateTable = this.Section.Symbols.OfType(); - // Remove all previous media tuples since they will be replaced with + // Remove all previous media symbols since they will be replaced with // media template. - foreach (var mediaTuple in mediaTable) + foreach (var mediaSymbol in mediaTable) { - this.Section.Tuples.Remove(mediaTuple); + this.Section.Symbols.Remove(mediaSymbol); } // Auto assign files to cabinets based on maximum uncompressed media size @@ -169,7 +169,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind throw new WixException(ErrorMessages.MaximumUncompressedMediaSizeTooLarge(null, maxPreCabSizeInMB)); } - var mediaTuplesByDiskId = new Dictionary(); + var mediaSymbolsByDiskId = new Dictionary(); foreach (var facade in this.FileFacades) { @@ -193,8 +193,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind // Overflow due to current file if (currentPreCabSize > maxPreCabSizeInBytes) { - currentMediaRow = this.AddMediaTuple(mediaTemplateRow, ++currentCabIndex); - mediaTuplesByDiskId.Add(currentMediaRow.DiskId, currentMediaRow); + currentMediaRow = this.AddMediaSymbol(mediaTemplateRow, ++currentCabIndex); + mediaSymbolsByDiskId.Add(currentMediaRow.DiskId, currentMediaRow); filesByCabinetMedia.Add(currentMediaRow, new List()); // Now files larger than MaxUncompressedMediaSize will be the only file in its cabinet so as to respect MaxUncompressedMediaSize @@ -205,8 +205,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (currentMediaRow == null) { // Create new cab and MediaRow - currentMediaRow = this.AddMediaTuple(mediaTemplateRow, ++currentCabIndex); - mediaTuplesByDiskId.Add(currentMediaRow.DiskId, currentMediaRow); + currentMediaRow = this.AddMediaSymbol(mediaTemplateRow, ++currentCabIndex); + mediaSymbolsByDiskId.Add(currentMediaRow.DiskId, currentMediaRow); filesByCabinetMedia.Add(currentMediaRow, new List()); } } @@ -219,52 +219,52 @@ namespace WixToolset.Core.WindowsInstaller.Bind } // If there are uncompressed files and no MediaRow, create a default one. - if (uncompressedFiles.Count > 0 && !this.Section.Tuples.OfType().Any()) + if (uncompressedFiles.Count > 0 && !this.Section.Symbols.OfType().Any()) { - var defaultMediaRow = this.Section.AddTuple(new MediaTuple(null, new Identifier(AccessModifier.Private, 1)) + var defaultMediaRow = this.Section.AddSymbol(new MediaSymbol(null, new Identifier(AccessModifier.Private, 1)) { DiskId = 1, }); - mediaTuplesByDiskId.Add(1, defaultMediaRow); + mediaSymbolsByDiskId.Add(1, defaultMediaRow); } } /// /// Assign files to cabinets based on Media authoring. /// - private void ManuallyAssignFiles(List mediaTuples, Dictionary> filesByCabinetMedia, List uncompressedFiles) + private void ManuallyAssignFiles(List mediaSymbols, Dictionary> filesByCabinetMedia, List uncompressedFiles) { - var mediaTuplesByDiskId = new Dictionary(); + var mediaSymbolsByDiskId = new Dictionary(); - if (mediaTuples.Any()) + if (mediaSymbols.Any()) { - var cabinetMediaTuples = new Dictionary(StringComparer.OrdinalIgnoreCase); - foreach (var mediaTuple in mediaTuples) + var cabinetMediaSymbols = new Dictionary(StringComparer.OrdinalIgnoreCase); + foreach (var mediaSymbol in mediaSymbols) { // If the Media row has a cabinet, make sure it is unique across all Media rows. - if (!String.IsNullOrEmpty(mediaTuple.Cabinet)) + if (!String.IsNullOrEmpty(mediaSymbol.Cabinet)) { - if (cabinetMediaTuples.TryGetValue(mediaTuple.Cabinet, out var existingRow)) + if (cabinetMediaSymbols.TryGetValue(mediaSymbol.Cabinet, out var existingRow)) { - this.Messaging.Write(ErrorMessages.DuplicateCabinetName(mediaTuple.SourceLineNumbers, mediaTuple.Cabinet)); + this.Messaging.Write(ErrorMessages.DuplicateCabinetName(mediaSymbol.SourceLineNumbers, mediaSymbol.Cabinet)); this.Messaging.Write(ErrorMessages.DuplicateCabinetName2(existingRow.SourceLineNumbers, existingRow.Cabinet)); } else { - cabinetMediaTuples.Add(mediaTuple.Cabinet, mediaTuple); + cabinetMediaSymbols.Add(mediaSymbol.Cabinet, mediaSymbol); } - filesByCabinetMedia.Add(mediaTuple, new List()); + filesByCabinetMedia.Add(mediaSymbol, new List()); } - mediaTuplesByDiskId.Add(mediaTuple.DiskId, mediaTuple); + mediaSymbolsByDiskId.Add(mediaSymbol.DiskId, mediaSymbol); } } foreach (var facade in this.FileFacades) { - if (!mediaTuplesByDiskId.TryGetValue(facade.DiskId, out var mediaTuple)) + if (!mediaSymbolsByDiskId.TryGetValue(facade.DiskId, out var mediaSymbol)) { this.Messaging.Write(ErrorMessages.MissingMedia(facade.SourceLineNumber, facade.DiskId)); continue; @@ -280,7 +280,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } else // file is marked compressed. { - if (filesByCabinetMedia.TryGetValue(mediaTuple, out var cabinetFiles)) + if (filesByCabinetMedia.TryGetValue(mediaSymbol, out var cabinetFiles)) { cabinetFiles.Add(facade); } @@ -293,18 +293,18 @@ namespace WixToolset.Core.WindowsInstaller.Bind } /// - /// Adds a tuple to the section with cab name template filled in. + /// Adds a symbol to the section with cab name template filled in. /// /// /// /// - private MediaTuple AddMediaTuple(WixMediaTemplateTuple mediaTemplateTuple, int cabIndex) + private MediaSymbol AddMediaSymbol(WixMediaTemplateSymbol mediaTemplateSymbol, int cabIndex) { - return this.Section.AddTuple(new MediaTuple(mediaTemplateTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, cabIndex)) + return this.Section.AddSymbol(new MediaSymbol(mediaTemplateSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, cabIndex)) { DiskId = cabIndex, Cabinet = String.Format(CultureInfo.InvariantCulture, this.CabinetNameTemplate, cabIndex), - CompressionLevel = mediaTemplateTuple.CompressionLevel, + CompressionLevel = mediaTemplateSymbol.CompressionLevel, }); } } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs index a16bafd7..51f1f81a 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs @@ -9,7 +9,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Text.RegularExpressions; using WixToolset.Core.WindowsInstaller.Msi; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Data.WindowsInstaller.Rows; using WixToolset.Extensibility.Services; @@ -85,25 +85,25 @@ namespace WixToolset.Core.WindowsInstaller.Bind var section = this.Intermediate.Sections.First(); - var tuples = this.Intermediate.Sections.SelectMany(s => s.Tuples).ToList(); + var symbols = this.Intermediate.Sections.SelectMany(s => s.Symbols).ToList(); - // Get the patch id from the WixPatchId tuple. - var patchIdTuple = tuples.OfType().FirstOrDefault(); + // Get the patch id from the WixPatchId symbol. + var patchIdSymbol = symbols.OfType().FirstOrDefault(); - if (String.IsNullOrEmpty(patchIdTuple.Id?.Id)) + if (String.IsNullOrEmpty(patchIdSymbol.Id?.Id)) { this.Messaging.Write(ErrorMessages.ExpectedPatchIdInWixMsp()); return subStorages; } - if (String.IsNullOrEmpty(patchIdTuple.ClientPatchId)) + if (String.IsNullOrEmpty(patchIdSymbol.ClientPatchId)) { this.Messaging.Write(ErrorMessages.ExpectedClientPatchIdInWixMsp()); return subStorages; } // enumerate patch.Media to map diskId to Media row - var patchMediaByDiskId = tuples.OfType().ToDictionary(t => t.DiskId); + var patchMediaByDiskId = symbols.OfType().ToDictionary(t => t.DiskId); if (patchMediaByDiskId.Count == 0) { @@ -112,23 +112,23 @@ namespace WixToolset.Core.WindowsInstaller.Bind } // populate MSP summary information - var patchMetadata = this.PopulateSummaryInformation(summaryInfo, tuples, patchIdTuple, section.Codepage); + var patchMetadata = this.PopulateSummaryInformation(summaryInfo, symbols, patchIdSymbol, section.Codepage); // enumerate transforms var productCodes = new SortedSet(); var transformNames = new List(); var validTransform = new List>(); - var baselineTuplesById = tuples.OfType().ToDictionary(t => t.Id.Id); + var baselineSymbolsById = symbols.OfType().ToDictionary(t => t.Id.Id); foreach (var mainTransform in this.Transforms) { - var baselineTuple = baselineTuplesById[mainTransform.Baseline]; + var baselineSymbol = baselineSymbolsById[mainTransform.Baseline]; - var patchRefTuples = tuples.OfType().ToList(); - if (patchRefTuples.Count > 0) + var patchRefSymbols = symbols.OfType().ToList(); + if (patchRefSymbols.Count > 0) { - if (!this.ReduceTransform(mainTransform.Transform, patchRefTuples)) + if (!this.ReduceTransform(mainTransform.Transform, patchRefSymbols)) { // transform has none of the content authored into this patch continue; @@ -139,7 +139,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.Validate(mainTransform); // ensure consistent File.Sequence within each Media - var mediaTuple = patchMediaByDiskId[baselineTuple.DiskId]; + var mediaSymbol = patchMediaByDiskId[baselineSymbol.DiskId]; // Ensure that files are sequenced after the last file in any transform. var transformMediaTable = mainTransform.Transform.Tables["Media"]; @@ -147,25 +147,25 @@ namespace WixToolset.Core.WindowsInstaller.Bind { foreach (MediaRow transformMediaRow in transformMediaTable.Rows) { - if (!mediaTuple.LastSequence.HasValue || mediaTuple.LastSequence < transformMediaRow.LastSequence) + if (!mediaSymbol.LastSequence.HasValue || mediaSymbol.LastSequence < transformMediaRow.LastSequence) { // The Binder will pre-increment the sequence. - mediaTuple.LastSequence = transformMediaRow.LastSequence; + mediaSymbol.LastSequence = transformMediaRow.LastSequence; } } } // Use the Media/@DiskId if greater than the last sequence for backward compatibility. - if (!mediaTuple.LastSequence.HasValue || mediaTuple.LastSequence < mediaTuple.DiskId) + if (!mediaSymbol.LastSequence.HasValue || mediaSymbol.LastSequence < mediaSymbol.DiskId) { - mediaTuple.LastSequence = mediaTuple.DiskId; + mediaSymbol.LastSequence = mediaSymbol.DiskId; } // Ignore media table in the transform. mainTransform.Transform.Tables.Remove("Media"); mainTransform.Transform.Tables.Remove("MsiDigitalSignature"); - var pairedTransform = this.BuildPairedTransform(summaryInfo, patchMetadata, patchIdTuple, mainTransform.Transform, mediaTuple, baselineTuple, out var productCode); + var pairedTransform = this.BuildPairedTransform(summaryInfo, patchMetadata, patchIdSymbol, mainTransform.Transform, mediaSymbol, baselineSymbol, out var productCode); productCode = productCode.ToUpperInvariant(); productCodes.Add(productCode); @@ -205,17 +205,17 @@ namespace WixToolset.Core.WindowsInstaller.Bind } // Finish filling tables with transform-dependent data. - productCodes = FinalizePatchProductCodes(tuples, productCodes); + productCodes = FinalizePatchProductCodes(symbols, productCodes); // Semicolon delimited list of the product codes that can accept the patch. - summaryInfo.Add(SummaryInformationType.PatchProductCodes, new SummaryInformationTuple(patchIdTuple.SourceLineNumbers) + summaryInfo.Add(SummaryInformationType.PatchProductCodes, new SummaryInformationSymbol(patchIdSymbol.SourceLineNumbers) { PropertyId = SummaryInformationType.PatchProductCodes, Value = String.Join(";", productCodes) }); // Semicolon delimited list of transform substorage names in the order they are applied. - summaryInfo.Add(SummaryInformationType.TransformNames, new SummaryInformationTuple(patchIdTuple.SourceLineNumbers) + summaryInfo.Add(SummaryInformationType.TransformNames, new SummaryInformationSymbol(patchIdSymbol.SourceLineNumbers) { PropertyId = SummaryInformationType.TransformNames, Value = String.Join(";", transformNames) @@ -224,7 +224,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // Put the summary information that was extracted back in now that it is updated. foreach (var readSummaryInfo in summaryInfo.Values.OrderBy(s => s.PropertyId)) { - section.AddTuple(readSummaryInfo); + section.AddSymbol(readSummaryInfo); } this.SubStorages = subStorages; @@ -232,19 +232,19 @@ namespace WixToolset.Core.WindowsInstaller.Bind return subStorages; } - private Dictionary ExtractPatchSummaryInfo() + private Dictionary ExtractPatchSummaryInfo() { - var result = new Dictionary(); + var result = new Dictionary(); foreach (var section in this.Intermediate.Sections) { - for (var i = section.Tuples.Count - 1; i >= 0; i--) + for (var i = section.Symbols.Count - 1; i >= 0; i--) { - if (section.Tuples[i] is SummaryInformationTuple patchSummaryInfo) + if (section.Symbols[i] is SummaryInformationSymbol patchSummaryInfo) { - // Remove all summary information from the tuples and remember those that + // Remove all summary information from the symbols and remember those that // are not calculated or reserved. - section.Tuples.RemoveAt(i); + section.Symbols.RemoveAt(i); if (patchSummaryInfo.PropertyId != SummaryInformationType.PatchProductCodes && patchSummaryInfo.PropertyId != SummaryInformationType.PatchCode && @@ -262,39 +262,39 @@ namespace WixToolset.Core.WindowsInstaller.Bind return result; } - private Dictionary PopulateSummaryInformation(Dictionary summaryInfo, List tuples, WixPatchIdTuple patchIdTuple, int codepage) + private Dictionary PopulateSummaryInformation(Dictionary summaryInfo, List symbols, WixPatchIdSymbol patchIdSymbol, int codepage) { // PID_CODEPAGE if (!summaryInfo.ContainsKey(SummaryInformationType.Codepage)) { // Set the code page by default to the same code page for the // string pool in the database. - AddSummaryInformation(SummaryInformationType.Codepage, codepage.ToString(CultureInfo.InvariantCulture), patchIdTuple.SourceLineNumbers); + AddSummaryInformation(SummaryInformationType.Codepage, codepage.ToString(CultureInfo.InvariantCulture), patchIdSymbol.SourceLineNumbers); } // GUID patch code for the patch. - AddSummaryInformation(SummaryInformationType.PatchCode, patchIdTuple.Id.Id, patchIdTuple.SourceLineNumbers); + AddSummaryInformation(SummaryInformationType.PatchCode, patchIdSymbol.Id.Id, patchIdSymbol.SourceLineNumbers); // Indicates the minimum Windows Installer version that is required to install the patch. - AddSummaryInformation(SummaryInformationType.PatchInstallerRequirement, ((int)SummaryInformation.InstallerRequirement.Version31).ToString(CultureInfo.InvariantCulture), patchIdTuple.SourceLineNumbers); + AddSummaryInformation(SummaryInformationType.PatchInstallerRequirement, ((int)SummaryInformation.InstallerRequirement.Version31).ToString(CultureInfo.InvariantCulture), patchIdSymbol.SourceLineNumbers); if (!summaryInfo.ContainsKey(SummaryInformationType.Security)) { - AddSummaryInformation(SummaryInformationType.Security, "4", patchIdTuple.SourceLineNumbers); // Read-only enforced; + AddSummaryInformation(SummaryInformationType.Security, "4", patchIdSymbol.SourceLineNumbers); // Read-only enforced; } // Use authored comments or default to display name. - MsiPatchMetadataTuple commentsTuple = null; + MsiPatchMetadataSymbol commentsSymbol = null; - var metadataTuples = tuples.OfType().Where(t => String.IsNullOrEmpty(t.Company)).ToDictionary(t => t.Property); + var metadataSymbols = symbols.OfType().Where(t => String.IsNullOrEmpty(t.Company)).ToDictionary(t => t.Property); if (!summaryInfo.ContainsKey(SummaryInformationType.Title) && - metadataTuples.TryGetValue("DisplayName", out var displayName)) + metadataSymbols.TryGetValue("DisplayName", out var displayName)) { AddSummaryInformation(SummaryInformationType.Title, displayName.Value, displayName.SourceLineNumbers); // Default comments to use display name as-is. - commentsTuple = displayName; + commentsSymbol = displayName; } // TODO: This code below seems unnecessary given the codepage is set at the top of this method. @@ -305,38 +305,38 @@ namespace WixToolset.Core.WindowsInstaller.Bind //} if (!summaryInfo.ContainsKey(SummaryInformationType.PatchPackageName) && - metadataTuples.TryGetValue("Description", out var description)) + metadataSymbols.TryGetValue("Description", out var description)) { AddSummaryInformation(SummaryInformationType.PatchPackageName, description.Value, description.SourceLineNumbers); } if (!summaryInfo.ContainsKey(SummaryInformationType.Author) && - metadataTuples.TryGetValue("ManufacturerName", out var manufacturer)) + metadataSymbols.TryGetValue("ManufacturerName", out var manufacturer)) { AddSummaryInformation(SummaryInformationType.Author, manufacturer.Value, manufacturer.SourceLineNumbers); } // Special metadata marshalled through the build. - //var wixMetadataValues = tuples.OfType().ToDictionary(t => t.Id.Id, t => t.Value); + //var wixMetadataValues = symbols.OfType().ToDictionary(t => t.Id.Id, t => t.Value); //if (wixMetadataValues.TryGetValue("Comments", out var wixComments)) - if (metadataTuples.TryGetValue("Comments", out var wixComments)) + if (metadataSymbols.TryGetValue("Comments", out var wixComments)) { - commentsTuple = wixComments; + commentsSymbol = wixComments; } // Write the package comments to summary info. if (!summaryInfo.ContainsKey(SummaryInformationType.Comments) && - commentsTuple != null) + commentsSymbol != null) { - AddSummaryInformation(SummaryInformationType.Comments, commentsTuple.Value, commentsTuple.SourceLineNumbers); + AddSummaryInformation(SummaryInformationType.Comments, commentsSymbol.Value, commentsSymbol.SourceLineNumbers); } - return metadataTuples; + return metadataSymbols; void AddSummaryInformation(SummaryInformationType type, string value, SourceLineNumber sourceLineNumber) { - summaryInfo.Add(type, new SummaryInformationTuple(sourceLineNumber) + summaryInfo.Add(type, new SummaryInformationSymbol(sourceLineNumber) { PropertyId = type, Value = value @@ -379,9 +379,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// Reduce the transform according to the patch references. /// /// transform generated by torch. - /// Table contains patch family filter. + /// Table contains patch family filter. /// true if the transform is not empty - private bool ReduceTransform(WindowsInstallerData transform, IEnumerable patchRefTuples) + private bool ReduceTransform(WindowsInstallerData transform, IEnumerable patchRefSymbols) { // identify sections to keep var oldSections = new Dictionary(); @@ -402,10 +402,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind var directoryLockPermissionsIndex = new Dictionary>(); var directoryMsiLockPermissionsExIndex = new Dictionary>(); - foreach (var patchRefTuple in patchRefTuples) + foreach (var patchRefSymbol in patchRefSymbols) { - var tableName = patchRefTuple.Table; - var key = patchRefTuple.PrimaryKeys; + var tableName = patchRefSymbol.Table; + var key = patchRefSymbol.PrimaryKeys; // Short circuit filtering if all changes should be included. if ("*" == tableName && "*" == key) @@ -1090,7 +1090,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// /// Create the #transform for the given main transform. /// - private WindowsInstallerData BuildPairedTransform(Dictionary summaryInfo, Dictionary patchMetadata, WixPatchIdTuple patchIdTuple, WindowsInstallerData mainTransform, MediaTuple mediaTuple, WixPatchBaselineTuple baselineTuple, out string productCode) + private WindowsInstallerData BuildPairedTransform(Dictionary summaryInfo, Dictionary patchMetadata, WixPatchIdSymbol patchIdSymbol, WindowsInstallerData mainTransform, MediaSymbol mediaSymbol, WixPatchBaselineSymbol baselineSymbol, out string productCode) { productCode = null; @@ -1106,11 +1106,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind var mainSummaryTable = mainTransform.Tables["_SummaryInformation"]; var mainSummaryRows = mainSummaryTable.Rows.ToDictionary(r => r.FieldAsInteger(0)); - var baselineValidationFlags = ((int)baselineTuple.ValidationFlags).ToString(CultureInfo.InvariantCulture); + var baselineValidationFlags = ((int)baselineSymbol.ValidationFlags).ToString(CultureInfo.InvariantCulture); if (!mainSummaryRows.ContainsKey((int)SummaryInformationType.TransformValidationFlags)) { - var mainSummaryRow = mainSummaryTable.CreateRow(baselineTuple.SourceLineNumbers); + var mainSummaryRow = mainSummaryTable.CreateRow(baselineSymbol.SourceLineNumbers); mainSummaryRow[0] = (int)SummaryInformationType.TransformValidationFlags; mainSummaryRow[1] = baselineValidationFlags; } @@ -1177,7 +1177,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind mainFileRow.CopyTo(pairedFileRow); // Override authored media for patch bind. - mainFileRow.DiskId = mediaTuple.DiskId; + mainFileRow.DiskId = mediaSymbol.DiskId; // Suppress any change to File.Sequence to avoid bloat. mainFileRow.Fields[7].Modified = false; @@ -1200,78 +1200,78 @@ namespace WixToolset.Core.WindowsInstaller.Bind // Add Media row to pairedTransform var pairedMediaTable = pairedTransform.EnsureTable(this.tableDefinitions["Media"]); - var pairedMediaRow = (MediaRow)pairedMediaTable.CreateRow(mediaTuple.SourceLineNumbers); + var pairedMediaRow = (MediaRow)pairedMediaTable.CreateRow(mediaSymbol.SourceLineNumbers); pairedMediaRow.Operation = RowOperation.Add; - pairedMediaRow.DiskId = mediaTuple.DiskId; - pairedMediaRow.LastSequence = mediaTuple.LastSequence ?? 0; - pairedMediaRow.DiskPrompt = mediaTuple.DiskPrompt; - pairedMediaRow.Cabinet = mediaTuple.Cabinet; - pairedMediaRow.VolumeLabel = mediaTuple.VolumeLabel; - pairedMediaRow.Source = mediaTuple.Source; + pairedMediaRow.DiskId = mediaSymbol.DiskId; + pairedMediaRow.LastSequence = mediaSymbol.LastSequence ?? 0; + pairedMediaRow.DiskPrompt = mediaSymbol.DiskPrompt; + pairedMediaRow.Cabinet = mediaSymbol.Cabinet; + pairedMediaRow.VolumeLabel = mediaSymbol.VolumeLabel; + pairedMediaRow.Source = mediaSymbol.Source; // Add PatchPackage for this Media var pairedPackageTable = pairedTransform.EnsureTable(this.tableDefinitions["PatchPackage"]); pairedPackageTable.Operation = TableOperation.Add; - var pairedPackageRow = pairedPackageTable.CreateRow(mediaTuple.SourceLineNumbers); + var pairedPackageRow = pairedPackageTable.CreateRow(mediaSymbol.SourceLineNumbers); pairedPackageRow.Operation = RowOperation.Add; - pairedPackageRow[0] = patchIdTuple.Id.Id; - pairedPackageRow[1] = mediaTuple.DiskId; + pairedPackageRow[0] = patchIdSymbol.Id.Id; + pairedPackageRow[1] = mediaSymbol.DiskId; // Add the property to the patch transform's Property table. var pairedPropertyTable = pairedTransform.EnsureTable(this.tableDefinitions["Property"]); pairedPropertyTable.Operation = TableOperation.Add; // Add property to both identify client patches and whether those patches are removable or not - patchMetadata.TryGetValue("AllowRemoval", out var allowRemovalTuple); + patchMetadata.TryGetValue("AllowRemoval", out var allowRemovalSymbol); - var pairedPropertyRow = pairedPropertyTable.CreateRow(allowRemovalTuple?.SourceLineNumbers); + var pairedPropertyRow = pairedPropertyTable.CreateRow(allowRemovalSymbol?.SourceLineNumbers); pairedPropertyRow.Operation = RowOperation.Add; - pairedPropertyRow[0] = String.Concat(patchIdTuple.ClientPatchId, ".AllowRemoval"); - pairedPropertyRow[1] = allowRemovalTuple?.Value ?? "0"; + pairedPropertyRow[0] = String.Concat(patchIdSymbol.ClientPatchId, ".AllowRemoval"); + pairedPropertyRow[1] = allowRemovalSymbol?.Value ?? "0"; // Add this patch code GUID to the patch transform to identify // which patches are installed, including in multi-patch // installations. - pairedPropertyRow = pairedPropertyTable.CreateRow(patchIdTuple.SourceLineNumbers); + pairedPropertyRow = pairedPropertyTable.CreateRow(patchIdSymbol.SourceLineNumbers); pairedPropertyRow.Operation = RowOperation.Add; - pairedPropertyRow[0] = String.Concat(patchIdTuple.ClientPatchId, ".PatchCode"); - pairedPropertyRow[1] = patchIdTuple.Id.Id; + pairedPropertyRow[0] = String.Concat(patchIdSymbol.ClientPatchId, ".PatchCode"); + pairedPropertyRow[1] = patchIdSymbol.Id.Id; // Add PATCHNEWPACKAGECODE to apply to admin layouts. - pairedPropertyRow = pairedPropertyTable.CreateRow(patchIdTuple.SourceLineNumbers); + pairedPropertyRow = pairedPropertyTable.CreateRow(patchIdSymbol.SourceLineNumbers); pairedPropertyRow.Operation = RowOperation.Add; pairedPropertyRow[0] = "PATCHNEWPACKAGECODE"; - pairedPropertyRow[1] = patchIdTuple.Id.Id; + pairedPropertyRow[1] = patchIdSymbol.Id.Id; // Add PATCHNEWSUMMARYCOMMENTS and PATCHNEWSUMMARYSUBJECT to apply to admin layouts. - if (summaryInfo.TryGetValue(SummaryInformationType.Subject, out var subjectTuple)) + if (summaryInfo.TryGetValue(SummaryInformationType.Subject, out var subjectSymbol)) { - pairedPropertyRow = pairedPropertyTable.CreateRow(subjectTuple.SourceLineNumbers); + pairedPropertyRow = pairedPropertyTable.CreateRow(subjectSymbol.SourceLineNumbers); pairedPropertyRow.Operation = RowOperation.Add; pairedPropertyRow[0] = "PATCHNEWSUMMARYSUBJECT"; - pairedPropertyRow[1] = subjectTuple.Value; + pairedPropertyRow[1] = subjectSymbol.Value; } - if (summaryInfo.TryGetValue(SummaryInformationType.Comments, out var commentsTuple)) + if (summaryInfo.TryGetValue(SummaryInformationType.Comments, out var commentsSymbol)) { - pairedPropertyRow = pairedPropertyTable.CreateRow(commentsTuple.SourceLineNumbers); + pairedPropertyRow = pairedPropertyTable.CreateRow(commentsSymbol.SourceLineNumbers); pairedPropertyRow.Operation = RowOperation.Add; pairedPropertyRow[0] = "PATCHNEWSUMMARYCOMMENTS"; - pairedPropertyRow[1] = commentsTuple.Value; + pairedPropertyRow[1] = commentsSymbol.Value; } return pairedTransform; } - private static SortedSet FinalizePatchProductCodes(List tuples, SortedSet productCodes) + private static SortedSet FinalizePatchProductCodes(List symbols, SortedSet productCodes) { - var patchTargetTuples = tuples.OfType().ToList(); + var patchTargetSymbols = symbols.OfType().ToList(); - if (patchTargetTuples.Any()) + if (patchTargetSymbols.Any()) { var targets = new SortedSet(); var replace = true; - foreach (var wixPatchTargetRow in patchTargetTuples) + foreach (var wixPatchTargetRow in patchTargetSymbols) { var target = wixPatchTargetRow.ProductCode.ToUpperInvariant(); if (target == "*") diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs index ea6d49a0..950fe1c1 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs @@ -8,7 +8,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Linq; using WixToolset.Core.Bind; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; @@ -147,7 +147,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // Add binder variables for all properties. if (SectionType.Product == section.Type || variableCache != null) { - foreach (var propertyRow in section.Tuples.OfType()) + foreach (var propertyRow in section.Symbols.OfType()) { // Set the ProductCode if it is to be generated. if ("ProductCode".Equals(propertyRow.Id.Id, StringComparison.Ordinal) && "*".Equals(propertyRow.Value, StringComparison.Ordinal)) @@ -256,13 +256,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind // Retrieve file information from merge modules. if (SectionType.Product == section.Type) { - var wixMergeTuples = section.Tuples.OfType().ToList(); + var wixMergeSymbols = section.Symbols.OfType().ToList(); - if (wixMergeTuples.Any()) + if (wixMergeSymbols.Any()) { containsMergeModules = true; - var command = new ExtractMergeModuleFilesCommand(this.Messaging, wixMergeTuples, fileFacades, installerVersion, this.IntermediateFolder, this.SuppressLayout); + var command = new ExtractMergeModuleFilesCommand(this.Messaging, wixMergeSymbols, fileFacades, installerVersion, this.IntermediateFolder, this.SuppressLayout); command.Execute(); fileFacades.AddRange(command.MergeModulesFileFacades); @@ -294,7 +294,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind command.Execute(); } -#if TODO_FINISH_UPDATE // use tuples instead of rows +#if TODO_FINISH_UPDATE // use symbols instead of rows // Extended binder extensions can be called now that fields are resolved. { Table updatedFiles = this.Output.EnsureTable(this.TableDefinitions["WixBindUpdatedFiles"]); @@ -341,20 +341,20 @@ namespace WixToolset.Core.WindowsInstaller.Bind command.Execute(); } - // Add missing CreateFolder tuples to null-keypath components. + // Add missing CreateFolder symbols to null-keypath components. { var command = new AddCreateFoldersCommand(section); command.Execute(); } - // Update tuples that reference text files on disk. + // Update symbols that reference text files on disk. { var command = new UpdateFromTextFilesCommand(this.Messaging, section); command.Execute(); } // Assign files to media and update file sequences. - Dictionary> filesByCabinetMedia; + Dictionary> filesByCabinetMedia; IEnumerable uncompressedFiles; { var order = new OptimizeFileFacadesOrderCommand(fileFacades); @@ -391,7 +391,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (output.Type == OutputType.Module) { // Modularize identifiers. - var modularize = new ModularizeCommand(output, modularizationSuffix, section.Tuples.OfType()); + var modularize = new ModularizeCommand(output, modularizationSuffix, section.Symbols.OfType()); modularize.Execute(); // Ensure all sequence tables in place because, mergemod.dll requires them. @@ -418,7 +418,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (SectionType.Patch == section.Type && this.DeltaBinaryPatch) { - var command = new CreateDeltaPatchesCommand(fileFacades, this.IntermediateFolder, section.Tuples.OfType().FirstOrDefault()); + var command = new CreateDeltaPatchesCommand(fileFacades, this.IntermediateFolder, section.Symbols.OfType().FirstOrDefault()); command.Execute(); } @@ -428,7 +428,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind { this.Messaging.Write(VerboseMessages.CreatingCabinetFiles()); - var mediaTemplate = section.Tuples.OfType().FirstOrDefault(); + var mediaTemplate = section.Symbols.OfType().FirstOrDefault(); var command = new CreateCabinetsCommand(this.ServiceProvider, this.BackendHelper, mediaTemplate); command.CabbingThreadCount = this.CabbingThreadCount; @@ -578,7 +578,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind return wixout; } - private string ResolveMedia(MediaTuple media, string mediaLayoutDirectory, string layoutDirectory) + private string ResolveMedia(MediaSymbol media, string mediaLayoutDirectory, string layoutDirectory) { string layout = null; diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs index d5806fee..82688edf 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindSummaryInfoCommand.cs @@ -6,7 +6,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Globalization; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; /// /// Binds the summary information table of a database. @@ -49,13 +49,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind var foundCreatingApplication = false; var now = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss", CultureInfo.InvariantCulture); - foreach (var summaryInformationTuple in this.Section.Tuples.OfType()) + foreach (var summaryInformationSymbol in this.Section.Symbols.OfType()) { - switch (summaryInformationTuple.PropertyId) + switch (summaryInformationSymbol.PropertyId) { case SummaryInformationType.Codepage: // PID_CODEPAGE // make sure the code page is an int and not a web name or null - var codepage = summaryInformationTuple.Value; + var codepage = summaryInformationSymbol.Value; if (String.IsNullOrEmpty(codepage)) { @@ -63,11 +63,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind } else { - summaryInformationTuple.Value = Common.GetValidCodePage(codepage, false, false, summaryInformationTuple.SourceLineNumbers).ToString(CultureInfo.InvariantCulture); + summaryInformationSymbol.Value = Common.GetValidCodePage(codepage, false, false, summaryInformationSymbol.SourceLineNumbers).ToString(CultureInfo.InvariantCulture); } break; case SummaryInformationType.PackageCode: // PID_REVNUMBER - var packageCode = summaryInformationTuple.Value; + var packageCode = summaryInformationSymbol.Value; if (SectionType.Module == this.Section.Type) { @@ -76,7 +76,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind else if ("*" == packageCode) { // set the revision number (package/patch code) if it should be automatically generated - summaryInformationTuple.Value = Common.GenerateGuid(); + summaryInformationSymbol.Value = Common.GenerateGuid(); } break; case SummaryInformationType.Created: @@ -86,7 +86,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind foundLastSaveDataTime = true; break; case SummaryInformationType.WindowsInstallerVersion: - this.InstallerVersion = summaryInformationTuple[SummaryInformationTupleFields.Value].AsNumber(); + this.InstallerVersion = summaryInformationSymbol[SummaryInformationSymbolFields.Value].AsNumber(); break; case SummaryInformationType.WordCount: if (SectionType.Patch == this.Section.Type) @@ -96,7 +96,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } else { - var attributes = summaryInformationTuple[SummaryInformationTupleFields.Value].AsNumber(); + var attributes = summaryInformationSymbol[SummaryInformationSymbolFields.Value].AsNumber(); this.LongNames = (0 == (attributes & 1)); this.Compressed = (2 == (attributes & 2)); } @@ -110,7 +110,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // add a summary information row for the create time/date property if its not already set if (!foundCreateDataTime) { - this.Section.AddTuple(new SummaryInformationTuple(null) + this.Section.AddSymbol(new SummaryInformationSymbol(null) { PropertyId = SummaryInformationType.Created, Value = now, @@ -120,7 +120,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // add a summary information row for the last save time/date property if its not already set if (!foundLastSaveDataTime) { - this.Section.AddTuple(new SummaryInformationTuple(null) + this.Section.AddSymbol(new SummaryInformationSymbol(null) { PropertyId = SummaryInformationType.LastSaved, Value = now, @@ -130,7 +130,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // add a summary information row for the creating application property if its not already set if (!foundCreatingApplication) { - this.Section.AddTuple(new SummaryInformationTuple(null) + this.Section.AddSymbol(new SummaryInformationSymbol(null) { PropertyId = SummaryInformationType.CreatingApplication, Value = String.Format(CultureInfo.InvariantCulture, AppCommon.GetCreatingApplicationString()), diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs index ac98c82d..bc5c6853 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs @@ -7,7 +7,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.IO; using WixToolset.Core.WindowsInstaller.Msi; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility.Services; diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs index 8135ae2e..a1e3ac83 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs @@ -7,7 +7,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.IO; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; @@ -34,38 +34,38 @@ namespace WixToolset.Core.WindowsInstaller.Bind public void Execute() { - Dictionary registryKeyRows = null; + Dictionary registryKeyRows = null; Dictionary targetPathsByDirectoryId = null; Dictionary componentIdGenSeeds = null; - Dictionary> filesByComponentId = null; + Dictionary> filesByComponentId = null; // Find components with generatable guids. - foreach (var componentTuple in this.Section.Tuples.OfType()) + foreach (var componentSymbol in this.Section.Symbols.OfType()) { // Skip components that do not specify generate guid. - if (componentTuple.ComponentId != "*") + if (componentSymbol.ComponentId != "*") { continue; } - if (String.IsNullOrEmpty(componentTuple.KeyPath) || ComponentKeyPathType.OdbcDataSource == componentTuple.KeyPathType) + if (String.IsNullOrEmpty(componentSymbol.KeyPath) || ComponentKeyPathType.OdbcDataSource == componentSymbol.KeyPathType) { - this.Messaging.Write(ErrorMessages.IllegalComponentWithAutoGeneratedGuid(componentTuple.SourceLineNumbers)); + this.Messaging.Write(ErrorMessages.IllegalComponentWithAutoGeneratedGuid(componentSymbol.SourceLineNumbers)); continue; } - if (ComponentKeyPathType.Registry == componentTuple.KeyPathType) + if (ComponentKeyPathType.Registry == componentSymbol.KeyPathType) { if (registryKeyRows is null) { - registryKeyRows = this.Section.Tuples.OfType().ToDictionary(t => t.Id.Id); + registryKeyRows = this.Section.Symbols.OfType().ToDictionary(t => t.Id.Id); } - if (registryKeyRows.TryGetValue(componentTuple.KeyPath, out var foundRow)) + if (registryKeyRows.TryGetValue(componentSymbol.KeyPath, out var foundRow)) { - var bitness = componentTuple.Win64 ? "64" : String.Empty; + var bitness = componentSymbol.Win64 ? "64" : String.Empty; var regkey = String.Concat(bitness, foundRow.AsString(1), "\\", foundRow.AsString(2), "\\", foundRow.AsString(3)); - componentTuple.ComponentId = this.BackendHelper.CreateGuid(BindDatabaseCommand.WixComponentGuidNamespace, regkey.ToLowerInvariant()); + componentSymbol.ComponentId = this.BackendHelper.CreateGuid(BindDatabaseCommand.WixComponentGuidNamespace, regkey.ToLowerInvariant()); } } else // must be a File KeyPath. @@ -74,7 +74,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // of directory ids to target names do that now. if (targetPathsByDirectoryId is null) { - var directories = this.Section.Tuples.OfType().ToList(); + var directories = this.Section.Symbols.OfType().ToList(); targetPathsByDirectoryId = new Dictionary(directories.Count); @@ -95,12 +95,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind } // If the component id generation seeds have not been indexed - // from the Directory tuples do that now. + // from the Directory symbols do that now. if (componentIdGenSeeds is null) { - // If there are any Directory tuples, build up the Component Guid + // If there are any Directory symbols, build up the Component Guid // generation seeds indexed by Directory/@Id. - componentIdGenSeeds = this.Section.Tuples.OfType() + componentIdGenSeeds = this.Section.Symbols.OfType() .Where(t => !String.IsNullOrEmpty(t.ComponentGuidGenerationSeed)) .ToDictionary(t => t.Id.Id, t => t.ComponentGuidGenerationSeed); } @@ -109,15 +109,15 @@ namespace WixToolset.Core.WindowsInstaller.Bind // then do that now if (filesByComponentId is null) { - var files = this.Section.Tuples.OfType().ToList(); + var files = this.Section.Symbols.OfType().ToList(); - filesByComponentId = new Dictionary>(files.Count); + filesByComponentId = new Dictionary>(files.Count); foreach (var file in files) { if (!filesByComponentId.TryGetValue(file.ComponentRef, out var componentFiles)) { - componentFiles = new List(); + componentFiles = new List(); filesByComponentId.Add(file.ComponentRef, componentFiles); } @@ -126,16 +126,16 @@ namespace WixToolset.Core.WindowsInstaller.Bind } // validate component meets all the conditions to have a generated guid - var currentComponentFiles = filesByComponentId[componentTuple.Id.Id]; + var currentComponentFiles = filesByComponentId[componentSymbol.Id.Id]; var numFilesInComponent = currentComponentFiles.Count; string path = null; foreach (var fileRow in currentComponentFiles) { - if (fileRow.Id.Id == componentTuple.KeyPath) + if (fileRow.Id.Id == componentSymbol.KeyPath) { // calculate the key file's canonical target path - string directoryPath = this.PathResolver.GetDirectoryPath(targetPathsByDirectoryId, componentIdGenSeeds, componentTuple.DirectoryRef, true); + string directoryPath = this.PathResolver.GetDirectoryPath(targetPathsByDirectoryId, componentIdGenSeeds, componentSymbol.DirectoryRef, true); string fileName = Common.GetName(fileRow.Name, false, true).ToLowerInvariant(); path = Path.Combine(directoryPath, fileName); @@ -147,13 +147,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind path.StartsWith(@"StartMenuFolder\programs", StringComparison.Ordinal) || path.StartsWith(@"WindowsFolder\fonts", StringComparison.Ordinal)) { - this.Messaging.Write(ErrorMessages.IllegalPathForGeneratedComponentGuid(componentTuple.SourceLineNumbers, fileRow.ComponentRef, path)); + this.Messaging.Write(ErrorMessages.IllegalPathForGeneratedComponentGuid(componentSymbol.SourceLineNumbers, fileRow.ComponentRef, path)); } // if component has more than one file, the key path must be versioned if (1 < numFilesInComponent && String.IsNullOrEmpty(fileRow.Version)) { - this.Messaging.Write(ErrorMessages.IllegalGeneratedGuidComponentUnversionedKeypath(componentTuple.SourceLineNumbers)); + this.Messaging.Write(ErrorMessages.IllegalGeneratedGuidComponentUnversionedKeypath(componentSymbol.SourceLineNumbers)); } } else @@ -161,7 +161,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // not a key path, so it must be an unversioned file if component has more than one file if (1 < numFilesInComponent && !String.IsNullOrEmpty(fileRow.Version)) { - this.Messaging.Write(ErrorMessages.IllegalGeneratedGuidComponentVersionedNonkeypath(componentTuple.SourceLineNumbers)); + this.Messaging.Write(ErrorMessages.IllegalGeneratedGuidComponentVersionedNonkeypath(componentSymbol.SourceLineNumbers)); } } } @@ -169,7 +169,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // if the rules were followed, reward with a generated guid if (!this.Messaging.EncounteredError) { - componentTuple.ComponentId = this.BackendHelper.CreateGuid(BindDatabaseCommand.WixComponentGuidNamespace, path); + componentSymbol.ComponentId = this.BackendHelper.CreateGuid(BindDatabaseCommand.WixComponentGuidNamespace, path); } } } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs index 0dcce61b..8a85a975 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs @@ -11,7 +11,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Linq; using WixToolset.Core.Bind; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Data.WindowsInstaller.Rows; using WixToolset.Extensibility; @@ -463,9 +463,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind ref duplicateFilesSequence); if (!hasPatchFilesAction) { - WindowsInstallerStandard.TryGetStandardAction(tableName, "PatchFiles", out var patchFilesActionTuple); + WindowsInstallerStandard.TryGetStandardAction(tableName, "PatchFiles", out var patchFilesActionSymbol); - var sequence = patchFilesActionTuple.Sequence; + var sequence = patchFilesActionSymbol.Sequence; // Test for default sequence value's appropriateness if (installFilesSequence >= sequence || (0 != duplicateFilesSequence && duplicateFilesSequence <= sequence)) @@ -474,14 +474,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind { if (duplicateFilesSequence < installFilesSequence) { - throw new WixException(ErrorMessages.InsertInvalidSequenceActionOrder(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionTuple.Action)); + throw new WixException(ErrorMessages.InsertInvalidSequenceActionOrder(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionSymbol.Action)); } else { sequence = (duplicateFilesSequence + installFilesSequence) / 2; if (installFilesSequence == sequence || duplicateFilesSequence == sequence) { - throw new WixException(ErrorMessages.InsertSequenceNoSpace(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionTuple.Action)); + throw new WixException(ErrorMessages.InsertSequenceNoSpace(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionSymbol.Action)); } } } @@ -498,8 +498,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind } var patchAction = sequenceTable.CreateRow(null); - patchAction[0] = patchFilesActionTuple.Action; - patchAction[1] = patchFilesActionTuple.Condition; + patchAction[0] = patchFilesActionSymbol.Action; + patchAction[1] = patchFilesActionSymbol.Condition; patchAction[2] = sequence; patchAction.Operation = RowOperation.Add; } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs index 9741fcd9..5c296f74 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs @@ -10,7 +10,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Runtime.InteropServices; using WixToolset.Core.Bind; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; @@ -32,7 +32,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind private Dictionary lastCabinetAddedToMediaTable; // Key is First Cabinet Name, Value is Last Cabinet Added in the Split Sequence - public CreateCabinetsCommand(IWixToolsetServiceProvider serviceProvider, IBackendHelper backendHelper, WixMediaTemplateTuple mediaTemplate) + public CreateCabinetsCommand(IWixToolsetServiceProvider serviceProvider, IBackendHelper backendHelper, WixMediaTemplateSymbol mediaTemplate) { this.fileTransfers = new List(); @@ -51,7 +51,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind private IBackendHelper BackendHelper { get; } - private WixMediaTemplateTuple MediaTemplate { get; } + private WixMediaTemplateSymbol MediaTemplate { get; } /// /// Sets the number of threads to use for cabinet creation. @@ -80,9 +80,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind public string ModularizationSuffix { private get; set; } - public Dictionary> FileFacadesByCabinet { private get; set; } + public Dictionary> FileFacadesByCabinet { private get; set; } - public Func ResolveMedia { private get; set; } + public Func ResolveMedia { private get; set; } public TableDefinitionCollection TableDefinitions { private get; set; } @@ -113,12 +113,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind foreach (var entry in this.FileFacadesByCabinet) { - var mediaTuple = entry.Key; + var mediaSymbol = entry.Key; var files = entry.Value; - var compressionLevel = mediaTuple.CompressionLevel ?? this.DefaultCompressionLevel ?? CompressionLevel.Medium; - var cabinetDir = this.ResolveMedia(mediaTuple, mediaTuple.Layout, this.LayoutDirectory); + var compressionLevel = mediaSymbol.CompressionLevel ?? this.DefaultCompressionLevel ?? CompressionLevel.Medium; + var cabinetDir = this.ResolveMedia(mediaSymbol, mediaSymbol.Layout, this.LayoutDirectory); - var cabinetWorkItem = this.CreateCabinetWorkItem(this.Output, cabinetDir, mediaTuple, compressionLevel, files); + var cabinetWorkItem = this.CreateCabinetWorkItem(this.Output, cabinetDir, mediaSymbol, compressionLevel, files); if (null != cabinetWorkItem) { cabinetBuilder.Enqueue(cabinetWorkItem); @@ -176,28 +176,28 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// /// Output for the current database. /// Directory to create cabinet in. - /// Media tuple containing information about the cabinet. + /// Media symbol containing information about the cabinet. /// Collection of files in this cabinet. /// created CabinetWorkItem object - private CabinetWorkItem CreateCabinetWorkItem(WindowsInstallerData output, string cabinetDir, MediaTuple mediaTuple, CompressionLevel compressionLevel, IEnumerable fileFacades) + private CabinetWorkItem CreateCabinetWorkItem(WindowsInstallerData output, string cabinetDir, MediaSymbol mediaSymbol, CompressionLevel compressionLevel, IEnumerable fileFacades) { CabinetWorkItem cabinetWorkItem = null; - var tempCabinetFileX = Path.Combine(this.IntermediateFolder, mediaTuple.Cabinet); + var tempCabinetFileX = Path.Combine(this.IntermediateFolder, mediaSymbol.Cabinet); // check for an empty cabinet if (!fileFacades.Any()) { // Remove the leading '#' from the embedded cabinet name to make the warning easier to understand - var cabinetName = mediaTuple.Cabinet.TrimStart('#'); + var cabinetName = mediaSymbol.Cabinet.TrimStart('#'); // If building a patch, remind them to run -p for torch. if (OutputType.Patch == output.Type) { - this.Messaging.Write(WarningMessages.EmptyCabinet(mediaTuple.SourceLineNumbers, cabinetName, true)); + this.Messaging.Write(WarningMessages.EmptyCabinet(mediaSymbol.SourceLineNumbers, cabinetName, true)); } else { - this.Messaging.Write(WarningMessages.EmptyCabinet(mediaTuple.SourceLineNumbers, cabinetName)); + this.Messaging.Write(WarningMessages.EmptyCabinet(mediaSymbol.SourceLineNumbers, cabinetName)); } } @@ -213,7 +213,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } else // reuse the cabinet from the cabinet cache. { - this.Messaging.Write(VerboseMessages.ReusingCabCache(mediaTuple.SourceLineNumbers, mediaTuple.Cabinet, resolvedCabinet.Path)); + this.Messaging.Write(VerboseMessages.ReusingCabCache(mediaSymbol.SourceLineNumbers, mediaSymbol.Cabinet, resolvedCabinet.Path)); try { @@ -227,27 +227,27 @@ namespace WixToolset.Core.WindowsInstaller.Bind } catch (Exception e) { - this.Messaging.Write(WarningMessages.CannotUpdateCabCache(mediaTuple.SourceLineNumbers, resolvedCabinet.Path, e.Message)); + this.Messaging.Write(WarningMessages.CannotUpdateCabCache(mediaSymbol.SourceLineNumbers, resolvedCabinet.Path, e.Message)); } } - var trackResolvedCabinet = this.BackendHelper.TrackFile(resolvedCabinet.Path, TrackedFileType.Intermediate, mediaTuple.SourceLineNumbers); + var trackResolvedCabinet = this.BackendHelper.TrackFile(resolvedCabinet.Path, TrackedFileType.Intermediate, mediaSymbol.SourceLineNumbers); this.trackedFiles.Add(trackResolvedCabinet); - if (mediaTuple.Cabinet.StartsWith("#", StringComparison.Ordinal)) + if (mediaSymbol.Cabinet.StartsWith("#", StringComparison.Ordinal)) { var streamsTable = output.EnsureTable(this.TableDefinitions["_Streams"]); - var streamRow = streamsTable.CreateRow(mediaTuple.SourceLineNumbers); - streamRow[0] = mediaTuple.Cabinet.Substring(1); + var streamRow = streamsTable.CreateRow(mediaSymbol.SourceLineNumbers); + streamRow[0] = mediaSymbol.Cabinet.Substring(1); streamRow[1] = resolvedCabinet.Path; } else { - var trackDestination = this.BackendHelper.TrackFile(Path.Combine(cabinetDir, mediaTuple.Cabinet), TrackedFileType.Final, mediaTuple.SourceLineNumbers); + var trackDestination = this.BackendHelper.TrackFile(Path.Combine(cabinetDir, mediaSymbol.Cabinet), TrackedFileType.Final, mediaSymbol.SourceLineNumbers); this.trackedFiles.Add(trackDestination); - var transfer = this.BackendHelper.CreateFileTransfer(resolvedCabinet.Path, trackDestination.Path, resolvedCabinet.BuildOption == CabinetBuildOption.BuildAndMove, mediaTuple.SourceLineNumbers); + var transfer = this.BackendHelper.CreateFileTransfer(resolvedCabinet.Path, trackDestination.Path, resolvedCabinet.BuildOption == CabinetBuildOption.BuildAndMove, mediaSymbol.SourceLineNumbers); this.fileTransfers.Add(transfer); } @@ -372,7 +372,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } // The new Row has to be inserted just after the last cab in this cabinet split chain according to DiskID Sort - // This is because the FDI Extract requires DiskID of Split Cabinets to be continuous. It Fails otherwise with + // This is because the FDI Extract requires DiskID of Split Cabinets to be continuous. It Fails otherwise with // Error 2350 (FDI Server Error) as next DiskID did not have the right split cabinet during extraction MediaRow newMediaRow = (MediaRow)mediaTable.CreateRow(null); newMediaRow.Cabinet = newCabinetName; diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateDeltaPatchesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateDeltaPatchesCommand.cs index c54e9c53..93ac50ff 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateDeltaPatchesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateDeltaPatchesCommand.cs @@ -8,14 +8,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.IO; using WixToolset.Core.Bind; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; /// /// Creates delta patches and updates the appropriate rows to point to the newly generated patches. /// internal class CreateDeltaPatchesCommand { - public CreateDeltaPatchesCommand(List fileFacades, string intermediateFolder, WixPatchIdTuple wixPatchId) + public CreateDeltaPatchesCommand(List fileFacades, string intermediateFolder, WixPatchIdSymbol wixPatchId) { this.FileFacades = fileFacades; this.IntermediateFolder = intermediateFolder; @@ -24,7 +24,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind private IEnumerable FileFacades { get; } - private WixPatchIdTuple WixPatchId { get; } + private WixPatchIdSymbol WixPatchId { get; } private string IntermediateFolder { get; } @@ -73,7 +73,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } } -#endif +#endif throw new NotImplementedException(); } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateInstanceTransformsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateInstanceTransformsCommand.cs index 772100ca..33afca77 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateInstanceTransformsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateInstanceTransformsCommand.cs @@ -7,7 +7,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Linq; using WixToolset.Core.WindowsInstaller.Msi; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Data.WindowsInstaller.Rows; using WixToolset.Extensibility.Services; @@ -33,9 +33,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind public void Execute() { // Create and add substorages for instance transforms. - var wixInstanceTransformsTuples = this.Section.Tuples.OfType(); + var wixInstanceTransformsSymbols = this.Section.Symbols.OfType(); - if (wixInstanceTransformsTuples.Any()) + if (wixInstanceTransformsSymbols.Any()) { string targetProductCode = null; string targetUpgradeCode = null; @@ -62,7 +62,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } // Index the Instance Component Rows, we'll get the Components rows from the real Component table. - var targetInstanceComponentTable = this.Section.Tuples.OfType(); + var targetInstanceComponentTable = this.Section.Symbols.OfType(); var instanceComponentGuids = targetInstanceComponentTable.ToDictionary(t => t.Id.Id, t => (ComponentRow)null); if (instanceComponentGuids.Any()) @@ -79,11 +79,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind } // Generate the instance transforms - foreach (var instanceTuple in wixInstanceTransformsTuples) + foreach (var instanceSymbol in wixInstanceTransformsSymbols) { - var instanceId = instanceTuple.Id.Id; + var instanceId = instanceSymbol.Id.Id; - var instanceTransform = new WindowsInstallerData(instanceTuple.SourceLineNumbers); + var instanceTransform = new WindowsInstallerData(instanceSymbol.SourceLineNumbers); instanceTransform.Type = OutputType.Transform; instanceTransform.Codepage = this.Output.Codepage; @@ -107,49 +107,49 @@ namespace WixToolset.Core.WindowsInstaller.Bind var propertyTable = instanceTransform.EnsureTable(this.TableDefinitions["Property"]); // Change the ProductCode property - var productCode = instanceTuple.ProductCode; + var productCode = instanceSymbol.ProductCode; if ("*" == productCode) { productCode = Common.GenerateGuid(); } - var productCodeRow = propertyTable.CreateRow(instanceTuple.SourceLineNumbers); + var productCodeRow = propertyTable.CreateRow(instanceSymbol.SourceLineNumbers); productCodeRow.Operation = RowOperation.Modify; productCodeRow.Fields[1].Modified = true; productCodeRow[0] = "ProductCode"; productCodeRow[1] = productCode; // Change the instance property - var instanceIdRow = propertyTable.CreateRow(instanceTuple.SourceLineNumbers); + var instanceIdRow = propertyTable.CreateRow(instanceSymbol.SourceLineNumbers); instanceIdRow.Operation = RowOperation.Modify; instanceIdRow.Fields[1].Modified = true; - instanceIdRow[0] = instanceTuple.PropertyId; + instanceIdRow[0] = instanceSymbol.PropertyId; instanceIdRow[1] = instanceId; - if (!String.IsNullOrEmpty(instanceTuple.ProductName)) + if (!String.IsNullOrEmpty(instanceSymbol.ProductName)) { // Change the ProductName property - var productNameRow = propertyTable.CreateRow(instanceTuple.SourceLineNumbers); + var productNameRow = propertyTable.CreateRow(instanceSymbol.SourceLineNumbers); productNameRow.Operation = RowOperation.Modify; productNameRow.Fields[1].Modified = true; productNameRow[0] = "ProductName"; - productNameRow[1] = instanceTuple.ProductName; + productNameRow[1] = instanceSymbol.ProductName; } - if (!String.IsNullOrEmpty(instanceTuple.UpgradeCode)) + if (!String.IsNullOrEmpty(instanceSymbol.UpgradeCode)) { // Change the UpgradeCode property - var upgradeCodeRow = propertyTable.CreateRow(instanceTuple.SourceLineNumbers); + var upgradeCodeRow = propertyTable.CreateRow(instanceSymbol.SourceLineNumbers); upgradeCodeRow.Operation = RowOperation.Modify; upgradeCodeRow.Fields[1].Modified = true; upgradeCodeRow[0] = "UpgradeCode"; - upgradeCodeRow[1] = instanceTuple.UpgradeCode; + upgradeCodeRow[1] = instanceSymbol.UpgradeCode; // Change the Upgrade table var targetUpgradeTable = this.Output.Tables["Upgrade"]; if (null != targetUpgradeTable && 0 <= targetUpgradeTable.Rows.Count) { - var upgradeId = instanceTuple.UpgradeCode; + var upgradeId = instanceSymbol.UpgradeCode; var upgradeTable = instanceTransform.EnsureTable(this.TableDefinitions["Upgrade"]); foreach (var row in targetUpgradeTable.Rows) { @@ -235,19 +235,19 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (!summaryRows.ContainsKey((int)SummaryInformation.Transform.UpdatedPlatformAndLanguage)) { - var summaryRow = instanceSummaryInformationTable.CreateRow(instanceTuple.SourceLineNumbers); + var summaryRow = instanceSummaryInformationTable.CreateRow(instanceSymbol.SourceLineNumbers); summaryRow[0] = (int)SummaryInformation.Transform.UpdatedPlatformAndLanguage; summaryRow[1] = targetPlatformAndLanguage; } else if (!summaryRows.ContainsKey((int)SummaryInformation.Transform.ValidationFlags)) { - var summaryRow = instanceSummaryInformationTable.CreateRow(instanceTuple.SourceLineNumbers); + var summaryRow = instanceSummaryInformationTable.CreateRow(instanceSymbol.SourceLineNumbers); summaryRow[0] = (int)SummaryInformation.Transform.ValidationFlags; summaryRow[1] = "0"; } else if (!summaryRows.ContainsKey((int)SummaryInformation.Transform.Security)) { - var summaryRow = instanceSummaryInformationTable.CreateRow(instanceTuple.SourceLineNumbers); + var summaryRow = instanceSummaryInformationTable.CreateRow(instanceSymbol.SourceLineNumbers); summaryRow[0] = (int)SummaryInformation.Transform.Security; summaryRow[1] = "4"; } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs index 90d1c148..052b30e3 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs @@ -7,7 +7,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Globalization; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Data.WindowsInstaller.Rows; using WixToolset.Extensibility; @@ -38,7 +38,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind public void Execute() { - this.Output = new WindowsInstallerData(this.Section.Tuples.First().SourceLineNumbers) + this.Output = new WindowsInstallerData(this.Section.Symbols.First().SourceLineNumbers) { Codepage = this.Section.Codepage, Type = SectionTypeToOutputType(this.Section.Type) @@ -49,388 +49,388 @@ namespace WixToolset.Core.WindowsInstaller.Bind private void AddSectionToOutput() { - var cellsByTableAndRowId = new Dictionary>(); + var cellsByTableAndRowId = new Dictionary>(); - foreach (var tuple in this.Section.Tuples) + foreach (var symbol in this.Section.Symbols) { - var unknownTuple = false; - switch (tuple.Definition.Type) + var unknownSymbol = false; + switch (symbol.Definition.Type) { - case TupleDefinitionType.AppSearch: - this.AddTupleDefaultly(tuple); + case SymbolDefinitionType.AppSearch: + this.AddSymbolDefaultly(symbol); this.Output.EnsureTable(this.TableDefinitions["Signature"]); break; - case TupleDefinitionType.Assembly: - this.AddAssemblyTuple((AssemblyTuple)tuple); + case SymbolDefinitionType.Assembly: + this.AddAssemblySymbol((AssemblySymbol)symbol); break; - case TupleDefinitionType.BBControl: - this.AddBBControlTuple((BBControlTuple)tuple); + case SymbolDefinitionType.BBControl: + this.AddBBControlSymbol((BBControlSymbol)symbol); break; - case TupleDefinitionType.Class: - this.AddClassTuple((ClassTuple)tuple); + case SymbolDefinitionType.Class: + this.AddClassSymbol((ClassSymbol)symbol); break; - case TupleDefinitionType.Control: - this.AddControlTuple((ControlTuple)tuple); + case SymbolDefinitionType.Control: + this.AddControlSymbol((ControlSymbol)symbol); break; - case TupleDefinitionType.Component: - this.AddComponentTuple((ComponentTuple)tuple); + case SymbolDefinitionType.Component: + this.AddComponentSymbol((ComponentSymbol)symbol); break; - case TupleDefinitionType.CustomAction: - this.AddCustomActionTuple((CustomActionTuple)tuple); + case SymbolDefinitionType.CustomAction: + this.AddCustomActionSymbol((CustomActionSymbol)symbol); break; - case TupleDefinitionType.Dialog: - this.AddDialogTuple((DialogTuple)tuple); + case SymbolDefinitionType.Dialog: + this.AddDialogSymbol((DialogSymbol)symbol); break; - case TupleDefinitionType.Directory: - this.AddDirectoryTuple((DirectoryTuple)tuple); + case SymbolDefinitionType.Directory: + this.AddDirectorySymbol((DirectorySymbol)symbol); break; - case TupleDefinitionType.Environment: - this.AddEnvironmentTuple((EnvironmentTuple)tuple); + case SymbolDefinitionType.Environment: + this.AddEnvironmentSymbol((EnvironmentSymbol)symbol); break; - case TupleDefinitionType.Error: - this.AddErrorTuple((ErrorTuple)tuple); + case SymbolDefinitionType.Error: + this.AddErrorSymbol((ErrorSymbol)symbol); break; - case TupleDefinitionType.Feature: - this.AddFeatureTuple((FeatureTuple)tuple); + case SymbolDefinitionType.Feature: + this.AddFeatureSymbol((FeatureSymbol)symbol); break; - case TupleDefinitionType.File: - this.AddFileTuple((FileTuple)tuple); + case SymbolDefinitionType.File: + this.AddFileSymbol((FileSymbol)symbol); break; - case TupleDefinitionType.IniFile: - this.AddIniFileTuple((IniFileTuple)tuple); + case SymbolDefinitionType.IniFile: + this.AddIniFileSymbol((IniFileSymbol)symbol); break; - case TupleDefinitionType.Media: - this.AddMediaTuple((MediaTuple)tuple); + case SymbolDefinitionType.Media: + this.AddMediaSymbol((MediaSymbol)symbol); break; - case TupleDefinitionType.ModuleConfiguration: - this.AddModuleConfigurationTuple((ModuleConfigurationTuple)tuple); + case SymbolDefinitionType.ModuleConfiguration: + this.AddModuleConfigurationSymbol((ModuleConfigurationSymbol)symbol); break; - case TupleDefinitionType.MsiEmbeddedUI: - this.AddMsiEmbeddedUITuple((MsiEmbeddedUITuple)tuple); + case SymbolDefinitionType.MsiEmbeddedUI: + this.AddMsiEmbeddedUISymbol((MsiEmbeddedUISymbol)symbol); break; - case TupleDefinitionType.MsiServiceConfig: - this.AddMsiServiceConfigTuple((MsiServiceConfigTuple)tuple); + case SymbolDefinitionType.MsiServiceConfig: + this.AddMsiServiceConfigSymbol((MsiServiceConfigSymbol)symbol); break; - case TupleDefinitionType.MsiServiceConfigFailureActions: - this.AddMsiServiceConfigFailureActionsTuple((MsiServiceConfigFailureActionsTuple)tuple); + case SymbolDefinitionType.MsiServiceConfigFailureActions: + this.AddMsiServiceConfigFailureActionsSymbol((MsiServiceConfigFailureActionsSymbol)symbol); break; - case TupleDefinitionType.MoveFile: - this.AddMoveFileTuple((MoveFileTuple)tuple); + case SymbolDefinitionType.MoveFile: + this.AddMoveFileSymbol((MoveFileSymbol)symbol); break; - case TupleDefinitionType.ProgId: - this.AddTupleDefaultly(tuple); + case SymbolDefinitionType.ProgId: + this.AddSymbolDefaultly(symbol); this.Output.EnsureTable(this.TableDefinitions["Extension"]); break; - case TupleDefinitionType.Property: - this.AddPropertyTuple((PropertyTuple)tuple); + case SymbolDefinitionType.Property: + this.AddPropertySymbol((PropertySymbol)symbol); break; - case TupleDefinitionType.RemoveFile: - this.AddRemoveFileTuple((RemoveFileTuple)tuple); + case SymbolDefinitionType.RemoveFile: + this.AddRemoveFileSymbol((RemoveFileSymbol)symbol); break; - case TupleDefinitionType.Registry: - this.AddRegistryTuple((RegistryTuple)tuple); + case SymbolDefinitionType.Registry: + this.AddRegistrySymbol((RegistrySymbol)symbol); break; - case TupleDefinitionType.RegLocator: - this.AddRegLocatorTuple((RegLocatorTuple)tuple); + case SymbolDefinitionType.RegLocator: + this.AddRegLocatorSymbol((RegLocatorSymbol)symbol); break; - case TupleDefinitionType.RemoveRegistry: - this.AddRemoveRegistryTuple((RemoveRegistryTuple)tuple); + case SymbolDefinitionType.RemoveRegistry: + this.AddRemoveRegistrySymbol((RemoveRegistrySymbol)symbol); break; - case TupleDefinitionType.ServiceControl: - this.AddServiceControlTuple((ServiceControlTuple)tuple); + case SymbolDefinitionType.ServiceControl: + this.AddServiceControlSymbol((ServiceControlSymbol)symbol); break; - case TupleDefinitionType.ServiceInstall: - this.AddServiceInstallTuple((ServiceInstallTuple)tuple); + case SymbolDefinitionType.ServiceInstall: + this.AddServiceInstallSymbol((ServiceInstallSymbol)symbol); break; - case TupleDefinitionType.Shortcut: - this.AddShortcutTuple((ShortcutTuple)tuple); + case SymbolDefinitionType.Shortcut: + this.AddShortcutSymbol((ShortcutSymbol)symbol); break; - case TupleDefinitionType.TextStyle: - this.AddTextStyleTuple((TextStyleTuple)tuple); + case SymbolDefinitionType.TextStyle: + this.AddTextStyleSymbol((TextStyleSymbol)symbol); break; - case TupleDefinitionType.Upgrade: - this.AddUpgradeTuple((UpgradeTuple)tuple); + case SymbolDefinitionType.Upgrade: + this.AddUpgradeSymbol((UpgradeSymbol)symbol); break; - case TupleDefinitionType.WixAction: - this.AddWixActionTuple((WixActionTuple)tuple); + case SymbolDefinitionType.WixAction: + this.AddWixActionSymbol((WixActionSymbol)symbol); break; - case TupleDefinitionType.WixCustomTableCell: - this.IndexCustomTableCellTuple((WixCustomTableCellTuple)tuple, cellsByTableAndRowId); + case SymbolDefinitionType.WixCustomTableCell: + this.IndexCustomTableCellSymbol((WixCustomTableCellSymbol)symbol, cellsByTableAndRowId); break; - case TupleDefinitionType.WixEnsureTable: - this.AddWixEnsureTableTuple((WixEnsureTableTuple)tuple); + case SymbolDefinitionType.WixEnsureTable: + this.AddWixEnsureTableSymbol((WixEnsureTableSymbol)symbol); break; - // Tuples used internally and are not added to the output. - case TupleDefinitionType.WixBuildInfo: - case TupleDefinitionType.WixBindUpdatedFiles: - case TupleDefinitionType.WixComponentGroup: - case TupleDefinitionType.WixComplexReference: - case TupleDefinitionType.WixDeltaPatchFile: - case TupleDefinitionType.WixDeltaPatchSymbolPaths: - case TupleDefinitionType.WixFragment: - case TupleDefinitionType.WixFeatureGroup: - case TupleDefinitionType.WixInstanceComponent: - case TupleDefinitionType.WixInstanceTransforms: - case TupleDefinitionType.WixFeatureModules: - case TupleDefinitionType.WixGroup: - case TupleDefinitionType.WixMediaTemplate: - case TupleDefinitionType.WixMerge: - case TupleDefinitionType.WixOrdering: - case TupleDefinitionType.WixPatchBaseline: - case TupleDefinitionType.WixPatchFamilyGroup: - case TupleDefinitionType.WixPatchId: - case TupleDefinitionType.WixPatchRef: - case TupleDefinitionType.WixPatchTarget: - case TupleDefinitionType.WixProperty: - case TupleDefinitionType.WixSimpleReference: - case TupleDefinitionType.WixSuppressAction: - case TupleDefinitionType.WixSuppressModularization: - case TupleDefinitionType.WixUI: - case TupleDefinitionType.WixVariable: + // Symbols used internally and are not added to the output. + case SymbolDefinitionType.WixBuildInfo: + case SymbolDefinitionType.WixBindUpdatedFiles: + case SymbolDefinitionType.WixComponentGroup: + case SymbolDefinitionType.WixComplexReference: + case SymbolDefinitionType.WixDeltaPatchFile: + case SymbolDefinitionType.WixDeltaPatchSymbolPaths: + case SymbolDefinitionType.WixFragment: + case SymbolDefinitionType.WixFeatureGroup: + case SymbolDefinitionType.WixInstanceComponent: + case SymbolDefinitionType.WixInstanceTransforms: + case SymbolDefinitionType.WixFeatureModules: + case SymbolDefinitionType.WixGroup: + case SymbolDefinitionType.WixMediaTemplate: + case SymbolDefinitionType.WixMerge: + case SymbolDefinitionType.WixOrdering: + case SymbolDefinitionType.WixPatchBaseline: + case SymbolDefinitionType.WixPatchFamilyGroup: + case SymbolDefinitionType.WixPatchId: + case SymbolDefinitionType.WixPatchRef: + case SymbolDefinitionType.WixPatchTarget: + case SymbolDefinitionType.WixProperty: + case SymbolDefinitionType.WixSimpleReference: + case SymbolDefinitionType.WixSuppressAction: + case SymbolDefinitionType.WixSuppressModularization: + case SymbolDefinitionType.WixUI: + case SymbolDefinitionType.WixVariable: break; // Already processed by LoadTableDefinitions. - case TupleDefinitionType.WixCustomTable: - case TupleDefinitionType.WixCustomTableColumn: + case SymbolDefinitionType.WixCustomTable: + case SymbolDefinitionType.WixCustomTableColumn: break; - case TupleDefinitionType.MustBeFromAnExtension: - unknownTuple = !this.AddTupleFromExtension(tuple); + case SymbolDefinitionType.MustBeFromAnExtension: + unknownSymbol = !this.AddSymbolFromExtension(symbol); break; default: - unknownTuple = !this.AddTupleDefaultly(tuple); + unknownSymbol = !this.AddSymbolDefaultly(symbol); break; } - if (unknownTuple) + if (unknownSymbol) { - this.Messaging.Write(WarningMessages.TupleNotTranslatedToOutput(tuple)); + this.Messaging.Write(WarningMessages.SymbolNotTranslatedToOutput(symbol)); } } - this.AddIndexedCellTuples(cellsByTableAndRowId); + this.AddIndexedCellSymbols(cellsByTableAndRowId); } - private void AddAssemblyTuple(AssemblyTuple tuple) + private void AddAssemblySymbol(AssemblySymbol symbol) { - var attributes = tuple.Type == AssemblyType.Win32Assembly ? 1 : (int?)null; + var attributes = symbol.Type == AssemblyType.Win32Assembly ? 1 : (int?)null; - var row = this.CreateRow(tuple, "MsiAssembly"); - row[0] = tuple.ComponentRef; - row[1] = tuple.FeatureRef; - row[2] = tuple.ManifestFileRef; - row[3] = tuple.ApplicationFileRef; + var row = this.CreateRow(symbol, "MsiAssembly"); + row[0] = symbol.ComponentRef; + row[1] = symbol.FeatureRef; + row[2] = symbol.ManifestFileRef; + row[3] = symbol.ApplicationFileRef; row[4] = attributes; } - private void AddBBControlTuple(BBControlTuple tuple) + private void AddBBControlSymbol(BBControlSymbol symbol) { - var attributes = tuple.Attributes; - attributes |= tuple.Enabled ? WindowsInstallerConstants.MsidbControlAttributesEnabled : 0; - attributes |= tuple.Indirect ? WindowsInstallerConstants.MsidbControlAttributesIndirect : 0; - attributes |= tuple.Integer ? WindowsInstallerConstants.MsidbControlAttributesInteger : 0; - attributes |= tuple.LeftScroll ? WindowsInstallerConstants.MsidbControlAttributesLeftScroll : 0; - attributes |= tuple.RightAligned ? WindowsInstallerConstants.MsidbControlAttributesRightAligned : 0; - attributes |= tuple.RightToLeft ? WindowsInstallerConstants.MsidbControlAttributesRTLRO : 0; - attributes |= tuple.Sunken ? WindowsInstallerConstants.MsidbControlAttributesSunken : 0; - attributes |= tuple.Visible ? WindowsInstallerConstants.MsidbControlAttributesVisible : 0; - - var row = this.CreateRow(tuple, "BBControl"); - row[0] = tuple.BillboardRef; - row[1] = tuple.BBControl; - row[2] = tuple.Type; - row[3] = tuple.X; - row[4] = tuple.Y; - row[5] = tuple.Width; - row[6] = tuple.Height; + var attributes = symbol.Attributes; + attributes |= symbol.Enabled ? WindowsInstallerConstants.MsidbControlAttributesEnabled : 0; + attributes |= symbol.Indirect ? WindowsInstallerConstants.MsidbControlAttributesIndirect : 0; + attributes |= symbol.Integer ? WindowsInstallerConstants.MsidbControlAttributesInteger : 0; + attributes |= symbol.LeftScroll ? WindowsInstallerConstants.MsidbControlAttributesLeftScroll : 0; + attributes |= symbol.RightAligned ? WindowsInstallerConstants.MsidbControlAttributesRightAligned : 0; + attributes |= symbol.RightToLeft ? WindowsInstallerConstants.MsidbControlAttributesRTLRO : 0; + attributes |= symbol.Sunken ? WindowsInstallerConstants.MsidbControlAttributesSunken : 0; + attributes |= symbol.Visible ? WindowsInstallerConstants.MsidbControlAttributesVisible : 0; + + var row = this.CreateRow(symbol, "BBControl"); + row[0] = symbol.BillboardRef; + row[1] = symbol.BBControl; + row[2] = symbol.Type; + row[3] = symbol.X; + row[4] = symbol.Y; + row[5] = symbol.Width; + row[6] = symbol.Height; row[7] = attributes; - row[8] = tuple.Text; + row[8] = symbol.Text; } - private void AddClassTuple(ClassTuple tuple) + private void AddClassSymbol(ClassSymbol symbol) { - var row = this.CreateRow(tuple, "Class"); - row[0] = tuple.CLSID; - row[1] = tuple.Context; - row[2] = tuple.ComponentRef; - row[3] = tuple.DefaultProgIdRef; - row[4] = tuple.Description; - row[5] = tuple.AppIdRef; - row[6] = tuple.FileTypeMask; - row[7] = tuple.IconRef; - row[8] = tuple.IconIndex; - row[9] = tuple.DefInprocHandler; - row[10] = tuple.Argument; - row[11] = tuple.FeatureRef; - row[12] = tuple.RelativePath ? (int?)1 : null; + var row = this.CreateRow(symbol, "Class"); + row[0] = symbol.CLSID; + row[1] = symbol.Context; + row[2] = symbol.ComponentRef; + row[3] = symbol.DefaultProgIdRef; + row[4] = symbol.Description; + row[5] = symbol.AppIdRef; + row[6] = symbol.FileTypeMask; + row[7] = symbol.IconRef; + row[8] = symbol.IconIndex; + row[9] = symbol.DefInprocHandler; + row[10] = symbol.Argument; + row[11] = symbol.FeatureRef; + row[12] = symbol.RelativePath ? (int?)1 : null; } - private void AddControlTuple(ControlTuple tuple) + private void AddControlSymbol(ControlSymbol symbol) { - var text = tuple.Text; - var attributes = tuple.Attributes; - attributes |= tuple.Enabled ? WindowsInstallerConstants.MsidbControlAttributesEnabled : 0; - attributes |= tuple.Indirect ? WindowsInstallerConstants.MsidbControlAttributesIndirect : 0; - attributes |= tuple.Integer ? WindowsInstallerConstants.MsidbControlAttributesInteger : 0; - attributes |= tuple.LeftScroll ? WindowsInstallerConstants.MsidbControlAttributesLeftScroll : 0; - attributes |= tuple.RightAligned ? WindowsInstallerConstants.MsidbControlAttributesRightAligned : 0; - attributes |= tuple.RightToLeft ? WindowsInstallerConstants.MsidbControlAttributesRTLRO : 0; - attributes |= tuple.Sunken ? WindowsInstallerConstants.MsidbControlAttributesSunken : 0; - attributes |= tuple.Visible ? WindowsInstallerConstants.MsidbControlAttributesVisible : 0; + var text = symbol.Text; + var attributes = symbol.Attributes; + attributes |= symbol.Enabled ? WindowsInstallerConstants.MsidbControlAttributesEnabled : 0; + attributes |= symbol.Indirect ? WindowsInstallerConstants.MsidbControlAttributesIndirect : 0; + attributes |= symbol.Integer ? WindowsInstallerConstants.MsidbControlAttributesInteger : 0; + attributes |= symbol.LeftScroll ? WindowsInstallerConstants.MsidbControlAttributesLeftScroll : 0; + attributes |= symbol.RightAligned ? WindowsInstallerConstants.MsidbControlAttributesRightAligned : 0; + attributes |= symbol.RightToLeft ? WindowsInstallerConstants.MsidbControlAttributesRTLRO : 0; + attributes |= symbol.Sunken ? WindowsInstallerConstants.MsidbControlAttributesSunken : 0; + attributes |= symbol.Visible ? WindowsInstallerConstants.MsidbControlAttributesVisible : 0; // If we're tracking disk space, and this is a non-FormatSize Text control, // and the text attribute starts with '[' and ends with ']', add a space. // It is not necessary for the whole string to be a property, just those // two characters matter. - if (tuple.TrackDiskSpace && - "Text" == tuple.Type && + if (symbol.TrackDiskSpace && + "Text" == symbol.Type && WindowsInstallerConstants.MsidbControlAttributesFormatSize != (attributes & WindowsInstallerConstants.MsidbControlAttributesFormatSize) && null != text && text.StartsWith("[", StringComparison.Ordinal) && text.EndsWith("]", StringComparison.Ordinal)) { text = String.Concat(text, " "); } - var row = this.CreateRow(tuple, "Control"); - row[0] = tuple.DialogRef; - row[1] = tuple.Control; - row[2] = tuple.Type; - row[3] = tuple.X; - row[4] = tuple.Y; - row[5] = tuple.Width; - row[6] = tuple.Height; + var row = this.CreateRow(symbol, "Control"); + row[0] = symbol.DialogRef; + row[1] = symbol.Control; + row[2] = symbol.Type; + row[3] = symbol.X; + row[4] = symbol.Y; + row[5] = symbol.Width; + row[6] = symbol.Height; row[7] = attributes; row[8] = text; - row[9] = tuple.NextControlRef; - row[10] = tuple.Help; + row[9] = symbol.NextControlRef; + row[10] = symbol.Help; } - private void AddComponentTuple(ComponentTuple tuple) + private void AddComponentSymbol(ComponentSymbol symbol) { - var attributes = ComponentLocation.Either == tuple.Location ? WindowsInstallerConstants.MsidbComponentAttributesOptional : 0; - attributes |= ComponentLocation.SourceOnly == tuple.Location ? WindowsInstallerConstants.MsidbComponentAttributesSourceOnly : 0; - attributes |= ComponentKeyPathType.Registry == tuple.KeyPathType ? WindowsInstallerConstants.MsidbComponentAttributesRegistryKeyPath : 0; - attributes |= ComponentKeyPathType.OdbcDataSource == tuple.KeyPathType ? WindowsInstallerConstants.MsidbComponentAttributesODBCDataSource : 0; - attributes |= tuple.DisableRegistryReflection ? WindowsInstallerConstants.MsidbComponentAttributesDisableRegistryReflection : 0; - attributes |= tuple.NeverOverwrite ? WindowsInstallerConstants.MsidbComponentAttributesNeverOverwrite : 0; - attributes |= tuple.Permanent ? WindowsInstallerConstants.MsidbComponentAttributesPermanent : 0; - attributes |= tuple.SharedDllRefCount ? WindowsInstallerConstants.MsidbComponentAttributesSharedDllRefCount : 0; - attributes |= tuple.Shared ? WindowsInstallerConstants.MsidbComponentAttributesShared : 0; - attributes |= tuple.Transitive ? WindowsInstallerConstants.MsidbComponentAttributesTransitive : 0; - attributes |= tuple.UninstallWhenSuperseded ? WindowsInstallerConstants.MsidbComponentAttributesUninstallOnSupersedence : 0; - attributes |= tuple.Win64 ? WindowsInstallerConstants.MsidbComponentAttributes64bit : 0; - - var row = this.CreateRow(tuple, "Component"); - row[0] = tuple.Id.Id; - row[1] = tuple.ComponentId; - row[2] = tuple.DirectoryRef; + var attributes = ComponentLocation.Either == symbol.Location ? WindowsInstallerConstants.MsidbComponentAttributesOptional : 0; + attributes |= ComponentLocation.SourceOnly == symbol.Location ? WindowsInstallerConstants.MsidbComponentAttributesSourceOnly : 0; + attributes |= ComponentKeyPathType.Registry == symbol.KeyPathType ? WindowsInstallerConstants.MsidbComponentAttributesRegistryKeyPath : 0; + attributes |= ComponentKeyPathType.OdbcDataSource == symbol.KeyPathType ? WindowsInstallerConstants.MsidbComponentAttributesODBCDataSource : 0; + attributes |= symbol.DisableRegistryReflection ? WindowsInstallerConstants.MsidbComponentAttributesDisableRegistryReflection : 0; + attributes |= symbol.NeverOverwrite ? WindowsInstallerConstants.MsidbComponentAttributesNeverOverwrite : 0; + attributes |= symbol.Permanent ? WindowsInstallerConstants.MsidbComponentAttributesPermanent : 0; + attributes |= symbol.SharedDllRefCount ? WindowsInstallerConstants.MsidbComponentAttributesSharedDllRefCount : 0; + attributes |= symbol.Shared ? WindowsInstallerConstants.MsidbComponentAttributesShared : 0; + attributes |= symbol.Transitive ? WindowsInstallerConstants.MsidbComponentAttributesTransitive : 0; + attributes |= symbol.UninstallWhenSuperseded ? WindowsInstallerConstants.MsidbComponentAttributesUninstallOnSupersedence : 0; + attributes |= symbol.Win64 ? WindowsInstallerConstants.MsidbComponentAttributes64bit : 0; + + var row = this.CreateRow(symbol, "Component"); + row[0] = symbol.Id.Id; + row[1] = symbol.ComponentId; + row[2] = symbol.DirectoryRef; row[3] = attributes; - row[4] = tuple.Condition; - row[5] = tuple.KeyPath; + row[4] = symbol.Condition; + row[5] = symbol.KeyPath; } - private void AddCustomActionTuple(CustomActionTuple tuple) + private void AddCustomActionSymbol(CustomActionSymbol symbol) { - var type = tuple.Win64 ? WindowsInstallerConstants.MsidbCustomActionType64BitScript : 0; - type |= tuple.IgnoreResult ? WindowsInstallerConstants.MsidbCustomActionTypeContinue : 0; - type |= tuple.Hidden ? WindowsInstallerConstants.MsidbCustomActionTypeHideTarget : 0; - type |= tuple.Async ? WindowsInstallerConstants.MsidbCustomActionTypeAsync : 0; - type |= CustomActionExecutionType.FirstSequence == tuple.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeFirstSequence : 0; - type |= CustomActionExecutionType.OncePerProcess == tuple.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeOncePerProcess : 0; - type |= CustomActionExecutionType.ClientRepeat == tuple.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeClientRepeat : 0; - type |= CustomActionExecutionType.Deferred == tuple.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeInScript : 0; - type |= CustomActionExecutionType.Rollback == tuple.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeInScript | WindowsInstallerConstants.MsidbCustomActionTypeRollback : 0; - type |= CustomActionExecutionType.Commit == tuple.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeInScript | WindowsInstallerConstants.MsidbCustomActionTypeCommit : 0; - type |= CustomActionSourceType.File == tuple.SourceType ? WindowsInstallerConstants.MsidbCustomActionTypeSourceFile : 0; - type |= CustomActionSourceType.Directory == tuple.SourceType ? WindowsInstallerConstants.MsidbCustomActionTypeDirectory : 0; - type |= CustomActionSourceType.Property == tuple.SourceType ? WindowsInstallerConstants.MsidbCustomActionTypeProperty : 0; - type |= CustomActionTargetType.Dll == tuple.TargetType ? WindowsInstallerConstants.MsidbCustomActionTypeDll : 0; - type |= CustomActionTargetType.Exe == tuple.TargetType ? WindowsInstallerConstants.MsidbCustomActionTypeExe : 0; - type |= CustomActionTargetType.TextData == tuple.TargetType ? WindowsInstallerConstants.MsidbCustomActionTypeTextData : 0; - type |= CustomActionTargetType.JScript == tuple.TargetType ? WindowsInstallerConstants.MsidbCustomActionTypeJScript : 0; - type |= CustomActionTargetType.VBScript == tuple.TargetType ? WindowsInstallerConstants.MsidbCustomActionTypeVBScript : 0; + var type = symbol.Win64 ? WindowsInstallerConstants.MsidbCustomActionType64BitScript : 0; + type |= symbol.IgnoreResult ? WindowsInstallerConstants.MsidbCustomActionTypeContinue : 0; + type |= symbol.Hidden ? WindowsInstallerConstants.MsidbCustomActionTypeHideTarget : 0; + type |= symbol.Async ? WindowsInstallerConstants.MsidbCustomActionTypeAsync : 0; + type |= CustomActionExecutionType.FirstSequence == symbol.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeFirstSequence : 0; + type |= CustomActionExecutionType.OncePerProcess == symbol.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeOncePerProcess : 0; + type |= CustomActionExecutionType.ClientRepeat == symbol.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeClientRepeat : 0; + type |= CustomActionExecutionType.Deferred == symbol.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeInScript : 0; + type |= CustomActionExecutionType.Rollback == symbol.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeInScript | WindowsInstallerConstants.MsidbCustomActionTypeRollback : 0; + type |= CustomActionExecutionType.Commit == symbol.ExecutionType ? WindowsInstallerConstants.MsidbCustomActionTypeInScript | WindowsInstallerConstants.MsidbCustomActionTypeCommit : 0; + type |= CustomActionSourceType.File == symbol.SourceType ? WindowsInstallerConstants.MsidbCustomActionTypeSourceFile : 0; + type |= CustomActionSourceType.Directory == symbol.SourceType ? WindowsInstallerConstants.MsidbCustomActionTypeDirectory : 0; + type |= CustomActionSourceType.Property == symbol.SourceType ? WindowsInstallerConstants.MsidbCustomActionTypeProperty : 0; + type |= CustomActionTargetType.Dll == symbol.TargetType ? WindowsInstallerConstants.MsidbCustomActionTypeDll : 0; + type |= CustomActionTargetType.Exe == symbol.TargetType ? WindowsInstallerConstants.MsidbCustomActionTypeExe : 0; + type |= CustomActionTargetType.TextData == symbol.TargetType ? WindowsInstallerConstants.MsidbCustomActionTypeTextData : 0; + type |= CustomActionTargetType.JScript == symbol.TargetType ? WindowsInstallerConstants.MsidbCustomActionTypeJScript : 0; + type |= CustomActionTargetType.VBScript == symbol.TargetType ? WindowsInstallerConstants.MsidbCustomActionTypeVBScript : 0; if (WindowsInstallerConstants.MsidbCustomActionTypeInScript == (type & WindowsInstallerConstants.MsidbCustomActionTypeInScript)) { - type |= tuple.Impersonate ? 0 : WindowsInstallerConstants.MsidbCustomActionTypeNoImpersonate; - type |= tuple.TSAware ? WindowsInstallerConstants.MsidbCustomActionTypeTSAware : 0; + type |= symbol.Impersonate ? 0 : WindowsInstallerConstants.MsidbCustomActionTypeNoImpersonate; + type |= symbol.TSAware ? WindowsInstallerConstants.MsidbCustomActionTypeTSAware : 0; } - var row = this.CreateRow(tuple, "CustomAction"); - row[0] = tuple.Id.Id; + var row = this.CreateRow(symbol, "CustomAction"); + row[0] = symbol.Id.Id; row[1] = type; - row[2] = tuple.Source; - row[3] = tuple.Target; - row[4] = tuple.PatchUninstall ? (int?)WindowsInstallerConstants.MsidbCustomActionTypePatchUninstall : null; + row[2] = symbol.Source; + row[3] = symbol.Target; + row[4] = symbol.PatchUninstall ? (int?)WindowsInstallerConstants.MsidbCustomActionTypePatchUninstall : null; } - private void AddDialogTuple(DialogTuple tuple) + private void AddDialogSymbol(DialogSymbol symbol) { - var attributes = tuple.Visible ? WindowsInstallerConstants.MsidbDialogAttributesVisible : 0; - attributes |= tuple.Modal ? WindowsInstallerConstants.MsidbDialogAttributesModal : 0; - attributes |= tuple.Minimize ? WindowsInstallerConstants.MsidbDialogAttributesMinimize : 0; - attributes |= tuple.CustomPalette ? WindowsInstallerConstants.MsidbDialogAttributesUseCustomPalette : 0; - attributes |= tuple.ErrorDialog ? WindowsInstallerConstants.MsidbDialogAttributesError : 0; - attributes |= tuple.LeftScroll ? WindowsInstallerConstants.MsidbDialogAttributesLeftScroll : 0; - attributes |= tuple.KeepModeless ? WindowsInstallerConstants.MsidbDialogAttributesKeepModeless : 0; - attributes |= tuple.RightAligned ? WindowsInstallerConstants.MsidbDialogAttributesRightAligned : 0; - attributes |= tuple.RightToLeft ? WindowsInstallerConstants.MsidbDialogAttributesRTLRO : 0; - attributes |= tuple.SystemModal ? WindowsInstallerConstants.MsidbDialogAttributesSysModal : 0; - attributes |= tuple.TrackDiskSpace ? WindowsInstallerConstants.MsidbDialogAttributesTrackDiskSpace : 0; - - var row = this.CreateRow(tuple, "Dialog"); - row[0] = tuple.Id.Id; - row[1] = tuple.HCentering; - row[2] = tuple.VCentering; - row[3] = tuple.Width; - row[4] = tuple.Height; + var attributes = symbol.Visible ? WindowsInstallerConstants.MsidbDialogAttributesVisible : 0; + attributes |= symbol.Modal ? WindowsInstallerConstants.MsidbDialogAttributesModal : 0; + attributes |= symbol.Minimize ? WindowsInstallerConstants.MsidbDialogAttributesMinimize : 0; + attributes |= symbol.CustomPalette ? WindowsInstallerConstants.MsidbDialogAttributesUseCustomPalette : 0; + attributes |= symbol.ErrorDialog ? WindowsInstallerConstants.MsidbDialogAttributesError : 0; + attributes |= symbol.LeftScroll ? WindowsInstallerConstants.MsidbDialogAttributesLeftScroll : 0; + attributes |= symbol.KeepModeless ? WindowsInstallerConstants.MsidbDialogAttributesKeepModeless : 0; + attributes |= symbol.RightAligned ? WindowsInstallerConstants.MsidbDialogAttributesRightAligned : 0; + attributes |= symbol.RightToLeft ? WindowsInstallerConstants.MsidbDialogAttributesRTLRO : 0; + attributes |= symbol.SystemModal ? WindowsInstallerConstants.MsidbDialogAttributesSysModal : 0; + attributes |= symbol.TrackDiskSpace ? WindowsInstallerConstants.MsidbDialogAttributesTrackDiskSpace : 0; + + var row = this.CreateRow(symbol, "Dialog"); + row[0] = symbol.Id.Id; + row[1] = symbol.HCentering; + row[2] = symbol.VCentering; + row[3] = symbol.Width; + row[4] = symbol.Height; row[5] = attributes; - row[6] = tuple.Title; - row[7] = tuple.FirstControlRef; - row[8] = tuple.DefaultControlRef; - row[9] = tuple.CancelControlRef; + row[6] = symbol.Title; + row[7] = symbol.FirstControlRef; + row[8] = symbol.DefaultControlRef; + row[9] = symbol.CancelControlRef; this.Output.EnsureTable(this.TableDefinitions["ListBox"]); } - private void AddDirectoryTuple(DirectoryTuple tuple) + private void AddDirectorySymbol(DirectorySymbol symbol) { - var sourceName = GetMsiFilenameValue(tuple.SourceShortName, tuple.SourceName); - var targetName = GetMsiFilenameValue(tuple.ShortName, tuple.Name); + var sourceName = GetMsiFilenameValue(symbol.SourceShortName, symbol.SourceName); + var targetName = GetMsiFilenameValue(symbol.ShortName, symbol.Name); if (String.IsNullOrEmpty(targetName)) { @@ -439,20 +439,20 @@ namespace WixToolset.Core.WindowsInstaller.Bind var defaultDir = String.IsNullOrEmpty(sourceName) ? targetName : targetName + ":" + sourceName; - var row = this.CreateRow(tuple, "Directory"); - row[0] = tuple.Id.Id; - row[1] = tuple.ParentDirectoryRef; + var row = this.CreateRow(symbol, "Directory"); + row[0] = symbol.Id.Id; + row[1] = symbol.ParentDirectoryRef; row[2] = defaultDir; } - private void AddEnvironmentTuple(EnvironmentTuple tuple) + private void AddEnvironmentSymbol(EnvironmentSymbol symbol) { var action = String.Empty; - var system = tuple.System ? "*" : String.Empty; - var uninstall = tuple.Permanent ? String.Empty : "-"; - var value = tuple.Value; + var system = symbol.System ? "*" : String.Empty; + var uninstall = symbol.Permanent ? String.Empty : "-"; + var value = symbol.Value; - switch (tuple.Action) + switch (symbol.Action) { case EnvironmentActionType.Create: action = "+"; @@ -465,219 +465,219 @@ namespace WixToolset.Core.WindowsInstaller.Bind break; } - switch (tuple.Part) + switch (symbol.Part) { case EnvironmentPartType.First: - value = String.Concat(value, tuple.Separator, "[~]"); + value = String.Concat(value, symbol.Separator, "[~]"); break; case EnvironmentPartType.Last: - value = String.Concat("[~]", tuple.Separator, value); + value = String.Concat("[~]", symbol.Separator, value); break; } - var row = this.CreateRow(tuple, "Environment"); - row[0] = tuple.Id.Id; - row[1] = String.Concat(action, uninstall, system, tuple.Name); + var row = this.CreateRow(symbol, "Environment"); + row[0] = symbol.Id.Id; + row[1] = String.Concat(action, uninstall, system, symbol.Name); row[2] = value; - row[3] = tuple.ComponentRef; + row[3] = symbol.ComponentRef; } - private void AddErrorTuple(ErrorTuple tuple) + private void AddErrorSymbol(ErrorSymbol symbol) { - var row = this.CreateRow(tuple, "Error"); - row[0] = Convert.ToInt32(tuple.Id.Id); - row[1] = tuple.Message; + var row = this.CreateRow(symbol, "Error"); + row[0] = Convert.ToInt32(symbol.Id.Id); + row[1] = symbol.Message; } - private void AddFeatureTuple(FeatureTuple tuple) + private void AddFeatureSymbol(FeatureSymbol symbol) { - var attributes = tuple.DisallowAbsent ? WindowsInstallerConstants.MsidbFeatureAttributesUIDisallowAbsent : 0; - attributes |= tuple.DisallowAdvertise ? WindowsInstallerConstants.MsidbFeatureAttributesDisallowAdvertise : 0; - attributes |= FeatureInstallDefault.FollowParent == tuple.InstallDefault ? WindowsInstallerConstants.MsidbFeatureAttributesFollowParent : 0; - attributes |= FeatureInstallDefault.Source == tuple.InstallDefault ? WindowsInstallerConstants.MsidbFeatureAttributesFavorSource : 0; - attributes |= FeatureTypicalDefault.Advertise == tuple.TypicalDefault ? WindowsInstallerConstants.MsidbFeatureAttributesFavorAdvertise : 0; - - var row = this.CreateRow(tuple, "Feature"); - row[0] = tuple.Id.Id; - row[1] = tuple.ParentFeatureRef; - row[2] = tuple.Title; - row[3] = tuple.Description; - row[4] = tuple.Display; - row[5] = tuple.Level; - row[6] = tuple.DirectoryRef; + var attributes = symbol.DisallowAbsent ? WindowsInstallerConstants.MsidbFeatureAttributesUIDisallowAbsent : 0; + attributes |= symbol.DisallowAdvertise ? WindowsInstallerConstants.MsidbFeatureAttributesDisallowAdvertise : 0; + attributes |= FeatureInstallDefault.FollowParent == symbol.InstallDefault ? WindowsInstallerConstants.MsidbFeatureAttributesFollowParent : 0; + attributes |= FeatureInstallDefault.Source == symbol.InstallDefault ? WindowsInstallerConstants.MsidbFeatureAttributesFavorSource : 0; + attributes |= FeatureTypicalDefault.Advertise == symbol.TypicalDefault ? WindowsInstallerConstants.MsidbFeatureAttributesFavorAdvertise : 0; + + var row = this.CreateRow(symbol, "Feature"); + row[0] = symbol.Id.Id; + row[1] = symbol.ParentFeatureRef; + row[2] = symbol.Title; + row[3] = symbol.Description; + row[4] = symbol.Display; + row[5] = symbol.Level; + row[6] = symbol.DirectoryRef; row[7] = attributes; } - private void AddFileTuple(FileTuple tuple) + private void AddFileSymbol(FileSymbol symbol) { - var row = (FileRow)this.CreateRow(tuple, "File"); - row.File = tuple.Id.Id; - row.Component = tuple.ComponentRef; - row.FileName = GetMsiFilenameValue(tuple.ShortName, tuple.Name); - row.FileSize = tuple.FileSize; - row.Version = tuple.Version; - row.Language = tuple.Language; - row.DiskId = tuple.DiskId ?? 1; // TODO: is 1 the correct thing to default here - row.Sequence = tuple.Sequence; - row.Source = tuple.Source.Path; - - var attributes = (tuple.Attributes & FileTupleAttributes.Checksum) == FileTupleAttributes.Checksum ? WindowsInstallerConstants.MsidbFileAttributesChecksum : 0; - attributes |= (tuple.Attributes & FileTupleAttributes.Compressed) == FileTupleAttributes.Compressed ? WindowsInstallerConstants.MsidbFileAttributesCompressed : 0; - attributes |= (tuple.Attributes & FileTupleAttributes.Uncompressed) == FileTupleAttributes.Uncompressed ? WindowsInstallerConstants.MsidbFileAttributesNoncompressed : 0; - attributes |= (tuple.Attributes & FileTupleAttributes.Hidden) == FileTupleAttributes.Hidden ? WindowsInstallerConstants.MsidbFileAttributesHidden : 0; - attributes |= (tuple.Attributes & FileTupleAttributes.ReadOnly) == FileTupleAttributes.ReadOnly ? WindowsInstallerConstants.MsidbFileAttributesReadOnly : 0; - attributes |= (tuple.Attributes & FileTupleAttributes.System) == FileTupleAttributes.System ? WindowsInstallerConstants.MsidbFileAttributesSystem : 0; - attributes |= (tuple.Attributes & FileTupleAttributes.Vital) == FileTupleAttributes.Vital ? WindowsInstallerConstants.MsidbFileAttributesVital : 0; + var row = (FileRow)this.CreateRow(symbol, "File"); + row.File = symbol.Id.Id; + row.Component = symbol.ComponentRef; + row.FileName = GetMsiFilenameValue(symbol.ShortName, symbol.Name); + row.FileSize = symbol.FileSize; + row.Version = symbol.Version; + row.Language = symbol.Language; + row.DiskId = symbol.DiskId ?? 1; // TODO: is 1 the correct thing to default here + row.Sequence = symbol.Sequence; + row.Source = symbol.Source.Path; + + var attributes = (symbol.Attributes & FileSymbolAttributes.Checksum) == FileSymbolAttributes.Checksum ? WindowsInstallerConstants.MsidbFileAttributesChecksum : 0; + attributes |= (symbol.Attributes & FileSymbolAttributes.Compressed) == FileSymbolAttributes.Compressed ? WindowsInstallerConstants.MsidbFileAttributesCompressed : 0; + attributes |= (symbol.Attributes & FileSymbolAttributes.Uncompressed) == FileSymbolAttributes.Uncompressed ? WindowsInstallerConstants.MsidbFileAttributesNoncompressed : 0; + attributes |= (symbol.Attributes & FileSymbolAttributes.Hidden) == FileSymbolAttributes.Hidden ? WindowsInstallerConstants.MsidbFileAttributesHidden : 0; + attributes |= (symbol.Attributes & FileSymbolAttributes.ReadOnly) == FileSymbolAttributes.ReadOnly ? WindowsInstallerConstants.MsidbFileAttributesReadOnly : 0; + attributes |= (symbol.Attributes & FileSymbolAttributes.System) == FileSymbolAttributes.System ? WindowsInstallerConstants.MsidbFileAttributesSystem : 0; + attributes |= (symbol.Attributes & FileSymbolAttributes.Vital) == FileSymbolAttributes.Vital ? WindowsInstallerConstants.MsidbFileAttributesVital : 0; row.Attributes = attributes; - if (tuple.FontTitle != null) + if (symbol.FontTitle != null) { - var fontRow = this.CreateRow(tuple, "Font"); - fontRow[0] = tuple.Id.Id; - fontRow[1] = tuple.FontTitle; + var fontRow = this.CreateRow(symbol, "Font"); + fontRow[0] = symbol.Id.Id; + fontRow[1] = symbol.FontTitle; } - if (tuple.SelfRegCost.HasValue) + if (symbol.SelfRegCost.HasValue) { - var selfRegRow = this.CreateRow(tuple, "SelfReg"); - selfRegRow[0] = tuple.Id.Id; - selfRegRow[1] = tuple.SelfRegCost.Value; + var selfRegRow = this.CreateRow(symbol, "SelfReg"); + selfRegRow[0] = symbol.Id.Id; + selfRegRow[1] = symbol.SelfRegCost.Value; } } - private void AddIniFileTuple(IniFileTuple tuple) + private void AddIniFileSymbol(IniFileSymbol symbol) { - var tableName = (InifFileActionType.AddLine == tuple.Action || InifFileActionType.AddTag == tuple.Action || InifFileActionType.CreateLine == tuple.Action) ? "IniFile" : "RemoveIniFile"; - - var row = this.CreateRow(tuple, tableName); - row[0] = tuple.Id.Id; - row[1] = tuple.FileName; - row[2] = tuple.DirProperty; - row[3] = tuple.Section; - row[4] = tuple.Key; - row[5] = tuple.Value; - row[6] = tuple.Action; - row[7] = tuple.ComponentRef; + var tableName = (InifFileActionType.AddLine == symbol.Action || InifFileActionType.AddTag == symbol.Action || InifFileActionType.CreateLine == symbol.Action) ? "IniFile" : "RemoveIniFile"; + + var row = this.CreateRow(symbol, tableName); + row[0] = symbol.Id.Id; + row[1] = symbol.FileName; + row[2] = symbol.DirProperty; + row[3] = symbol.Section; + row[4] = symbol.Key; + row[5] = symbol.Value; + row[6] = symbol.Action; + row[7] = symbol.ComponentRef; } - private void AddMediaTuple(MediaTuple tuple) + private void AddMediaSymbol(MediaSymbol symbol) { if (this.Section.Type != SectionType.Module) { - var row = (MediaRow)this.CreateRow(tuple, "Media"); - row.DiskId = tuple.DiskId; - row.LastSequence = tuple.LastSequence ?? 0; - row.DiskPrompt = tuple.DiskPrompt; - row.Cabinet = tuple.Cabinet; - row.VolumeLabel = tuple.VolumeLabel; - row.Source = tuple.Source; + var row = (MediaRow)this.CreateRow(symbol, "Media"); + row.DiskId = symbol.DiskId; + row.LastSequence = symbol.LastSequence ?? 0; + row.DiskPrompt = symbol.DiskPrompt; + row.Cabinet = symbol.Cabinet; + row.VolumeLabel = symbol.VolumeLabel; + row.Source = symbol.Source; } } - private void AddModuleConfigurationTuple(ModuleConfigurationTuple tuple) + private void AddModuleConfigurationSymbol(ModuleConfigurationSymbol symbol) { - var row = this.CreateRow(tuple, "ModuleConfiguration"); - row[0] = tuple.Id.Id; - row[1] = tuple.Format; - row[2] = tuple.Type; - row[3] = tuple.ContextData; - row[4] = tuple.DefaultValue; - row[5] = (tuple.KeyNoOrphan ? WindowsInstallerConstants.MsidbMsmConfigurableOptionKeyNoOrphan : 0) | - (tuple.NonNullable ? WindowsInstallerConstants.MsidbMsmConfigurableOptionNonNullable : 0); - row[6] = tuple.DisplayName; - row[7] = tuple.Description; - row[8] = tuple.HelpLocation; - row[9] = tuple.HelpKeyword; + var row = this.CreateRow(symbol, "ModuleConfiguration"); + row[0] = symbol.Id.Id; + row[1] = symbol.Format; + row[2] = symbol.Type; + row[3] = symbol.ContextData; + row[4] = symbol.DefaultValue; + row[5] = (symbol.KeyNoOrphan ? WindowsInstallerConstants.MsidbMsmConfigurableOptionKeyNoOrphan : 0) | + (symbol.NonNullable ? WindowsInstallerConstants.MsidbMsmConfigurableOptionNonNullable : 0); + row[6] = symbol.DisplayName; + row[7] = symbol.Description; + row[8] = symbol.HelpLocation; + row[9] = symbol.HelpKeyword; } - private void AddMsiEmbeddedUITuple(MsiEmbeddedUITuple tuple) + private void AddMsiEmbeddedUISymbol(MsiEmbeddedUISymbol symbol) { - var attributes = tuple.EntryPoint ? WindowsInstallerConstants.MsidbEmbeddedUI : 0; - attributes |= tuple.SupportsBasicUI ? WindowsInstallerConstants.MsidbEmbeddedHandlesBasic : 0; + var attributes = symbol.EntryPoint ? WindowsInstallerConstants.MsidbEmbeddedUI : 0; + attributes |= symbol.SupportsBasicUI ? WindowsInstallerConstants.MsidbEmbeddedHandlesBasic : 0; - var row = this.CreateRow(tuple, "MsiEmbeddedUI"); - row[0] = tuple.Id.Id; - row[1] = tuple.FileName; + var row = this.CreateRow(symbol, "MsiEmbeddedUI"); + row[0] = symbol.Id.Id; + row[1] = symbol.FileName; row[2] = attributes; - row[3] = tuple.MessageFilter; - row[4] = tuple.Source; + row[3] = symbol.MessageFilter; + row[4] = symbol.Source; } - private void AddMsiServiceConfigTuple(MsiServiceConfigTuple tuple) + private void AddMsiServiceConfigSymbol(MsiServiceConfigSymbol symbol) { - var events = tuple.OnInstall ? WindowsInstallerConstants.MsidbServiceConfigEventInstall : 0; - events |= tuple.OnReinstall ? WindowsInstallerConstants.MsidbServiceConfigEventReinstall : 0; - events |= tuple.OnUninstall ? WindowsInstallerConstants.MsidbServiceConfigEventUninstall : 0; + var events = symbol.OnInstall ? WindowsInstallerConstants.MsidbServiceConfigEventInstall : 0; + events |= symbol.OnReinstall ? WindowsInstallerConstants.MsidbServiceConfigEventReinstall : 0; + events |= symbol.OnUninstall ? WindowsInstallerConstants.MsidbServiceConfigEventUninstall : 0; - var row = this.CreateRow(tuple, "MsiServiceConfigFailureActions"); - row[0] = tuple.Id.Id; - row[1] = tuple.Name; + var row = this.CreateRow(symbol, "MsiServiceConfigFailureActions"); + row[0] = symbol.Id.Id; + row[1] = symbol.Name; row[2] = events; - row[3] = tuple.ConfigType; - row[4] = tuple.Argument; - row[5] = tuple.ComponentRef; + row[3] = symbol.ConfigType; + row[4] = symbol.Argument; + row[5] = symbol.ComponentRef; } - private void AddMsiServiceConfigFailureActionsTuple(MsiServiceConfigFailureActionsTuple tuple) + private void AddMsiServiceConfigFailureActionsSymbol(MsiServiceConfigFailureActionsSymbol symbol) { - var events = tuple.OnInstall ? WindowsInstallerConstants.MsidbServiceConfigEventInstall : 0; - events |= tuple.OnReinstall ? WindowsInstallerConstants.MsidbServiceConfigEventReinstall : 0; - events |= tuple.OnUninstall ? WindowsInstallerConstants.MsidbServiceConfigEventUninstall : 0; + var events = symbol.OnInstall ? WindowsInstallerConstants.MsidbServiceConfigEventInstall : 0; + events |= symbol.OnReinstall ? WindowsInstallerConstants.MsidbServiceConfigEventReinstall : 0; + events |= symbol.OnUninstall ? WindowsInstallerConstants.MsidbServiceConfigEventUninstall : 0; - var row = this.CreateRow(tuple, "MsiServiceConfig"); - row[0] = tuple.Id.Id; - row[1] = tuple.Name; + var row = this.CreateRow(symbol, "MsiServiceConfig"); + row[0] = symbol.Id.Id; + row[1] = symbol.Name; row[2] = events; - row[3] = tuple.ResetPeriod.HasValue ? tuple.ResetPeriod : null; - row[4] = tuple.RebootMessage ?? "[~]"; - row[5] = tuple.Command ?? "[~]"; - row[6] = tuple.Actions; - row[7] = tuple.DelayActions; - row[8] = tuple.ComponentRef; + row[3] = symbol.ResetPeriod.HasValue ? symbol.ResetPeriod : null; + row[4] = symbol.RebootMessage ?? "[~]"; + row[5] = symbol.Command ?? "[~]"; + row[6] = symbol.Actions; + row[7] = symbol.DelayActions; + row[8] = symbol.ComponentRef; } - private void AddMoveFileTuple(MoveFileTuple tuple) + private void AddMoveFileSymbol(MoveFileSymbol symbol) { - var row = this.CreateRow(tuple, "MoveFile"); - row[0] = tuple.Id.Id; - row[1] = tuple.ComponentRef; - row[2] = tuple.SourceName; - row[3] = tuple.DestName; - row[4] = tuple.SourceFolder; - row[5] = tuple.DestFolder; - row[6] = tuple.Delete ? WindowsInstallerConstants.MsidbMoveFileOptionsMove : 0; + var row = this.CreateRow(symbol, "MoveFile"); + row[0] = symbol.Id.Id; + row[1] = symbol.ComponentRef; + row[2] = symbol.SourceName; + row[3] = symbol.DestName; + row[4] = symbol.SourceFolder; + row[5] = symbol.DestFolder; + row[6] = symbol.Delete ? WindowsInstallerConstants.MsidbMoveFileOptionsMove : 0; } - private void AddPropertyTuple(PropertyTuple tuple) + private void AddPropertySymbol(PropertySymbol symbol) { - if (String.IsNullOrEmpty(tuple.Value)) + if (String.IsNullOrEmpty(symbol.Value)) { return; } - var row = (PropertyRow)this.CreateRow(tuple, "Property"); - row.Property = tuple.Id.Id; - row.Value = tuple.Value; + var row = (PropertyRow)this.CreateRow(symbol, "Property"); + row.Property = symbol.Id.Id; + row.Value = symbol.Value; } - private void AddRemoveFileTuple(RemoveFileTuple tuple) + private void AddRemoveFileSymbol(RemoveFileSymbol symbol) { - var installMode = tuple.OnInstall == true ? WindowsInstallerConstants.MsidbRemoveFileInstallModeOnInstall : 0; - installMode |= tuple.OnUninstall == true ? WindowsInstallerConstants.MsidbRemoveFileInstallModeOnRemove : 0; - - var row = this.CreateRow(tuple, "RemoveFile"); - row[0] = tuple.Id.Id; - row[1] = tuple.ComponentRef; - row[2] = tuple.FileName; - row[3] = tuple.DirProperty; + var installMode = symbol.OnInstall == true ? WindowsInstallerConstants.MsidbRemoveFileInstallModeOnInstall : 0; + installMode |= symbol.OnUninstall == true ? WindowsInstallerConstants.MsidbRemoveFileInstallModeOnRemove : 0; + + var row = this.CreateRow(symbol, "RemoveFile"); + row[0] = symbol.Id.Id; + row[1] = symbol.ComponentRef; + row[2] = symbol.FileName; + row[3] = symbol.DirProperty; row[4] = installMode; } - private void AddRegistryTuple(RegistryTuple tuple) + private void AddRegistrySymbol(RegistrySymbol symbol) { - var value = tuple.Value; + var value = symbol.Value; - switch (tuple.ValueType) + switch (symbol.ValueType) { case RegistryValueType.Binary: value = String.Concat("#x", value); @@ -689,7 +689,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind value = String.Concat("#", value); break; case RegistryValueType.MultiString: - switch (tuple.ValueAction) + switch (symbol.ValueAction) { case RegistryValueActionType.Append: value = String.Concat("[~]", value); @@ -715,164 +715,164 @@ namespace WixToolset.Core.WindowsInstaller.Bind break; } - var row = this.CreateRow(tuple, "Registry"); - row[0] = tuple.Id.Id; - row[1] = tuple.Root; - row[2] = tuple.Key; - row[3] = tuple.Name; + var row = this.CreateRow(symbol, "Registry"); + row[0] = symbol.Id.Id; + row[1] = symbol.Root; + row[2] = symbol.Key; + row[3] = symbol.Name; row[4] = value; - row[5] = tuple.ComponentRef; + row[5] = symbol.ComponentRef; } - private void AddRegLocatorTuple(RegLocatorTuple tuple) + private void AddRegLocatorSymbol(RegLocatorSymbol symbol) { - var type = (int)tuple.Type; - type |= tuple.Win64 ? WindowsInstallerConstants.MsidbLocatorType64bit : 0; - - var row = this.CreateRow(tuple, "RegLocator"); - row[0] = tuple.Id.Id; - row[1] = tuple.Root; - row[2] = tuple.Key; - row[3] = tuple.Name; + var type = (int)symbol.Type; + type |= symbol.Win64 ? WindowsInstallerConstants.MsidbLocatorType64bit : 0; + + var row = this.CreateRow(symbol, "RegLocator"); + row[0] = symbol.Id.Id; + row[1] = symbol.Root; + row[2] = symbol.Key; + row[3] = symbol.Name; row[4] = type; } - private void AddRemoveRegistryTuple(RemoveRegistryTuple tuple) + private void AddRemoveRegistrySymbol(RemoveRegistrySymbol symbol) { - if (tuple.Action == RemoveRegistryActionType.RemoveOnInstall) + if (symbol.Action == RemoveRegistryActionType.RemoveOnInstall) { - var row = this.CreateRow(tuple, "RemoveRegistry"); - row[0] = tuple.Id.Id; - row[1] = tuple.Root; - row[2] = tuple.Key; - row[3] = tuple.Name; - row[4] = tuple.ComponentRef; + var row = this.CreateRow(symbol, "RemoveRegistry"); + row[0] = symbol.Id.Id; + row[1] = symbol.Root; + row[2] = symbol.Key; + row[3] = symbol.Name; + row[4] = symbol.ComponentRef; } else // Registry table is used to remove registry keys on uninstall. { - var row = this.CreateRow(tuple, "Registry"); - row[0] = tuple.Id.Id; - row[1] = tuple.Root; - row[2] = tuple.Key; - row[3] = tuple.Name; - row[5] = tuple.ComponentRef; + var row = this.CreateRow(symbol, "Registry"); + row[0] = symbol.Id.Id; + row[1] = symbol.Root; + row[2] = symbol.Key; + row[3] = symbol.Name; + row[5] = symbol.ComponentRef; } } - private void AddServiceControlTuple(ServiceControlTuple tuple) + private void AddServiceControlSymbol(ServiceControlSymbol symbol) { - var events = tuple.InstallRemove ? WindowsInstallerConstants.MsidbServiceControlEventDelete : 0; - events |= tuple.UninstallRemove ? WindowsInstallerConstants.MsidbServiceControlEventUninstallDelete : 0; - events |= tuple.InstallStart ? WindowsInstallerConstants.MsidbServiceControlEventStart : 0; - events |= tuple.UninstallStart ? WindowsInstallerConstants.MsidbServiceControlEventUninstallStart : 0; - events |= tuple.InstallStop ? WindowsInstallerConstants.MsidbServiceControlEventStop : 0; - events |= tuple.UninstallStop ? WindowsInstallerConstants.MsidbServiceControlEventUninstallStop : 0; - - var row = this.CreateRow(tuple, "ServiceControl"); - row[0] = tuple.Id.Id; - row[1] = tuple.Name; + var events = symbol.InstallRemove ? WindowsInstallerConstants.MsidbServiceControlEventDelete : 0; + events |= symbol.UninstallRemove ? WindowsInstallerConstants.MsidbServiceControlEventUninstallDelete : 0; + events |= symbol.InstallStart ? WindowsInstallerConstants.MsidbServiceControlEventStart : 0; + events |= symbol.UninstallStart ? WindowsInstallerConstants.MsidbServiceControlEventUninstallStart : 0; + events |= symbol.InstallStop ? WindowsInstallerConstants.MsidbServiceControlEventStop : 0; + events |= symbol.UninstallStop ? WindowsInstallerConstants.MsidbServiceControlEventUninstallStop : 0; + + var row = this.CreateRow(symbol, "ServiceControl"); + row[0] = symbol.Id.Id; + row[1] = symbol.Name; row[2] = events; - row[3] = tuple.Arguments; - if (tuple.Wait.HasValue) + row[3] = symbol.Arguments; + if (symbol.Wait.HasValue) { - row[4] = tuple.Wait.Value ? 1 : 0; + row[4] = symbol.Wait.Value ? 1 : 0; } - row[5] = tuple.ComponentRef; + row[5] = symbol.ComponentRef; } - private void AddServiceInstallTuple(ServiceInstallTuple tuple) + private void AddServiceInstallSymbol(ServiceInstallSymbol symbol) { - var errorControl = (int)tuple.ErrorControl; - errorControl |= tuple.Vital ? WindowsInstallerConstants.MsidbServiceInstallErrorControlVital : 0; + var errorControl = (int)symbol.ErrorControl; + errorControl |= symbol.Vital ? WindowsInstallerConstants.MsidbServiceInstallErrorControlVital : 0; - var serviceType = (int)tuple.ServiceType; - serviceType |= tuple.Interactive ? WindowsInstallerConstants.MsidbServiceInstallInteractive : 0; + var serviceType = (int)symbol.ServiceType; + serviceType |= symbol.Interactive ? WindowsInstallerConstants.MsidbServiceInstallInteractive : 0; - var row = this.CreateRow(tuple, "ServiceInstall"); - row[0] = tuple.Id.Id; - row[1] = tuple.Name; - row[2] = tuple.DisplayName; + var row = this.CreateRow(symbol, "ServiceInstall"); + row[0] = symbol.Id.Id; + row[1] = symbol.Name; + row[2] = symbol.DisplayName; row[3] = serviceType; - row[4] = (int)tuple.StartType; + row[4] = (int)symbol.StartType; row[5] = errorControl; - row[6] = tuple.LoadOrderGroup; - row[7] = tuple.Dependencies; - row[8] = tuple.StartName; - row[9] = tuple.Password; - row[10] = tuple.Arguments; - row[11] = tuple.ComponentRef; - row[12] = tuple.Description; + row[6] = symbol.LoadOrderGroup; + row[7] = symbol.Dependencies; + row[8] = symbol.StartName; + row[9] = symbol.Password; + row[10] = symbol.Arguments; + row[11] = symbol.ComponentRef; + row[12] = symbol.Description; } - private void AddShortcutTuple(ShortcutTuple tuple) + private void AddShortcutSymbol(ShortcutSymbol symbol) { - var row = this.CreateRow(tuple, "Shortcut"); - row[0] = tuple.Id.Id; - row[1] = tuple.DirectoryRef; - row[2] = GetMsiFilenameValue(tuple.ShortName, tuple.Name); - row[3] = tuple.ComponentRef; - row[4] = tuple.Target; - row[5] = tuple.Arguments; - row[6] = tuple.Description; - row[7] = tuple.Hotkey; - row[8] = tuple.IconRef; - row[9] = tuple.IconIndex; - row[10] = (int?)tuple.Show; - row[11] = tuple.WorkingDirectory; - row[12] = tuple.DisplayResourceDll; - row[13] = tuple.DisplayResourceId; - row[14] = tuple.DescriptionResourceDll; - row[15] = tuple.DescriptionResourceId; + var row = this.CreateRow(symbol, "Shortcut"); + row[0] = symbol.Id.Id; + row[1] = symbol.DirectoryRef; + row[2] = GetMsiFilenameValue(symbol.ShortName, symbol.Name); + row[3] = symbol.ComponentRef; + row[4] = symbol.Target; + row[5] = symbol.Arguments; + row[6] = symbol.Description; + row[7] = symbol.Hotkey; + row[8] = symbol.IconRef; + row[9] = symbol.IconIndex; + row[10] = (int?)symbol.Show; + row[11] = symbol.WorkingDirectory; + row[12] = symbol.DisplayResourceDll; + row[13] = symbol.DisplayResourceId; + row[14] = symbol.DescriptionResourceDll; + row[15] = symbol.DescriptionResourceId; } - private void AddTextStyleTuple(TextStyleTuple tuple) + private void AddTextStyleSymbol(TextStyleSymbol symbol) { - var styleBits = tuple.Bold ? WindowsInstallerConstants.MsidbTextStyleStyleBitsBold : 0; - styleBits |= tuple.Italic ? WindowsInstallerConstants.MsidbTextStyleStyleBitsItalic : 0; - styleBits |= tuple.Strike ? WindowsInstallerConstants.MsidbTextStyleStyleBitsStrike : 0; - styleBits |= tuple.Underline ? WindowsInstallerConstants.MsidbTextStyleStyleBitsUnderline : 0; + var styleBits = symbol.Bold ? WindowsInstallerConstants.MsidbTextStyleStyleBitsBold : 0; + styleBits |= symbol.Italic ? WindowsInstallerConstants.MsidbTextStyleStyleBitsItalic : 0; + styleBits |= symbol.Strike ? WindowsInstallerConstants.MsidbTextStyleStyleBitsStrike : 0; + styleBits |= symbol.Underline ? WindowsInstallerConstants.MsidbTextStyleStyleBitsUnderline : 0; long? color = null; - if (tuple.Red.HasValue || tuple.Green.HasValue || tuple.Blue.HasValue) + if (symbol.Red.HasValue || symbol.Green.HasValue || symbol.Blue.HasValue) { - color = tuple.Red ?? 0; - color += (long)(tuple.Green ?? 0) * 256; - color += (long)(tuple.Blue ?? 0) * 65536; + color = symbol.Red ?? 0; + color += (long)(symbol.Green ?? 0) * 256; + color += (long)(symbol.Blue ?? 0) * 65536; } - var row = this.CreateRow(tuple, "TextStyle"); - row[0] = tuple.Id.Id; - row[1] = tuple.FaceName; - row[2] = tuple.Size; + var row = this.CreateRow(symbol, "TextStyle"); + row[0] = symbol.Id.Id; + row[1] = symbol.FaceName; + row[2] = symbol.Size; row[3] = color; row[4] = styleBits == 0 ? null : (int?)styleBits; } - private void AddUpgradeTuple(UpgradeTuple tuple) + private void AddUpgradeSymbol(UpgradeSymbol symbol) { - var row = (UpgradeRow)this.CreateRow(tuple, "Upgrade"); - row.UpgradeCode = tuple.UpgradeCode; - row.VersionMin = tuple.VersionMin; - row.VersionMax = tuple.VersionMax; - row.Language = tuple.Language; - row.Remove = tuple.Remove; - row.ActionProperty = tuple.ActionProperty; - - var attributes = tuple.MigrateFeatures ? WindowsInstallerConstants.MsidbUpgradeAttributesMigrateFeatures : 0; - attributes |= tuple.OnlyDetect ? WindowsInstallerConstants.MsidbUpgradeAttributesOnlyDetect : 0; - attributes |= tuple.IgnoreRemoveFailures ? WindowsInstallerConstants.MsidbUpgradeAttributesIgnoreRemoveFailure : 0; - attributes |= tuple.VersionMinInclusive ? WindowsInstallerConstants.MsidbUpgradeAttributesVersionMinInclusive : 0; - attributes |= tuple.VersionMaxInclusive ? WindowsInstallerConstants.MsidbUpgradeAttributesVersionMaxInclusive : 0; - attributes |= tuple.ExcludeLanguages ? WindowsInstallerConstants.MsidbUpgradeAttributesLanguagesExclusive : 0; + var row = (UpgradeRow)this.CreateRow(symbol, "Upgrade"); + row.UpgradeCode = symbol.UpgradeCode; + row.VersionMin = symbol.VersionMin; + row.VersionMax = symbol.VersionMax; + row.Language = symbol.Language; + row.Remove = symbol.Remove; + row.ActionProperty = symbol.ActionProperty; + + var attributes = symbol.MigrateFeatures ? WindowsInstallerConstants.MsidbUpgradeAttributesMigrateFeatures : 0; + attributes |= symbol.OnlyDetect ? WindowsInstallerConstants.MsidbUpgradeAttributesOnlyDetect : 0; + attributes |= symbol.IgnoreRemoveFailures ? WindowsInstallerConstants.MsidbUpgradeAttributesIgnoreRemoveFailure : 0; + attributes |= symbol.VersionMinInclusive ? WindowsInstallerConstants.MsidbUpgradeAttributesVersionMinInclusive : 0; + attributes |= symbol.VersionMaxInclusive ? WindowsInstallerConstants.MsidbUpgradeAttributesVersionMaxInclusive : 0; + attributes |= symbol.ExcludeLanguages ? WindowsInstallerConstants.MsidbUpgradeAttributesLanguagesExclusive : 0; row.Attributes = attributes; } - private void AddWixActionTuple(WixActionTuple tuple) + private void AddWixActionSymbol(WixActionSymbol symbol) { // Get the table definition for the action (and ensure the proper table exists for a module). string sequenceTableName = null; - switch (tuple.SequenceTable) + switch (symbol.SequenceTable) { case SequenceTable.AdminExecuteSequence: if (OutputType.Module == this.Output.Type) @@ -932,60 +932,60 @@ namespace WixToolset.Core.WindowsInstaller.Bind } // create the action sequence row in the output - var row = this.CreateRow(tuple, sequenceTableName); + var row = this.CreateRow(symbol, sequenceTableName); if (SectionType.Module == this.Section.Type) { - row[0] = tuple.Action; - if (0 != tuple.Sequence) + row[0] = symbol.Action; + if (0 != symbol.Sequence) { - row[1] = tuple.Sequence; + row[1] = symbol.Sequence; } else { - var after = (null == tuple.Before); - row[2] = after ? tuple.After : tuple.Before; + var after = (null == symbol.Before); + row[2] = after ? symbol.After : symbol.Before; row[3] = after ? 1 : 0; } - row[4] = tuple.Condition; + row[4] = symbol.Condition; } else { - row[0] = tuple.Action; - row[1] = tuple.Condition; - row[2] = tuple.Sequence; + row[0] = symbol.Action; + row[1] = symbol.Condition; + row[2] = symbol.Sequence; } } - private void IndexCustomTableCellTuple(WixCustomTableCellTuple wixCustomTableCellTuple, Dictionary> cellsByTableAndRowId) + private void IndexCustomTableCellSymbol(WixCustomTableCellSymbol wixCustomTableCellSymbol, Dictionary> cellsByTableAndRowId) { - var tableAndRowId = wixCustomTableCellTuple.TableRef + "/" + wixCustomTableCellTuple.RowId; + var tableAndRowId = wixCustomTableCellSymbol.TableRef + "/" + wixCustomTableCellSymbol.RowId; if (!cellsByTableAndRowId.TryGetValue(tableAndRowId, out var cells)) { - cells = new List(); + cells = new List(); cellsByTableAndRowId.Add(tableAndRowId, cells); } - cells.Add(wixCustomTableCellTuple); + cells.Add(wixCustomTableCellSymbol); } - private void AddIndexedCellTuples(Dictionary> cellsByTableAndRowId) + private void AddIndexedCellSymbols(Dictionary> cellsByTableAndRowId) { foreach (var rowOfCells in cellsByTableAndRowId.Values) { - var firstCellTuple = rowOfCells[0]; - var customTableDefinition = this.TableDefinitions[firstCellTuple.TableRef]; + var firstCellSymbol = rowOfCells[0]; + var customTableDefinition = this.TableDefinitions[firstCellSymbol.TableRef]; if (customTableDefinition.Unreal) { continue; } - var customRow = this.CreateRow(firstCellTuple, customTableDefinition); + var customRow = this.CreateRow(firstCellSymbol, customTableDefinition); var customRowFieldsByColumnName = customRow.Fields.ToDictionary(f => f.Column.Name); #if TODO // SectionId seems like a good thing to preserve. - customRow.SectionId = tuple.SectionId; + customRow.SectionId = symbol.SectionId; #endif foreach (var cell in rowOfCells) { @@ -1037,23 +1037,23 @@ namespace WixToolset.Core.WindowsInstaller.Bind { if (!customTableDefinition.Columns[i].Nullable && (null == customRow.Fields[i].Data || 0 == customRow.Fields[i].Data.ToString().Length)) { - this.Messaging.Write(ErrorMessages.NoDataForColumn(firstCellTuple.SourceLineNumbers, customTableDefinition.Columns[i].Name, customTableDefinition.Name)); + this.Messaging.Write(ErrorMessages.NoDataForColumn(firstCellSymbol.SourceLineNumbers, customTableDefinition.Columns[i].Name, customTableDefinition.Name)); } } } } - private void AddWixEnsureTableTuple(WixEnsureTableTuple tuple) + private void AddWixEnsureTableSymbol(WixEnsureTableSymbol symbol) { - var tableDefinition = this.TableDefinitions[tuple.Table]; + var tableDefinition = this.TableDefinitions[symbol.Table]; this.Output.EnsureTable(tableDefinition); } - private bool AddTupleFromExtension(IntermediateTuple tuple) + private bool AddSymbolFromExtension(IntermediateSymbol symbol) { foreach (var extension in this.BackendExtensions) { - if (extension.TryAddTupleToOutput(this.Section, tuple, this.Output, this.TableDefinitions)) + if (extension.TryAddSymbolToOutput(this.Section, symbol, this.Output, this.TableDefinitions)) { return true; } @@ -1062,8 +1062,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind return false; } - private bool AddTupleDefaultly(IntermediateTuple tuple) => - this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(this.Section, tuple, this.Output, this.TableDefinitions); + private bool AddSymbolDefaultly(IntermediateSymbol symbol) => + this.BackendHelper.TryAddSymbolToOutputMatchingTableDefinitions(this.Section, symbol, this.Output, this.TableDefinitions); private static OutputType SectionTypeToOutputType(SectionType type) { @@ -1085,11 +1085,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } - private Row CreateRow(IntermediateTuple tuple, string tableDefinitionName) => - this.CreateRow(tuple, this.TableDefinitions[tableDefinitionName]); + private Row CreateRow(IntermediateSymbol symbol, string tableDefinitionName) => + this.CreateRow(symbol, this.TableDefinitions[tableDefinitionName]); - private Row CreateRow(IntermediateTuple tuple, TableDefinition tableDefinition) => - this.BackendHelper.CreateRow(this.Section, tuple, this.Output, tableDefinition); + private Row CreateRow(IntermediateSymbol symbol, TableDefinition tableDefinition) => + this.BackendHelper.CreateRow(this.Section, symbol, this.Output, tableDefinition); private static string GetMsiFilenameValue(string shortName, string longName) { diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs index f65f885b..76e6dd56 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs @@ -9,7 +9,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using WixToolset.Core.WindowsInstaller.Msi; using WixToolset.Core.WindowsInstaller.Unbind; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility.Services; @@ -34,16 +34,16 @@ namespace WixToolset.Core.WindowsInstaller.Bind { var patchTransforms = new List(); - var tuples = this.Intermediate.Sections.SelectMany(s => s.Tuples).OfType(); + var symbols = this.Intermediate.Sections.SelectMany(s => s.Symbols).OfType(); - foreach (var tuple in tuples) + foreach (var symbol in symbols) { WindowsInstallerData transform; - if (tuple.TransformFile is null) + if (symbol.TransformFile is null) { - var baselineData = this.GetData(tuple.BaselineFile.Path); - var updateData = this.GetData(tuple.UpdateFile.Path); + var baselineData = this.GetData(symbol.BaselineFile.Path); + var updateData = this.GetData(symbol.UpdateFile.Path); var command = new GenerateTransformCommand(this.Messaging, baselineData, updateData, preserveUnchangedRows: true, showPedanticMessages: false); transform = command.Execute(); @@ -52,11 +52,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind { var exportBasePath = Path.Combine(this.IntermediateFolder, "_trans"); // TODO: come up with a better path. - var command = new UnbindTransformCommand(this.Messaging, tuple.TransformFile.Path, exportBasePath, this.IntermediateFolder); + var command = new UnbindTransformCommand(this.Messaging, symbol.TransformFile.Path, exportBasePath, this.IntermediateFolder); transform = command.Execute(); } - patchTransforms.Add(new PatchTransform(tuple.Id.Id, transform)); + patchTransforms.Add(new PatchTransform(symbol.Id.Id, transform)); } this.PatchTransforms = patchTransforms; diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs index 5b4fe9e5..0a042f48 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs @@ -6,7 +6,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Collections.Generic; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; internal class CreateSpecialPropertiesCommand { @@ -24,7 +24,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind var secureProperties = new SortedSet(); var hiddenProperties = new SortedSet(); - foreach (var wixPropertyRow in this.Section.Tuples.OfType()) + foreach (var wixPropertyRow in this.Section.Symbols.OfType()) { if (wixPropertyRow.Admin) { @@ -43,7 +43,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } // Hide properties for in-script custom actions that have HideTarget set. - var hideTargetCustomActions = this.Section.Tuples.OfType().Where( + var hideTargetCustomActions = this.Section.Symbols.OfType().Where( ca => ca.Hidden && (ca.ExecutionType == CustomActionExecutionType.Deferred || ca.ExecutionType == CustomActionExecutionType.Commit @@ -52,12 +52,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind hiddenProperties.UnionWith(hideTargetCustomActions); // Ensure upgrade action properties are secure. - var actionProperties = this.Section.Tuples.OfType().Select(u => u.ActionProperty); + var actionProperties = this.Section.Symbols.OfType().Select(u => u.ActionProperty); secureProperties.UnionWith(actionProperties); if (0 < adminProperties.Count) { - this.Section.AddTuple(new PropertyTuple(null, new Identifier(AccessModifier.Private, "AdminProperties")) + this.Section.AddSymbol(new PropertySymbol(null, new Identifier(AccessModifier.Private, "AdminProperties")) { Value = String.Join(";", adminProperties), }); @@ -65,7 +65,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (0 < secureProperties.Count) { - this.Section.AddTuple(new PropertyTuple(null, new Identifier(AccessModifier.Private, "SecureCustomProperties")) + this.Section.AddSymbol(new PropertySymbol(null, new Identifier(AccessModifier.Private, "SecureCustomProperties")) { Value = String.Join(";", secureProperties), }); @@ -73,7 +73,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (0 < hiddenProperties.Count) { - this.Section.AddTuple(new PropertyTuple(null, new Identifier(AccessModifier.Private, "MsiHiddenProperties")) + this.Section.AddSymbol(new PropertySymbol(null, new Identifier(AccessModifier.Private, "MsiHiddenProperties")) { Value = String.Join(";", hiddenProperties) }); diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs index 792a13a9..37bda235 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs @@ -12,7 +12,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using WixToolset.Data; using WixToolset.Core.Native; using WixToolset.Core.Bind; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Services; using WixToolset.Core.WindowsInstaller.Msi; @@ -21,10 +21,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// internal class ExtractMergeModuleFilesCommand { - public ExtractMergeModuleFilesCommand(IMessaging messaging, IEnumerable wixMergeTuples, IEnumerable fileFacades, int installerVersion, string intermediateFolder, bool suppressLayout) + public ExtractMergeModuleFilesCommand(IMessaging messaging, IEnumerable wixMergeSymbols, IEnumerable fileFacades, int installerVersion, string intermediateFolder, bool suppressLayout) { this.Messaging = messaging; - this.WixMergeTuples = wixMergeTuples; + this.WixMergeSymbols = wixMergeSymbols; this.FileFacades = fileFacades; this.OutputInstallerVersion = installerVersion; this.IntermediateFolder = intermediateFolder; @@ -33,7 +33,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind private IMessaging Messaging { get; } - private IEnumerable WixMergeTuples { get; } + private IEnumerable WixMergeSymbols { get; } private IEnumerable FileFacades { get; } @@ -61,7 +61,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // is a lot more costly for the common cases. var indexedFileFacades = this.FileFacades.ToDictionary(f => f.Id, StringComparer.Ordinal); - foreach (var wixMergeRow in this.WixMergeTuples) + foreach (var wixMergeRow in this.WixMergeSymbols) { var containsFiles = this.CreateFacadesForMergeModuleFiles(wixMergeRow, mergeModulesFileFacades, indexedFileFacades); @@ -75,7 +75,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.MergeModulesFileFacades = mergeModulesFileFacades; } - private bool CreateFacadesForMergeModuleFiles(WixMergeTuple wixMergeRow, List mergeModulesFileFacades, Dictionary indexedFileFacades) + private bool CreateFacadesForMergeModuleFiles(WixMergeSymbol wixMergeRow, List mergeModulesFileFacades, Dictionary indexedFileFacades) { var containsFiles = false; @@ -96,13 +96,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind // NOTE: this is very tricky - the merge module file rows are not added to the // file table because they should not be created via idt import. Instead, these // rows are created by merging in the actual modules. - var fileTuple = new FileTuple(wixMergeRow.SourceLineNumbers, new Identifier(AccessModifier.Private, record[1])); - fileTuple.Attributes = wixMergeRow.FileAttributes; - fileTuple.DirectoryRef = record[2]; - fileTuple.DiskId = wixMergeRow.DiskId; - fileTuple.Source = new IntermediateFieldPathValue { Path = Path.Combine(this.IntermediateFolder, wixMergeRow.Id.Id, record[1]) }; + var fileSymbol = new FileSymbol(wixMergeRow.SourceLineNumbers, new Identifier(AccessModifier.Private, record[1])); + fileSymbol.Attributes = wixMergeRow.FileAttributes; + fileSymbol.DirectoryRef = record[2]; + fileSymbol.DiskId = wixMergeRow.DiskId; + fileSymbol.Source = new IntermediateFieldPathValue { Path = Path.Combine(this.IntermediateFolder, wixMergeRow.Id.Id, record[1]) }; - var mergeModuleFileFacade = new FileFacade(true, fileTuple); + var mergeModuleFileFacade = new FileFacade(true, fileSymbol); // If case-sensitive collision with another merge module or a user-authored file identifier. if (indexedFileFacades.TryGetValue(mergeModuleFileFacade.Id, out var collidingFacade)) @@ -159,7 +159,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind return containsFiles; } - private void ExtractFilesFromMergeModule(IMsmMerge2 merge, WixMergeTuple wixMergeRow) + private void ExtractFilesFromMergeModule(IMsmMerge2 merge, WixMergeSymbol wixMergeRow) { var moduleOpen = false; short mergeLanguage; diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs index fc713954..121ffb1b 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs @@ -7,7 +7,7 @@ namespace WixToolset.Core.WindowsInstaller using System.Globalization; using WixToolset.Core.WindowsInstaller.Msi; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Data.WindowsInstaller.Rows; using WixToolset.Extensibility.Services; diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesCommand.cs index 55171da4..c918e866 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesCommand.cs @@ -8,7 +8,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Linq; using WixToolset.Core.Bind; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; internal class GetFileFacadesCommand { @@ -25,10 +25,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind { var facades = new List(); - var assemblyFile = this.Section.Tuples.OfType().ToDictionary(t => t.Id.Id); - //var deltaPatchFiles = this.Section.Tuples.OfType().ToDictionary(t => t.Id.Id); + var assemblyFile = this.Section.Symbols.OfType().ToDictionary(t => t.Id.Id); + //var deltaPatchFiles = this.Section.Symbols.OfType().ToDictionary(t => t.Id.Id); - foreach (var file in this.Section.Tuples.OfType()) + foreach (var file in this.Section.Symbols.OfType()) { assemblyFile.TryGetValue(file.Id.Id, out var assembly); @@ -49,13 +49,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// /// Merge data from the WixPatchSymbolPaths rows into the WixDeltaPatchFile rows. /// - public void ResolveDeltaPatchSymbolPaths(Dictionary deltaPatchFiles, IEnumerable facades) + public void ResolveDeltaPatchSymbolPaths(Dictionary deltaPatchFiles, IEnumerable facades) { ILookup filesByComponent = null; ILookup filesByDirectory = null; ILookup filesByDiskId = null; - foreach (var row in this.Section.Tuples.OfType().OrderBy(r => r.SymbolType)) + foreach (var row in this.Section.Symbols.OfType().OrderBy(r => r.SymbolType)) { switch (row.SymbolType) { @@ -119,7 +119,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// Row from the WixPatchSymbolsPaths table. /// FileRow into which to set symbol information. /// This includes PreviousData as well. - private void MergeSymbolPaths(WixDeltaPatchSymbolPathsTuple row, WixDeltaPatchFileTuple file) + private void MergeSymbolPaths(WixDeltaPatchSymbolPathsSymbol row, WixDeltaPatchFileSymbol file) { if (file.SymbolPaths is null) { diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs index 0312ab44..2eb95bc5 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs @@ -7,7 +7,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Globalization; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; using WixToolset.Extensibility.Services; @@ -32,13 +32,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind public TableDefinitionCollection Execute() { var tableDefinitions = new TableDefinitionCollection(WindowsInstallerTableDefinitions.All); - var customColumnsById = this.Section.Tuples.OfType().ToDictionary(t => t.Id.Id); + var customColumnsById = this.Section.Symbols.OfType().ToDictionary(t => t.Id.Id); if (customColumnsById.Any()) { - foreach (var tuple in this.Section.Tuples.OfType()) + foreach (var symbol in this.Section.Symbols.OfType()) { - var customTableDefinition = this.CreateCustomTable(tuple, customColumnsById); + var customTableDefinition = this.CreateCustomTable(symbol, customColumnsById); tableDefinitions.Add(customTableDefinition); } } @@ -60,14 +60,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind return this.TableDefinitions; } - private TableDefinition CreateCustomTable(WixCustomTableTuple tuple, Dictionary customColumnsById) + private TableDefinition CreateCustomTable(WixCustomTableSymbol symbol, Dictionary customColumnsById) { - var columnNames = tuple.ColumnNamesSeparated; + var columnNames = symbol.ColumnNamesSeparated; var columns = new List(columnNames.Length); foreach (var name in columnNames) { - var column = customColumnsById[tuple.Id.Id + "/" + name]; + var column = customColumnsById[symbol.Id.Id + "/" + name]; var type = ColumnType.Unknown; @@ -208,7 +208,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind columns.Add(columnDefinition); } - var customTable = new TableDefinition(tuple.Id.Id, null, columns, tuple.Unreal); + var customTable = new TableDefinition(symbol.Id.Id, null, columns, symbol.Unreal); return customTable; } } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs index 1f85a33f..80684e7c 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs @@ -13,7 +13,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using WixToolset.Core.Native; using WixToolset.Core.WindowsInstaller.Msi; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility.Services; @@ -46,8 +46,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind public void Execute() { - var wixMergeTuples = this.Section.Tuples.OfType().ToList(); - if (!wixMergeTuples.Any()) + var wixMergeSymbols = this.Section.Symbols.OfType().ToList(); + if (!wixMergeSymbols.Any()) { return; } @@ -69,10 +69,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind merge.OpenDatabase(this.OutputPath); databaseOpen = true; - var featureModulesByMergeId = this.Section.Tuples.OfType().GroupBy(t => t.WixMergeRef).ToDictionary(g => g.Key); + var featureModulesByMergeId = this.Section.Symbols.OfType().GroupBy(t => t.WixMergeRef).ToDictionary(g => g.Key); // process all the merge rows - foreach (var wixMergeRow in wixMergeTuples) + foreach (var wixMergeRow in wixMergeSymbols) { var moduleOpen = false; @@ -217,7 +217,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using (var db = new Database(this.OutputPath, OpenDatabase.Direct)) { // Suppress individual actions. - foreach (var suppressAction in this.Section.Tuples.OfType()) + foreach (var suppressAction in this.Section.Symbols.OfType()) { var tableName = suppressAction.SequenceTable.WindowsInstallerTableName(); if (db.TableExists(tableName)) diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs index 8b459d69..66ca502d 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs @@ -10,18 +10,18 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Text; using System.Text.RegularExpressions; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; internal class ModularizeCommand { - public ModularizeCommand(WindowsInstallerData output, string modularizationSuffix, IEnumerable suppressTuples) + public ModularizeCommand(WindowsInstallerData output, string modularizationSuffix, IEnumerable suppressSymbols) { this.Output = output; this.ModularizationSuffix = modularizationSuffix; // Gather all the unique suppress modularization identifiers. - this.SuppressModularizationIdentifiers = new HashSet(suppressTuples.Select(s => s.Id.Id)); + this.SuppressModularizationIdentifiers = new HashSet(suppressSymbols.Select(s => s.Id.Id)); } private WindowsInstallerData Output { get; } @@ -144,17 +144,17 @@ namespace WixToolset.Core.WindowsInstaller.Bind { Debug.Assert(ColumnModularizeType.Condition == modularizeType); - // This heinous looking regular expression is actually quite an elegant way - // to shred the entire condition into the identifiers that need to be + // This heinous looking regular expression is actually quite an elegant way + // to shred the entire condition into the identifiers that need to be // modularized. Let's break it down piece by piece: // // 1. Look for the operators: NOT, EQV, XOR, OR, AND, IMP (plus a space). Note that the // regular expression is case insensitive so we don't have to worry about // all the permutations of these strings. - // 2. Look for quoted strings. Quoted strings are just text and are ignored + // 2. Look for quoted strings. Quoted strings are just text and are ignored // outright. - // 3. Look for environment variables. These look like identifiers we might - // otherwise be interested in but start with a percent sign. Like quoted + // 3. Look for environment variables. These look like identifiers we might + // otherwise be interested in but start with a percent sign. Like quoted // strings these enviroment variable references are ignored outright. // 4. Match all identifiers that are things that need to be modularized. Note // the special characters (!, $, ?, &) that denote Component and Feature states. diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs index 13d47215..ab5ebd4b 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs @@ -9,7 +9,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using WixToolset.Core.Bind; using WixToolset.Core.WindowsInstaller.Msi; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; @@ -41,7 +41,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind public bool LongNamesInImage { private get; set; } - public Func ResolveMedia { private get; set; } + public Func ResolveMedia { private get; set; } public IEnumerable FileTransfers { get; private set; } @@ -55,7 +55,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind var directories = new Dictionary(); - var mediaRows = this.Section.Tuples.OfType().ToDictionary(t => t.DiskId); + var mediaRows = this.Section.Symbols.OfType().ToDictionary(t => t.DiskId); using (var db = new Database(this.DatabasePath, OpenDatabase.ReadOnly)) { @@ -78,11 +78,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind // for each file in the array of uncompressed files foreach (FileFacade facade in this.FileFacades) { - var mediaTuple = mediaRows[facade.DiskId]; + var mediaSymbol = mediaRows[facade.DiskId]; string relativeFileLayoutPath = null; - string mediaLayoutFolder = mediaTuple.Layout; + string mediaLayoutFolder = mediaSymbol.Layout; - var mediaLayoutDirectory = this.ResolveMedia(mediaTuple, mediaLayoutFolder, this.LayoutDirectory); + var mediaLayoutDirectory = this.ResolveMedia(mediaSymbol, mediaLayoutFolder, this.LayoutDirectory); // setup up the query record and find the appropriate file in the // previously executed file view diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs index a5055209..7f43da9a 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs @@ -7,12 +7,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Globalization; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility.Services; /// - /// Set sequence numbers for all the actions and create tuples in the output object. + /// Set sequence numbers for all the actions and create symbols in the output object. /// internal class SequenceActionsCommand { @@ -32,38 +32,38 @@ namespace WixToolset.Core.WindowsInstaller.Bind public void Execute() { - var requiredActionTuples = new Dictionary(); + var requiredActionSymbols = new Dictionary(); - // Get the standard actions required based on tuples in the section. - var overridableActionTuples = this.GetRequiredStandardActions(); + // Get the standard actions required based on symbols in the section. + var overridableActionSymbols = this.GetRequiredStandardActions(); - // Index all the action tuples and look for collisions. - foreach (var actionTuple in this.Section.Tuples.OfType()) + // Index all the action symbols and look for collisions. + foreach (var actionSymbol in this.Section.Symbols.OfType()) { - if (actionTuple.Overridable) // overridable action + if (actionSymbol.Overridable) // overridable action { - if (overridableActionTuples.TryGetValue(actionTuple.Id.Id, out var collidingActionTuple)) + if (overridableActionSymbols.TryGetValue(actionSymbol.Id.Id, out var collidingActionSymbol)) { - this.Messaging.Write(ErrorMessages.OverridableActionCollision(actionTuple.SourceLineNumbers, actionTuple.SequenceTable.ToString(), actionTuple.Action)); - if (null != collidingActionTuple.SourceLineNumbers) + this.Messaging.Write(ErrorMessages.OverridableActionCollision(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action)); + if (null != collidingActionSymbol.SourceLineNumbers) { - this.Messaging.Write(ErrorMessages.OverridableActionCollision2(collidingActionTuple.SourceLineNumbers)); + this.Messaging.Write(ErrorMessages.OverridableActionCollision2(collidingActionSymbol.SourceLineNumbers)); } } else { - overridableActionTuples.Add(actionTuple.Id.Id, actionTuple); + overridableActionSymbols.Add(actionSymbol.Id.Id, actionSymbol); } } else // unsequenced or sequenced action. { // Unsequenced action (allowed for certain standard actions). - if (null == actionTuple.Before && null == actionTuple.After && !actionTuple.Sequence.HasValue) + if (null == actionSymbol.Before && null == actionSymbol.After && !actionSymbol.Sequence.HasValue) { - if (WindowsInstallerStandard.TryGetStandardAction(actionTuple.Id.Id, out var standardAction)) + if (WindowsInstallerStandard.TryGetStandardAction(actionSymbol.Id.Id, out var standardAction)) { // Populate the sequence from the standard action - actionTuple.Sequence = standardAction.Sequence; + actionSymbol.Sequence = standardAction.Sequence; } else // not a supported unscheduled action. { @@ -71,109 +71,109 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } - if (requiredActionTuples.TryGetValue(actionTuple.Id.Id, out var collidingActionTuple)) + if (requiredActionSymbols.TryGetValue(actionSymbol.Id.Id, out var collidingActionSymbol)) { - this.Messaging.Write(ErrorMessages.ActionCollision(actionTuple.SourceLineNumbers, actionTuple.SequenceTable.ToString(), actionTuple.Action)); - if (null != collidingActionTuple.SourceLineNumbers) + this.Messaging.Write(ErrorMessages.ActionCollision(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action)); + if (null != collidingActionSymbol.SourceLineNumbers) { - this.Messaging.Write(ErrorMessages.ActionCollision2(collidingActionTuple.SourceLineNumbers)); + this.Messaging.Write(ErrorMessages.ActionCollision2(collidingActionSymbol.SourceLineNumbers)); } } else { - requiredActionTuples.Add(actionTuple.Id.Id, actionTuple); + requiredActionSymbols.Add(actionSymbol.Id.Id, actionSymbol); } } } - // Add the overridable action tuples that are not overridden to the required action tuples. - foreach (var actionTuple in overridableActionTuples.Values) + // Add the overridable action symbols that are not overridden to the required action symbols. + foreach (var actionSymbol in overridableActionSymbols.Values) { - if (!requiredActionTuples.ContainsKey(actionTuple.Id.Id)) + if (!requiredActionSymbols.ContainsKey(actionSymbol.Id.Id)) { - requiredActionTuples.Add(actionTuple.Id.Id, actionTuple); + requiredActionSymbols.Add(actionSymbol.Id.Id, actionSymbol); } } // Suppress the required actions that are overridable. - foreach (var suppressActionTuple in this.Section.Tuples.OfType()) + foreach (var suppressActionSymbol in this.Section.Symbols.OfType()) { - var key = suppressActionTuple.Id.Id; + var key = suppressActionSymbol.Id.Id; - // If there is an overridable tuple to suppress; suppress it. There is no warning if there + // If there is an overridable symbol to suppress; suppress it. There is no warning if there // is no action to suppress because the action may be suppressed from a merge module in // the binder. - if (requiredActionTuples.TryGetValue(key, out var requiredActionTuple)) + if (requiredActionSymbols.TryGetValue(key, out var requiredActionSymbol)) { - if (requiredActionTuple.Overridable) + if (requiredActionSymbol.Overridable) { - this.Messaging.Write(WarningMessages.SuppressAction(suppressActionTuple.SourceLineNumbers, suppressActionTuple.Action, suppressActionTuple.SequenceTable.ToString())); - if (null != requiredActionTuple.SourceLineNumbers) + this.Messaging.Write(WarningMessages.SuppressAction(suppressActionSymbol.SourceLineNumbers, suppressActionSymbol.Action, suppressActionSymbol.SequenceTable.ToString())); + if (null != requiredActionSymbol.SourceLineNumbers) { - this.Messaging.Write(WarningMessages.SuppressAction2(requiredActionTuple.SourceLineNumbers)); + this.Messaging.Write(WarningMessages.SuppressAction2(requiredActionSymbol.SourceLineNumbers)); } - requiredActionTuples.Remove(key); + requiredActionSymbols.Remove(key); } - else // suppressing a non-overridable action tuple + else // suppressing a non-overridable action symbol { - this.Messaging.Write(ErrorMessages.SuppressNonoverridableAction(suppressActionTuple.SourceLineNumbers, suppressActionTuple.SequenceTable.ToString(), suppressActionTuple.Action)); - if (null != requiredActionTuple.SourceLineNumbers) + this.Messaging.Write(ErrorMessages.SuppressNonoverridableAction(suppressActionSymbol.SourceLineNumbers, suppressActionSymbol.SequenceTable.ToString(), suppressActionSymbol.Action)); + if (null != requiredActionSymbol.SourceLineNumbers) { - this.Messaging.Write(ErrorMessages.SuppressNonoverridableAction2(requiredActionTuple.SourceLineNumbers)); + this.Messaging.Write(ErrorMessages.SuppressNonoverridableAction2(requiredActionSymbol.SourceLineNumbers)); } } } } // Build up dependency trees of the relatively scheduled actions. - // Use ToList() to create a copy of the required action tuples so that new tuples can + // Use ToList() to create a copy of the required action symbols so that new symbols can // be added while enumerating. - foreach (var actionTuple in requiredActionTuples.Values.ToList()) + foreach (var actionSymbol in requiredActionSymbols.Values.ToList()) { - if (!actionTuple.Sequence.HasValue) + if (!actionSymbol.Sequence.HasValue) { // check for standard actions that don't have a sequence number in a merge module - if (SectionType.Module == this.Section.Type && WindowsInstallerStandard.IsStandardAction(actionTuple.Action)) + if (SectionType.Module == this.Section.Type && WindowsInstallerStandard.IsStandardAction(actionSymbol.Action)) { - this.Messaging.Write(ErrorMessages.StandardActionRelativelyScheduledInModule(actionTuple.SourceLineNumbers, actionTuple.SequenceTable.ToString(), actionTuple.Action)); + this.Messaging.Write(ErrorMessages.StandardActionRelativelyScheduledInModule(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action)); } - this.SequenceActionTuple(actionTuple, requiredActionTuples); + this.SequenceActionSymbol(actionSymbol, requiredActionSymbols); } - else if (SectionType.Module == this.Section.Type && 0 < actionTuple.Sequence && !WindowsInstallerStandard.IsStandardAction(actionTuple.Action)) // check for custom actions and dialogs that have a sequence number + else if (SectionType.Module == this.Section.Type && 0 < actionSymbol.Sequence && !WindowsInstallerStandard.IsStandardAction(actionSymbol.Action)) // check for custom actions and dialogs that have a sequence number { - this.Messaging.Write(ErrorMessages.CustomActionSequencedInModule(actionTuple.SourceLineNumbers, actionTuple.SequenceTable.ToString(), actionTuple.Action)); + this.Messaging.Write(ErrorMessages.CustomActionSequencedInModule(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action)); } } // Look for standard actions with sequence restrictions that aren't necessarily scheduled based // on the presence of a particular table. - if (requiredActionTuples.ContainsKey("InstallExecuteSequence/DuplicateFiles") && !requiredActionTuples.ContainsKey("InstallExecuteSequence/InstallFiles")) + if (requiredActionSymbols.ContainsKey("InstallExecuteSequence/DuplicateFiles") && !requiredActionSymbols.ContainsKey("InstallExecuteSequence/InstallFiles")) { WindowsInstallerStandard.TryGetStandardAction("InstallExecuteSequence/InstallFiles", out var standardAction); - requiredActionTuples.Add(standardAction.Id.Id, standardAction); + requiredActionSymbols.Add(standardAction.Id.Id, standardAction); } // Schedule actions. - List scheduledActionTuples; + List scheduledActionSymbols; if (SectionType.Module == this.Section.Type) { - scheduledActionTuples = requiredActionTuples.Values.ToList(); + scheduledActionSymbols = requiredActionSymbols.Values.ToList(); } else { - scheduledActionTuples = this.ScheduleActions(requiredActionTuples); + scheduledActionSymbols = this.ScheduleActions(requiredActionSymbols); } - // Remove all existing WixActionTuples from the section then add the + // Remove all existing WixActionSymbols from the section then add the // scheduled actions back to the section. Note: we add the indices in // reverse order to make it easy to remove them from the list later. var removeIndices = new List(); - for (var i = this.Section.Tuples.Count - 1; i >= 0; --i) + for (var i = this.Section.Symbols.Count - 1; i >= 0; --i) { - var tuple = this.Section.Tuples[i]; - if (tuple.Definition.Type == TupleDefinitionType.WixAction) + var symbol = this.Section.Symbols[i]; + if (symbol.Definition.Type == SymbolDefinitionType.WixAction) { removeIndices.Add(i); } @@ -181,164 +181,164 @@ namespace WixToolset.Core.WindowsInstaller.Bind foreach (var removeIndex in removeIndices) { - this.Section.Tuples.RemoveAt(removeIndex); + this.Section.Symbols.RemoveAt(removeIndex); } - foreach (var action in scheduledActionTuples) + foreach (var action in scheduledActionSymbols) { - this.Section.AddTuple(action); + this.Section.AddSymbol(action); } } - private Dictionary GetRequiredStandardActions() + private Dictionary GetRequiredStandardActions() { - var overridableActionTuples = new Dictionary(); + var overridableActionSymbols = new Dictionary(); var requiredActionIds = this.GetRequiredActionIds(); foreach (var actionId in requiredActionIds) { WindowsInstallerStandard.TryGetStandardAction(actionId, out var standardAction); - overridableActionTuples.Add(standardAction.Id.Id, standardAction); + overridableActionSymbols.Add(standardAction.Id.Id, standardAction); } - return overridableActionTuples; + return overridableActionSymbols; } - private List ScheduleActions(Dictionary requiredActionTuples) + private List ScheduleActions(Dictionary requiredActionSymbols) { - var scheduledActionTuples = new List(); + var scheduledActionSymbols = new List(); // Process each sequence table individually. foreach (SequenceTable sequenceTable in Enum.GetValues(typeof(SequenceTable))) { - // Create a collection of just the action tuples in this sequence - var sequenceActionTuples = requiredActionTuples.Values.Where(a => a.SequenceTable == sequenceTable).ToList(); + // Create a collection of just the action symbols in this sequence + var sequenceActionSymbols = requiredActionSymbols.Values.Where(a => a.SequenceTable == sequenceTable).ToList(); // Schedule the absolutely scheduled actions (by sorting them by their sequence numbers). - var absoluteActionTuples = new List(); - foreach (var actionTuple in sequenceActionTuples) + var absoluteActionSymbols = new List(); + foreach (var actionSymbol in sequenceActionSymbols) { - if (actionTuple.Sequence.HasValue) + if (actionSymbol.Sequence.HasValue) { // Look for sequence number collisions - foreach (var sequenceScheduledActionTuple in absoluteActionTuples) + foreach (var sequenceScheduledActionSymbol in absoluteActionSymbols) { - if (sequenceScheduledActionTuple.Sequence == actionTuple.Sequence) + if (sequenceScheduledActionSymbol.Sequence == actionSymbol.Sequence) { - this.Messaging.Write(WarningMessages.ActionSequenceCollision(actionTuple.SourceLineNumbers, actionTuple.SequenceTable.ToString(), actionTuple.Action, sequenceScheduledActionTuple.Action, actionTuple.Sequence ?? 0)); - if (null != sequenceScheduledActionTuple.SourceLineNumbers) + this.Messaging.Write(WarningMessages.ActionSequenceCollision(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action, sequenceScheduledActionSymbol.Action, actionSymbol.Sequence ?? 0)); + if (null != sequenceScheduledActionSymbol.SourceLineNumbers) { - this.Messaging.Write(WarningMessages.ActionSequenceCollision2(sequenceScheduledActionTuple.SourceLineNumbers)); + this.Messaging.Write(WarningMessages.ActionSequenceCollision2(sequenceScheduledActionSymbol.SourceLineNumbers)); } } } - absoluteActionTuples.Add(actionTuple); + absoluteActionSymbols.Add(actionSymbol); } } - absoluteActionTuples.Sort((x, y) => (x.Sequence ?? 0).CompareTo(y.Sequence ?? 0)); + absoluteActionSymbols.Sort((x, y) => (x.Sequence ?? 0).CompareTo(y.Sequence ?? 0)); // Schedule the relatively scheduled actions (by resolving the dependency trees). var previousUsedSequence = 0; - var relativeActionTuples = new List(); - for (int j = 0; j < absoluteActionTuples.Count; j++) + var relativeActionSymbols = new List(); + for (int j = 0; j < absoluteActionSymbols.Count; j++) { - var absoluteActionTuple = absoluteActionTuples[j]; + var absoluteActionSymbol = absoluteActionSymbols[j]; - // Get all the relatively scheduled action tuples occuring before and after this absolutely scheduled action tuple. - var relativeActions = this.GetAllRelativeActionsForSequenceType(sequenceTable, absoluteActionTuple); + // Get all the relatively scheduled action symbols occuring before and after this absolutely scheduled action symbol. + var relativeActions = this.GetAllRelativeActionsForSequenceType(sequenceTable, absoluteActionSymbol); // Check for relatively scheduled actions occuring before/after a special action // (those actions with a negative sequence number). - if (absoluteActionTuple.Sequence < 0 && (relativeActions.PreviousActions.Any() || relativeActions.NextActions.Any())) + if (absoluteActionSymbol.Sequence < 0 && (relativeActions.PreviousActions.Any() || relativeActions.NextActions.Any())) { // Create errors for all the before actions. - foreach (var actionTuple in relativeActions.PreviousActions) + foreach (var actionSymbol in relativeActions.PreviousActions) { - this.Messaging.Write(ErrorMessages.ActionScheduledRelativeToTerminationAction(actionTuple.SourceLineNumbers, actionTuple.SequenceTable.ToString(), actionTuple.Action, absoluteActionTuple.Action)); + this.Messaging.Write(ErrorMessages.ActionScheduledRelativeToTerminationAction(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action, absoluteActionSymbol.Action)); } // Create errors for all the after actions. - foreach (var actionTuple in relativeActions.NextActions) + foreach (var actionSymbol in relativeActions.NextActions) { - this.Messaging.Write(ErrorMessages.ActionScheduledRelativeToTerminationAction(actionTuple.SourceLineNumbers, actionTuple.SequenceTable.ToString(), actionTuple.Action, absoluteActionTuple.Action)); + this.Messaging.Write(ErrorMessages.ActionScheduledRelativeToTerminationAction(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action, absoluteActionSymbol.Action)); } // If there is source line information for the absolutely scheduled action display it - if (absoluteActionTuple.SourceLineNumbers != null) + if (absoluteActionSymbol.SourceLineNumbers != null) { - this.Messaging.Write(ErrorMessages.ActionScheduledRelativeToTerminationAction2(absoluteActionTuple.SourceLineNumbers)); + this.Messaging.Write(ErrorMessages.ActionScheduledRelativeToTerminationAction2(absoluteActionSymbol.SourceLineNumbers)); } continue; } - // Schedule the action tuples before this one. - var unusedSequence = absoluteActionTuple.Sequence - 1; + // Schedule the action symbols before this one. + var unusedSequence = absoluteActionSymbol.Sequence - 1; for (var i = relativeActions.PreviousActions.Count - 1; i >= 0; i--) { - var relativeActionTuple = relativeActions.PreviousActions[i]; + var relativeActionSymbol = relativeActions.PreviousActions[i]; // look for collisions if (unusedSequence == previousUsedSequence) { - this.Messaging.Write(ErrorMessages.NoUniqueActionSequenceNumber(relativeActionTuple.SourceLineNumbers, relativeActionTuple.SequenceTable.ToString(), relativeActionTuple.Action, absoluteActionTuple.Action)); - if (absoluteActionTuple.SourceLineNumbers != null) + this.Messaging.Write(ErrorMessages.NoUniqueActionSequenceNumber(relativeActionSymbol.SourceLineNumbers, relativeActionSymbol.SequenceTable.ToString(), relativeActionSymbol.Action, absoluteActionSymbol.Action)); + if (absoluteActionSymbol.SourceLineNumbers != null) { - this.Messaging.Write(ErrorMessages.NoUniqueActionSequenceNumber2(absoluteActionTuple.SourceLineNumbers)); + this.Messaging.Write(ErrorMessages.NoUniqueActionSequenceNumber2(absoluteActionSymbol.SourceLineNumbers)); } unusedSequence++; } - relativeActionTuple.Sequence = unusedSequence; - relativeActionTuples.Add(relativeActionTuple); + relativeActionSymbol.Sequence = unusedSequence; + relativeActionSymbols.Add(relativeActionSymbol); unusedSequence--; } // Determine the next used action sequence number. var nextUsedSequence = Int16.MaxValue + 1; - if (absoluteActionTuples.Count > j + 1) + if (absoluteActionSymbols.Count > j + 1) { - nextUsedSequence = absoluteActionTuples[j + 1].Sequence ?? 0; + nextUsedSequence = absoluteActionSymbols[j + 1].Sequence ?? 0; } - // Schedule the action tuples after this one. - unusedSequence = absoluteActionTuple.Sequence + 1; + // Schedule the action symbols after this one. + unusedSequence = absoluteActionSymbol.Sequence + 1; for (var i = 0; i < relativeActions.NextActions.Count; i++) { - var relativeActionTuple = relativeActions.NextActions[i]; + var relativeActionSymbol = relativeActions.NextActions[i]; if (unusedSequence == nextUsedSequence) { - this.Messaging.Write(ErrorMessages.NoUniqueActionSequenceNumber(relativeActionTuple.SourceLineNumbers, relativeActionTuple.SequenceTable.ToString(), relativeActionTuple.Action, absoluteActionTuple.Action)); - if (absoluteActionTuple.SourceLineNumbers != null) + this.Messaging.Write(ErrorMessages.NoUniqueActionSequenceNumber(relativeActionSymbol.SourceLineNumbers, relativeActionSymbol.SequenceTable.ToString(), relativeActionSymbol.Action, absoluteActionSymbol.Action)); + if (absoluteActionSymbol.SourceLineNumbers != null) { - this.Messaging.Write(ErrorMessages.NoUniqueActionSequenceNumber2(absoluteActionTuple.SourceLineNumbers)); + this.Messaging.Write(ErrorMessages.NoUniqueActionSequenceNumber2(absoluteActionSymbol.SourceLineNumbers)); } unusedSequence--; } - relativeActionTuple.Sequence = unusedSequence; - relativeActionTuples.Add(relativeActionTuple); + relativeActionSymbol.Sequence = unusedSequence; + relativeActionSymbols.Add(relativeActionSymbol); unusedSequence++; } // keep track of this sequence number as the previous used sequence number for the next iteration - previousUsedSequence = absoluteActionTuple.Sequence ?? 0; + previousUsedSequence = absoluteActionSymbol.Sequence ?? 0; } // add the absolutely and relatively scheduled actions to the list of scheduled actions - scheduledActionTuples.AddRange(absoluteActionTuples); - scheduledActionTuples.AddRange(relativeActionTuples); + scheduledActionSymbols.AddRange(absoluteActionSymbols); + scheduledActionSymbols.AddRange(relativeActionSymbols); } - return scheduledActionTuples; + return scheduledActionSymbols; } private IEnumerable GetRequiredActionIds() @@ -396,16 +396,16 @@ namespace WixToolset.Core.WindowsInstaller.Bind set.Add("InstallUISequence/ValidateProductID"); } - // Gather the required actions for each tuple type. - foreach (var tupleType in this.Section.Tuples.Select(t => t.Definition.Type).Distinct()) + // Gather the required actions for each symbol type. + foreach (var symbolType in this.Section.Symbols.Select(t => t.Definition.Type).Distinct()) { - switch (tupleType) + switch (symbolType) { - case TupleDefinitionType.AppSearch: + case SymbolDefinitionType.AppSearch: set.Add("InstallExecuteSequence/AppSearch"); set.Add("InstallUISequence/AppSearch"); break; - case TupleDefinitionType.CCPSearch: + case SymbolDefinitionType.CCPSearch: set.Add("InstallExecuteSequence/AppSearch"); set.Add("InstallExecuteSequence/CCPSearch"); set.Add("InstallExecuteSequence/RMCCPSearch"); @@ -413,40 +413,40 @@ namespace WixToolset.Core.WindowsInstaller.Bind set.Add("InstallUISequence/CCPSearch"); set.Add("InstallUISequence/RMCCPSearch"); break; - case TupleDefinitionType.Class: + case SymbolDefinitionType.Class: set.Add("AdvertiseExecuteSequence/RegisterClassInfo"); set.Add("InstallExecuteSequence/RegisterClassInfo"); set.Add("InstallExecuteSequence/UnregisterClassInfo"); break; - case TupleDefinitionType.Complus: + case SymbolDefinitionType.Complus: set.Add("InstallExecuteSequence/RegisterComPlus"); set.Add("InstallExecuteSequence/UnregisterComPlus"); break; - case TupleDefinitionType.CreateFolder: + case SymbolDefinitionType.CreateFolder: set.Add("InstallExecuteSequence/CreateFolders"); set.Add("InstallExecuteSequence/RemoveFolders"); break; - case TupleDefinitionType.DuplicateFile: + case SymbolDefinitionType.DuplicateFile: set.Add("InstallExecuteSequence/DuplicateFiles"); set.Add("InstallExecuteSequence/RemoveDuplicateFiles"); break; - case TupleDefinitionType.Environment: + case SymbolDefinitionType.Environment: set.Add("InstallExecuteSequence/WriteEnvironmentStrings"); set.Add("InstallExecuteSequence/RemoveEnvironmentStrings"); break; - case TupleDefinitionType.Extension: + case SymbolDefinitionType.Extension: set.Add("AdvertiseExecuteSequence/RegisterExtensionInfo"); set.Add("InstallExecuteSequence/RegisterExtensionInfo"); set.Add("InstallExecuteSequence/UnregisterExtensionInfo"); break; - case TupleDefinitionType.File: + case SymbolDefinitionType.File: set.Add("InstallExecuteSequence/InstallFiles"); set.Add("InstallExecuteSequence/RemoveFiles"); var foundFont = false; var foundSelfReg = false; var foundBindPath = false; - foreach (var file in this.Section.Tuples.OfType()) + foreach (var file in this.Section.Symbols.OfType()) { if (!foundFont && !String.IsNullOrEmpty(file.FontTitle)) { @@ -469,83 +469,83 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } break; - case TupleDefinitionType.IniFile: + case SymbolDefinitionType.IniFile: set.Add("InstallExecuteSequence/WriteIniValues"); set.Add("InstallExecuteSequence/RemoveIniValues"); break; - case TupleDefinitionType.IsolatedComponent: + case SymbolDefinitionType.IsolatedComponent: set.Add("InstallExecuteSequence/IsolateComponents"); break; - case TupleDefinitionType.LaunchCondition: + case SymbolDefinitionType.LaunchCondition: set.Add("InstallExecuteSequence/LaunchConditions"); set.Add("InstallUISequence/LaunchConditions"); break; - case TupleDefinitionType.MIME: + case SymbolDefinitionType.MIME: set.Add("AdvertiseExecuteSequence/RegisterMIMEInfo"); set.Add("InstallExecuteSequence/RegisterMIMEInfo"); set.Add("InstallExecuteSequence/UnregisterMIMEInfo"); break; - case TupleDefinitionType.MoveFile: + case SymbolDefinitionType.MoveFile: set.Add("InstallExecuteSequence/MoveFiles"); break; - case TupleDefinitionType.Assembly: + case SymbolDefinitionType.Assembly: set.Add("AdvertiseExecuteSequence/MsiPublishAssemblies"); set.Add("InstallExecuteSequence/MsiPublishAssemblies"); set.Add("InstallExecuteSequence/MsiUnpublishAssemblies"); break; - case TupleDefinitionType.MsiServiceConfig: - case TupleDefinitionType.MsiServiceConfigFailureActions: + case SymbolDefinitionType.MsiServiceConfig: + case SymbolDefinitionType.MsiServiceConfigFailureActions: set.Add("InstallExecuteSequence/MsiConfigureServices"); break; - case TupleDefinitionType.ODBCDataSource: - case TupleDefinitionType.ODBCTranslator: - case TupleDefinitionType.ODBCDriver: + case SymbolDefinitionType.ODBCDataSource: + case SymbolDefinitionType.ODBCTranslator: + case SymbolDefinitionType.ODBCDriver: set.Add("InstallExecuteSequence/SetODBCFolders"); set.Add("InstallExecuteSequence/InstallODBC"); set.Add("InstallExecuteSequence/RemoveODBC"); break; - case TupleDefinitionType.ProgId: + case SymbolDefinitionType.ProgId: set.Add("AdvertiseExecuteSequence/RegisterProgIdInfo"); set.Add("InstallExecuteSequence/RegisterProgIdInfo"); set.Add("InstallExecuteSequence/UnregisterProgIdInfo"); break; - case TupleDefinitionType.PublishComponent: + case SymbolDefinitionType.PublishComponent: set.Add("AdvertiseExecuteSequence/PublishComponents"); set.Add("InstallExecuteSequence/PublishComponents"); set.Add("InstallExecuteSequence/UnpublishComponents"); break; - case TupleDefinitionType.Registry: - case TupleDefinitionType.RemoveRegistry: + case SymbolDefinitionType.Registry: + case SymbolDefinitionType.RemoveRegistry: set.Add("InstallExecuteSequence/WriteRegistryValues"); set.Add("InstallExecuteSequence/RemoveRegistryValues"); break; - case TupleDefinitionType.RemoveFile: + case SymbolDefinitionType.RemoveFile: set.Add("InstallExecuteSequence/RemoveFiles"); break; - case TupleDefinitionType.ServiceControl: + case SymbolDefinitionType.ServiceControl: set.Add("InstallExecuteSequence/StartServices"); set.Add("InstallExecuteSequence/StopServices"); set.Add("InstallExecuteSequence/DeleteServices"); break; - case TupleDefinitionType.ServiceInstall: + case SymbolDefinitionType.ServiceInstall: set.Add("InstallExecuteSequence/InstallServices"); break; - case TupleDefinitionType.Shortcut: + case SymbolDefinitionType.Shortcut: set.Add("AdvertiseExecuteSequence/CreateShortcuts"); set.Add("InstallExecuteSequence/CreateShortcuts"); set.Add("InstallExecuteSequence/RemoveShortcuts"); break; - case TupleDefinitionType.TypeLib: + case SymbolDefinitionType.TypeLib: set.Add("InstallExecuteSequence/RegisterTypeLibraries"); set.Add("InstallExecuteSequence/UnregisterTypeLibraries"); break; - case TupleDefinitionType.Upgrade: + case SymbolDefinitionType.Upgrade: set.Add("InstallExecuteSequence/FindRelatedProducts"); set.Add("InstallUISequence/FindRelatedProducts"); // Only add the MigrateFeatureStates action if MigrateFeature attribute is set on // at least one UpgradeVersion element. - if (this.Section.Tuples.OfType().Any(t => t.MigrateFeatures)) + if (this.Section.Symbols.OfType().Any(t => t.MigrateFeatures)) { set.Add("InstallExecuteSequence/MigrateFeatureStates"); set.Add("InstallUISequence/MigrateFeatureStates"); @@ -557,7 +557,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind return set; } - private IEnumerable GetActions(SequenceTable sequence, string[] actionNames) + private IEnumerable GetActions(SequenceTable sequence, string[] actionNames) { foreach (var action in WindowsInstallerStandard.StandardActions()) { @@ -571,64 +571,64 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// /// Sequence an action before or after a standard action. /// - /// The action tuple to be sequenced. - /// Collection of actions which must be included. - private void SequenceActionTuple(WixActionTuple actionTuple, Dictionary requiredActionTuples) + /// The action symbol to be sequenced. + /// Collection of actions which must be included. + private void SequenceActionSymbol(WixActionSymbol actionSymbol, Dictionary requiredActionSymbols) { var after = false; - if (actionTuple.After != null) + if (actionSymbol.After != null) { after = true; } - else if (actionTuple.Before == null) + else if (actionSymbol.Before == null) { throw new InvalidOperationException("Found an action with no Sequence, Before, or After column set."); } - var parentActionName = (after ? actionTuple.After : actionTuple.Before); - var parentActionKey = actionTuple.SequenceTable.ToString() + "/" + parentActionName; + var parentActionName = (after ? actionSymbol.After : actionSymbol.Before); + var parentActionKey = actionSymbol.SequenceTable.ToString() + "/" + parentActionName; - if (!requiredActionTuples.TryGetValue(parentActionKey, out var parentActionTuple)) + if (!requiredActionSymbols.TryGetValue(parentActionKey, out var parentActionSymbol)) { // If the missing parent action is a standard action (with a suggested sequence number), add it. - if (WindowsInstallerStandard.TryGetStandardAction(parentActionKey, out parentActionTuple)) + if (WindowsInstallerStandard.TryGetStandardAction(parentActionKey, out parentActionSymbol)) { // Create a clone to avoid modifying the static copy of the object. - // TODO: consider this: parentActionTuple = parentActionTuple.Clone(); + // TODO: consider this: parentActionSymbol = parentActionSymbol.Clone(); - requiredActionTuples.Add(parentActionTuple.Id.Id, parentActionTuple); + requiredActionSymbols.Add(parentActionSymbol.Id.Id, parentActionSymbol); } else { throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, "Found an action with a non-existent {0} action: {1}.", (after ? "After" : "Before"), parentActionName)); } } - else if (actionTuple == parentActionTuple || this.ContainsChildActionTuple(actionTuple, parentActionTuple)) // cycle detected + else if (actionSymbol == parentActionSymbol || this.ContainsChildActionSymbol(actionSymbol, parentActionSymbol)) // cycle detected { - throw new WixException(ErrorMessages.ActionCircularDependency(actionTuple.SourceLineNumbers, actionTuple.SequenceTable.ToString(), actionTuple.Action, parentActionTuple.Action)); + throw new WixException(ErrorMessages.ActionCircularDependency(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action, parentActionSymbol.Action)); } - // Add this action to the appropriate list of dependent action tuples. - var relativeActions = this.GetRelativeActions(parentActionTuple); - var relatedTuples = (after ? relativeActions.NextActions : relativeActions.PreviousActions); - relatedTuples.Add(actionTuple); + // Add this action to the appropriate list of dependent action symbols. + var relativeActions = this.GetRelativeActions(parentActionSymbol); + var relatedSymbols = (after ? relativeActions.NextActions : relativeActions.PreviousActions); + relatedSymbols.Add(actionSymbol); } - private bool ContainsChildActionTuple(WixActionTuple childTuple, WixActionTuple parentTuple) + private bool ContainsChildActionSymbol(WixActionSymbol childSymbol, WixActionSymbol parentSymbol) { var result = false; - if (this.RelativeActionsForActions.TryGetValue(childTuple.Id.Id, out var relativeActions)) + if (this.RelativeActionsForActions.TryGetValue(childSymbol.Id.Id, out var relativeActions)) { - result = relativeActions.NextActions.Any(a => a.SequenceTable == parentTuple.SequenceTable && a.Id.Id == parentTuple.Id.Id) || - relativeActions.PreviousActions.Any(a => a.SequenceTable == parentTuple.SequenceTable && a.Id.Id == parentTuple.Id.Id); + result = relativeActions.NextActions.Any(a => a.SequenceTable == parentSymbol.SequenceTable && a.Id.Id == parentSymbol.Id.Id) || + relativeActions.PreviousActions.Any(a => a.SequenceTable == parentSymbol.SequenceTable && a.Id.Id == parentSymbol.Id.Id); } return result; } - private RelativeActions GetRelativeActions(WixActionTuple action) + private RelativeActions GetRelativeActions(WixActionSymbol action) { if (!this.RelativeActionsForActions.TryGetValue(action.Id.Id, out var relativeActions)) { @@ -639,7 +639,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind return relativeActions; } - private RelativeActions GetAllRelativeActionsForSequenceType(SequenceTable sequenceType, WixActionTuple action) + private RelativeActions GetAllRelativeActionsForSequenceType(SequenceTable sequenceType, WixActionSymbol action) { var relativeActions = new RelativeActions(); @@ -653,7 +653,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind return relativeActions; } - private void RecurseRelativeActionsForSequenceType(SequenceTable sequenceType, List actions, List visitedActions) + private void RecurseRelativeActionsForSequenceType(SequenceTable sequenceType, List actions, List visitedActions) { foreach (var action in actions.Where(a => a.SequenceTable == sequenceType)) { @@ -673,9 +673,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind private class RelativeActions { - public List PreviousActions { get; } = new List(); + public List PreviousActions { get; } = new List(); - public List NextActions { get; } = new List(); + public List NextActions { get; } = new List(); } } } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs index 75bcfe17..938627ed 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs @@ -11,7 +11,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using WixToolset.Core.Bind; using WixToolset.Core.WindowsInstaller.Msi; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Services; /// @@ -43,15 +43,15 @@ namespace WixToolset.Core.WindowsInstaller.Bind public void Execute() { - var assemblyNameTuples = this.Section.Tuples.OfType().ToDictionary(t => t.Id.Id); + var assemblyNameSymbols = this.Section.Symbols.OfType().ToDictionary(t => t.Id.Id); foreach (var file in this.UpdateFileFacades) { - this.UpdateFileFacade(file, assemblyNameTuples); + this.UpdateFileFacade(file, assemblyNameSymbols); } } - private void UpdateFileFacade(FileFacade facade, Dictionary assemblyNameTuples) + private void UpdateFileFacade(FileFacade facade, Dictionary assemblyNameSymbols) { FileInfo fileInfo = null; try @@ -155,7 +155,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (null == facade.Hash) { - facade.Hash = this.Section.AddTuple(new MsiFileHashTuple(facade.SourceLineNumber, facade.Identifier)); + facade.Hash = this.Section.AddSymbol(new MsiFileHashSymbol(facade.SourceLineNumber, facade.Identifier)); } facade.Hash.Options = 0; @@ -220,23 +220,23 @@ namespace WixToolset.Core.WindowsInstaller.Bind { var assemblyName = AssemblyNameReader.ReadAssembly(facade.SourceLineNumber, fileInfo.FullName, version); - this.SetMsiAssemblyName(assemblyNameTuples, facade, "name", assemblyName.Name); - this.SetMsiAssemblyName(assemblyNameTuples, facade, "culture", assemblyName.Culture); - this.SetMsiAssemblyName(assemblyNameTuples, facade, "version", assemblyName.Version); + this.SetMsiAssemblyName(assemblyNameSymbols, facade, "name", assemblyName.Name); + this.SetMsiAssemblyName(assemblyNameSymbols, facade, "culture", assemblyName.Culture); + this.SetMsiAssemblyName(assemblyNameSymbols, facade, "version", assemblyName.Version); if (!String.IsNullOrEmpty(assemblyName.Architecture)) { - this.SetMsiAssemblyName(assemblyNameTuples, facade, "processorArchitecture", assemblyName.Architecture); + this.SetMsiAssemblyName(assemblyNameSymbols, facade, "processorArchitecture", assemblyName.Architecture); } // TODO: WiX v3 seemed to do this but not clear it should actually be done. //else if (!String.IsNullOrEmpty(file.WixFile.ProcessorArchitecture)) //{ - // this.SetMsiAssemblyName(assemblyNameTuples, file, "processorArchitecture", file.WixFile.ProcessorArchitecture); + // this.SetMsiAssemblyName(assemblyNameSymbols, file, "processorArchitecture", file.WixFile.ProcessorArchitecture); //} if (assemblyName.StrongNamedSigned) { - this.SetMsiAssemblyName(assemblyNameTuples, facade, "publicKeyToken", assemblyName.PublicKeyToken); + this.SetMsiAssemblyName(assemblyNameSymbols, facade, "publicKeyToken", assemblyName.PublicKeyToken); } else if (facade.AssemblyApplicationFileRef == null) { @@ -245,7 +245,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (!String.IsNullOrEmpty(assemblyName.FileVersion)) { - this.SetMsiAssemblyName(assemblyNameTuples, facade, "fileVersion", assemblyName.FileVersion); + this.SetMsiAssemblyName(assemblyNameSymbols, facade, "fileVersion", assemblyName.FileVersion); } // add the assembly name to the information cache @@ -276,27 +276,27 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (!String.IsNullOrEmpty(assemblyName.Name)) { - this.SetMsiAssemblyName(assemblyNameTuples, facade, "name", assemblyName.Name); + this.SetMsiAssemblyName(assemblyNameSymbols, facade, "name", assemblyName.Name); } if (!String.IsNullOrEmpty(assemblyName.Version)) { - this.SetMsiAssemblyName(assemblyNameTuples, facade, "version", assemblyName.Version); + this.SetMsiAssemblyName(assemblyNameSymbols, facade, "version", assemblyName.Version); } if (!String.IsNullOrEmpty(assemblyName.Type)) { - this.SetMsiAssemblyName(assemblyNameTuples, facade, "type", assemblyName.Type); + this.SetMsiAssemblyName(assemblyNameSymbols, facade, "type", assemblyName.Type); } if (!String.IsNullOrEmpty(assemblyName.Architecture)) { - this.SetMsiAssemblyName(assemblyNameTuples, facade, "processorArchitecture", assemblyName.Architecture); + this.SetMsiAssemblyName(assemblyNameSymbols, facade, "processorArchitecture", assemblyName.Architecture); } if (!String.IsNullOrEmpty(assemblyName.PublicKeyToken)) { - this.SetMsiAssemblyName(assemblyNameTuples, facade, "publicKeyToken", assemblyName.PublicKeyToken); + this.SetMsiAssemblyName(assemblyNameSymbols, facade, "publicKeyToken", assemblyName.PublicKeyToken); } } catch (WixException e) @@ -310,11 +310,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// Set an MsiAssemblyName row. If it was directly authored, override the value, otherwise /// create a new row. /// - /// MsiAssemblyName table. + /// MsiAssemblyName table. /// FileFacade containing the assembly read for the MsiAssemblyName row. /// MsiAssemblyName name. /// MsiAssemblyName value. - private void SetMsiAssemblyName(Dictionary assemblyNameTuples, FileFacade facade, string name, string value) + private void SetMsiAssemblyName(Dictionary assemblyNameSymbols, FileFacade facade, string name, string value) { // check for null value (this can occur when grabbing the file version from an assembly without one) if (String.IsNullOrEmpty(value)) @@ -333,9 +333,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind // override directly authored value var lookup = String.Concat(facade.ComponentRef, "/", name); - if (!assemblyNameTuples.TryGetValue(lookup, out var assemblyNameTuple)) + if (!assemblyNameSymbols.TryGetValue(lookup, out var assemblyNameSymbol)) { - assemblyNameTuple = this.Section.AddTuple(new MsiAssemblyNameTuple(facade.SourceLineNumber, new Identifier(AccessModifier.Private, facade.ComponentRef, name)) + assemblyNameSymbol = this.Section.AddSymbol(new MsiAssemblyNameSymbol(facade.SourceLineNumber, new Identifier(AccessModifier.Private, facade.ComponentRef, name)) { ComponentRef = facade.ComponentRef, Name = name, @@ -344,15 +344,15 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (null == facade.AssemblyNames) { - facade.AssemblyNames = new List(); + facade.AssemblyNames = new List(); } - facade.AssemblyNames.Add(assemblyNameTuple); + facade.AssemblyNames.Add(assemblyNameSymbol); - assemblyNameTuples.Add(assemblyNameTuple.Id.Id, assemblyNameTuple); + assemblyNameSymbols.Add(assemblyNameSymbol.Id.Id, assemblyNameSymbol); } - assemblyNameTuple.Value = value; + assemblyNameSymbol.Value = value; if (this.VariableCache != null) { diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFromTextFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFromTextFilesCommand.cs index 4d09ff6b..66a648cc 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFromTextFilesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFromTextFilesCommand.cs @@ -6,7 +6,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.IO; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Services; internal class UpdateFromTextFilesCommand @@ -23,17 +23,17 @@ namespace WixToolset.Core.WindowsInstaller.Bind public void Execute() { - foreach (var bbControl in this.Section.Tuples.OfType().Where(t => t.SourceFile != null)) + foreach (var bbControl in this.Section.Symbols.OfType().Where(t => t.SourceFile != null)) { bbControl.Text = this.ReadTextFile(bbControl.SourceLineNumbers, bbControl.SourceFile.Path); } - foreach (var control in this.Section.Tuples.OfType().Where(t => t.SourceFile != null)) + foreach (var control in this.Section.Symbols.OfType().Where(t => t.SourceFile != null)) { control.Text = this.ReadTextFile(control.SourceLineNumbers, control.SourceFile.Path); } - foreach (var customAction in this.Section.Tuples.OfType().Where(c => c.ScriptFile != null)) + foreach (var customAction in this.Section.Symbols.OfType().Where(c => c.ScriptFile != null)) { customAction.Target = this.ReadTextFile(customAction.SourceLineNumbers, customAction.ScriptFile.Path); } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs index bf28b279..d3f2b9ea 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs @@ -6,7 +6,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Linq; using WixToolset.Core.Bind; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; internal class UpdateMediaSequencesCommand { @@ -22,7 +22,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind public void Execute() { - var mediaRows = this.Section.Tuples.OfType().ToDictionary(t => t.DiskId); + var mediaRows = this.Section.Symbols.OfType().ToDictionary(t => t.DiskId); // Calculate sequence numbers and media disk id layout for all file media information objects. if (SectionType.Module == this.Section.Type) @@ -37,25 +37,25 @@ namespace WixToolset.Core.WindowsInstaller.Bind else { var lastSequence = 0; - MediaTuple mediaTuple = null; + MediaSymbol mediaSymbol = null; var patchGroups = new Dictionary>(); // sequence the non-patch-added files foreach (var facade in this.FileFacades) { - if (null == mediaTuple) + if (null == mediaSymbol) { - mediaTuple = mediaRows[facade.DiskId]; + mediaSymbol = mediaRows[facade.DiskId]; if (SectionType.Patch == this.Section.Type) { // patch Media cannot start at zero - lastSequence = mediaTuple.LastSequence ?? 1; + lastSequence = mediaSymbol.LastSequence ?? 1; } } - else if (mediaTuple.DiskId != facade.DiskId) + else if (mediaSymbol.DiskId != facade.DiskId) { - mediaTuple.LastSequence = lastSequence; - mediaTuple = mediaRows[facade.DiskId]; + mediaSymbol.LastSequence = lastSequence; + mediaSymbol = mediaRows[facade.DiskId]; } if (facade.PatchGroup.HasValue) @@ -74,10 +74,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } - if (null != mediaTuple) + if (null != mediaSymbol) { - mediaTuple.LastSequence = lastSequence; - mediaTuple = null; + mediaSymbol.LastSequence = lastSequence; + mediaSymbol = null; } // sequence the patch-added files @@ -85,23 +85,23 @@ namespace WixToolset.Core.WindowsInstaller.Bind { foreach (var facade in patchGroup) { - if (null == mediaTuple) + if (null == mediaSymbol) { - mediaTuple = mediaRows[facade.DiskId]; + mediaSymbol = mediaRows[facade.DiskId]; } - else if (mediaTuple.DiskId != facade.DiskId) + else if (mediaSymbol.DiskId != facade.DiskId) { - mediaTuple.LastSequence = lastSequence; - mediaTuple = mediaRows[facade.DiskId]; + mediaSymbol.LastSequence = lastSequence; + mediaSymbol = mediaRows[facade.DiskId]; } facade.Sequence = ++lastSequence; } } - if (null != mediaTuple) + if (null != mediaSymbol) { - mediaTuple.LastSequence = lastSequence; + mediaSymbol.LastSequence = lastSequence; } } } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs index 2af45e77..944fb224 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs @@ -7,7 +7,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Linq; using WixToolset.Core.Bind; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Data.WindowsInstaller.Rows; using WixToolset.Extensibility.Services; @@ -307,9 +307,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind ref duplicateFilesSequence); if (!hasPatchFilesAction) { - WindowsInstallerStandard.TryGetStandardAction(tableName, "PatchFiles", out var patchFilesActionTuple); + WindowsInstallerStandard.TryGetStandardAction(tableName, "PatchFiles", out var patchFilesActionSymbol); - var sequence = patchFilesActionTuple.Sequence; + var sequence = patchFilesActionSymbol.Sequence; // Test for default sequence value's appropriateness if (installFilesSequence >= sequence || (0 != duplicateFilesSequence && duplicateFilesSequence <= sequence)) @@ -318,14 +318,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind { if (duplicateFilesSequence < installFilesSequence) { - throw new WixException(ErrorMessages.InsertInvalidSequenceActionOrder(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionTuple.Action)); + throw new WixException(ErrorMessages.InsertInvalidSequenceActionOrder(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionSymbol.Action)); } else { sequence = (duplicateFilesSequence + installFilesSequence) / 2; if (installFilesSequence == sequence || duplicateFilesSequence == sequence) { - throw new WixException(ErrorMessages.InsertSequenceNoSpace(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionTuple.Action)); + throw new WixException(ErrorMessages.InsertSequenceNoSpace(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionSymbol.Action)); } } } @@ -342,8 +342,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind } var patchAction = sequenceTable.CreateRow(null); - patchAction[0] = patchFilesActionTuple.Action; - patchAction[1] = patchFilesActionTuple.Condition; + patchAction[0] = patchFilesActionSymbol.Action; + patchAction[1] = patchFilesActionSymbol.Condition; patchAction[2] = sequence; patchAction.Operation = RowOperation.Add; } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ValidateComponentGuidsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ValidateComponentGuidsCommand.cs index 020a83fc..5cad9247 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/ValidateComponentGuidsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/ValidateComponentGuidsCommand.cs @@ -6,7 +6,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Collections.Generic; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Services; /// @@ -32,30 +32,30 @@ namespace WixToolset.Core.WindowsInstaller.Bind { var componentGuidConditions = new Dictionary(); - foreach (var componentTuple in this.Section.Tuples.OfType()) + foreach (var componentSymbol in this.Section.Symbols.OfType()) { // We don't care about unmanaged components and if there's a * GUID remaining, // there's already an error that prevented it from being replaced with a real GUID. - if (!String.IsNullOrEmpty(componentTuple.ComponentId) && "*" != componentTuple.ComponentId) + if (!String.IsNullOrEmpty(componentSymbol.ComponentId) && "*" != componentSymbol.ComponentId) { - var thisComponentHasCondition = !String.IsNullOrEmpty(componentTuple.Condition); + var thisComponentHasCondition = !String.IsNullOrEmpty(componentSymbol.Condition); var allComponentsHaveConditions = thisComponentHasCondition; - if (componentGuidConditions.TryGetValue(componentTuple.ComponentId, out var alreadyCheckedCondition)) + if (componentGuidConditions.TryGetValue(componentSymbol.ComponentId, out var alreadyCheckedCondition)) { allComponentsHaveConditions = thisComponentHasCondition && alreadyCheckedCondition; if (allComponentsHaveConditions) { - this.Messaging.Write(WarningMessages.DuplicateComponentGuidsMustHaveMutuallyExclusiveConditions(componentTuple.SourceLineNumbers, componentTuple.Id.Id, componentTuple.ComponentId)); + this.Messaging.Write(WarningMessages.DuplicateComponentGuidsMustHaveMutuallyExclusiveConditions(componentSymbol.SourceLineNumbers, componentSymbol.Id.Id, componentSymbol.ComponentId)); } else { - this.Messaging.Write(ErrorMessages.DuplicateComponentGuids(componentTuple.SourceLineNumbers, componentTuple.Id.Id, componentTuple.ComponentId)); + this.Messaging.Write(ErrorMessages.DuplicateComponentGuids(componentSymbol.SourceLineNumbers, componentSymbol.Id.Id, componentSymbol.ComponentId)); } } - componentGuidConditions[componentTuple.ComponentId] = allComponentsHaveConditions; + componentGuidConditions[componentSymbol.ComponentId] = allComponentsHaveConditions; } } } diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs index 7c3fd6be..72985c1c 100644 --- a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs +++ b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs @@ -14,7 +14,7 @@ namespace WixToolset.Core.WindowsInstaller using System.Xml.Linq; using WixToolset.Core; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Data.WindowsInstaller.Rows; using WixToolset.Extensibility; @@ -92,7 +92,7 @@ namespace WixToolset.Core.WindowsInstaller private OutputType OutputType { get; set; } - private Dictionary StandardActions { get; } + private Dictionary StandardActions { get; } /// /// Decompile the database file. @@ -262,23 +262,23 @@ namespace WixToolset.Core.WindowsInstaller /// /// Creates an action element. /// - /// The action from which the element should be created. - private void CreateActionElement(WixActionTuple actionTuple) + /// The action from which the element should be created. + private void CreateActionElement(WixActionSymbol actionSymbol) { Wix.ISchemaElement actionElement = null; - if (null != this.core.GetIndexedElement("CustomAction", actionTuple.Action)) // custom action + if (null != this.core.GetIndexedElement("CustomAction", actionSymbol.Action)) // custom action { var custom = new Wix.Custom(); - custom.Action = actionTuple.Action; + custom.Action = actionSymbol.Action; - if (null != actionTuple.Condition) + if (null != actionSymbol.Condition) { - custom.Content = actionTuple.Condition; + custom.Content = actionSymbol.Condition; } - switch (actionTuple.Sequence) + switch (actionSymbol.Sequence) { case (-4): custom.OnExit = Wix.ExitType.suspend; @@ -293,35 +293,35 @@ namespace WixToolset.Core.WindowsInstaller custom.OnExit = Wix.ExitType.success; break; default: - if (null != actionTuple.Before) + if (null != actionSymbol.Before) { - custom.Before = actionTuple.Before; + custom.Before = actionSymbol.Before; } - else if (null != actionTuple.After) + else if (null != actionSymbol.After) { - custom.After = actionTuple.After; + custom.After = actionSymbol.After; } - else if (actionTuple.Sequence.HasValue) + else if (actionSymbol.Sequence.HasValue) { - custom.Sequence = actionTuple.Sequence.Value; + custom.Sequence = actionSymbol.Sequence.Value; } break; } actionElement = custom; } - else if (null != this.core.GetIndexedElement("Dialog", actionTuple.Action)) // dialog + else if (null != this.core.GetIndexedElement("Dialog", actionSymbol.Action)) // dialog { var show = new Wix.Show(); - show.Dialog = actionTuple.Action; + show.Dialog = actionSymbol.Action; - if (null != actionTuple.Condition) + if (null != actionSymbol.Condition) { - show.Content = actionTuple.Condition; + show.Content = actionSymbol.Condition; } - switch (actionTuple.Sequence) + switch (actionSymbol.Sequence) { case (-4): show.OnExit = Wix.ExitType.suspend; @@ -336,17 +336,17 @@ namespace WixToolset.Core.WindowsInstaller show.OnExit = Wix.ExitType.success; break; default: - if (null != actionTuple.Before) + if (null != actionSymbol.Before) { - show.Before = actionTuple.Before; + show.Before = actionSymbol.Before; } - else if (null != actionTuple.After) + else if (null != actionSymbol.After) { - show.After = actionTuple.After; + show.After = actionSymbol.After; } - else if (actionTuple.Sequence.HasValue) + else if (actionSymbol.Sequence.HasValue) { - show.Sequence = actionTuple.Sequence.Value; + show.Sequence = actionSymbol.Sequence.Value; } break; } @@ -355,18 +355,18 @@ namespace WixToolset.Core.WindowsInstaller } else // possibly a standard action without suggested sequence information { - actionElement = this.CreateStandardActionElement(actionTuple); + actionElement = this.CreateStandardActionElement(actionSymbol); } // add the action element to the appropriate sequence element if (null != actionElement) { - var sequenceTable = actionTuple.SequenceTable.ToString(); + var sequenceTable = actionSymbol.SequenceTable.ToString(); var sequenceElement = (Wix.IParentElement)this.sequenceElements[sequenceTable]; if (null == sequenceElement) { - switch (actionTuple.SequenceTable) + switch (actionSymbol.SequenceTable) { case SequenceTable.AdminExecuteSequence: sequenceElement = new Wix.AdminExecuteSequence(); @@ -397,7 +397,7 @@ namespace WixToolset.Core.WindowsInstaller } catch (System.ArgumentException) // action/dialog is not valid for this sequence { - this.Messaging.Write(WarningMessages.IllegalActionInSequence(actionTuple.SourceLineNumbers, actionTuple.SequenceTable.ToString(), actionTuple.Action)); + this.Messaging.Write(WarningMessages.IllegalActionInSequence(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action)); } } } @@ -405,40 +405,40 @@ namespace WixToolset.Core.WindowsInstaller /// /// Creates a standard action element. /// - /// The action row from which the element should be created. + /// The action row from which the element should be created. /// The created element. - private Wix.ISchemaElement CreateStandardActionElement(WixActionTuple actionTuple) + private Wix.ISchemaElement CreateStandardActionElement(WixActionSymbol actionSymbol) { Wix.ActionSequenceType actionElement = null; - switch (actionTuple.Action) + switch (actionSymbol.Action) { case "AllocateRegistrySpace": actionElement = new Wix.AllocateRegistrySpace(); break; case "AppSearch": - this.StandardActions.TryGetValue(actionTuple.Id.Id, out var appSearchActionRow); + this.StandardActions.TryGetValue(actionSymbol.Id.Id, out var appSearchActionRow); - if (null != actionTuple.Before || null != actionTuple.After || (null != appSearchActionRow && actionTuple.Sequence != appSearchActionRow.Sequence)) + if (null != actionSymbol.Before || null != actionSymbol.After || (null != appSearchActionRow && actionSymbol.Sequence != appSearchActionRow.Sequence)) { var appSearch = new Wix.AppSearch(); - if (null != actionTuple.Condition) + if (null != actionSymbol.Condition) { - appSearch.Content = actionTuple.Condition; + appSearch.Content = actionSymbol.Condition; } - if (null != actionTuple.Before) + if (null != actionSymbol.Before) { - appSearch.Before = actionTuple.Before; + appSearch.Before = actionSymbol.Before; } - else if (null != actionTuple.After) + else if (null != actionSymbol.After) { - appSearch.After = actionTuple.After; + appSearch.After = actionSymbol.After; } - else if (actionTuple.Sequence.HasValue) + else if (actionSymbol.Sequence.HasValue) { - appSearch.Sequence = actionTuple.Sequence.Value; + appSearch.Sequence = actionSymbol.Sequence.Value; } return appSearch; @@ -449,7 +449,7 @@ namespace WixToolset.Core.WindowsInstaller break; case "CCPSearch": var ccpSearch = new Wix.CCPSearch(); - Decompiler.SequenceRelativeAction(actionTuple, ccpSearch); + Decompiler.SequenceRelativeAction(actionSymbol, ccpSearch); return ccpSearch; case "CostFinalize": actionElement = new Wix.CostFinalize(); @@ -468,7 +468,7 @@ namespace WixToolset.Core.WindowsInstaller break; case "DisableRollback": var disableRollback = new Wix.DisableRollback(); - Decompiler.SequenceRelativeAction(actionTuple, disableRollback); + Decompiler.SequenceRelativeAction(actionSymbol, disableRollback); return disableRollback; case "DuplicateFiles": actionElement = new Wix.DuplicateFiles(); @@ -481,22 +481,22 @@ namespace WixToolset.Core.WindowsInstaller break; case "FindRelatedProducts": var findRelatedProducts = new Wix.FindRelatedProducts(); - Decompiler.SequenceRelativeAction(actionTuple, findRelatedProducts); + Decompiler.SequenceRelativeAction(actionSymbol, findRelatedProducts); return findRelatedProducts; case "ForceReboot": var forceReboot = new Wix.ForceReboot(); - Decompiler.SequenceRelativeAction(actionTuple, forceReboot); + Decompiler.SequenceRelativeAction(actionSymbol, forceReboot); return forceReboot; case "InstallAdminPackage": actionElement = new Wix.InstallAdminPackage(); break; case "InstallExecute": var installExecute = new Wix.InstallExecute(); - Decompiler.SequenceRelativeAction(actionTuple, installExecute); + Decompiler.SequenceRelativeAction(actionSymbol, installExecute); return installExecute; case "InstallExecuteAgain": var installExecuteAgain = new Wix.InstallExecuteAgain(); - Decompiler.SequenceRelativeAction(actionTuple, installExecuteAgain); + Decompiler.SequenceRelativeAction(actionSymbol, installExecuteAgain); return installExecuteAgain; case "InstallFiles": actionElement = new Wix.InstallFiles(); @@ -521,7 +521,7 @@ namespace WixToolset.Core.WindowsInstaller break; case "LaunchConditions": var launchConditions = new Wix.LaunchConditions(); - Decompiler.SequenceRelativeAction(actionTuple, launchConditions); + Decompiler.SequenceRelativeAction(actionSymbol, launchConditions); return launchConditions; case "MigrateFeatureStates": actionElement = new Wix.MigrateFeatureStates(); @@ -585,7 +585,7 @@ namespace WixToolset.Core.WindowsInstaller break; case "RemoveExistingProducts": var removeExistingProducts = new Wix.RemoveExistingProducts(); - Decompiler.SequenceRelativeAction(actionTuple, removeExistingProducts); + Decompiler.SequenceRelativeAction(actionSymbol, removeExistingProducts); return removeExistingProducts; case "RemoveFiles": actionElement = new Wix.RemoveFiles(); @@ -607,15 +607,15 @@ namespace WixToolset.Core.WindowsInstaller break; case "ResolveSource": var resolveSource = new Wix.ResolveSource(); - Decompiler.SequenceRelativeAction(actionTuple, resolveSource); + Decompiler.SequenceRelativeAction(actionSymbol, resolveSource); return resolveSource; case "RMCCPSearch": var rmccpSearch = new Wix.RMCCPSearch(); - Decompiler.SequenceRelativeAction(actionTuple, rmccpSearch); + Decompiler.SequenceRelativeAction(actionSymbol, rmccpSearch); return rmccpSearch; case "ScheduleReboot": var scheduleReboot = new Wix.ScheduleReboot(); - Decompiler.SequenceRelativeAction(actionTuple, scheduleReboot); + Decompiler.SequenceRelativeAction(actionSymbol, scheduleReboot); return scheduleReboot; case "SelfRegModules": actionElement = new Wix.SelfRegModules(); @@ -672,13 +672,13 @@ namespace WixToolset.Core.WindowsInstaller actionElement = new Wix.WriteRegistryValues(); break; default: - this.Messaging.Write(WarningMessages.UnknownAction(actionTuple.SourceLineNumbers, actionTuple.SequenceTable.ToString(), actionTuple.Action)); + this.Messaging.Write(WarningMessages.UnknownAction(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action)); return null; } if (actionElement != null) { - this.SequenceStandardAction(actionTuple, actionElement); + this.SequenceStandardAction(actionSymbol, actionElement); } return actionElement; @@ -687,48 +687,48 @@ namespace WixToolset.Core.WindowsInstaller /// /// Applies the condition and sequence to a standard action element based on the action row data. /// - /// Action data from the database. + /// Action data from the database. /// Element to be sequenced. - private void SequenceStandardAction(WixActionTuple actionTuple, Wix.ActionSequenceType actionElement) + private void SequenceStandardAction(WixActionSymbol actionSymbol, Wix.ActionSequenceType actionElement) { - if (null != actionTuple.Condition) + if (null != actionSymbol.Condition) { - actionElement.Content = actionTuple.Condition; + actionElement.Content = actionSymbol.Condition; } - if ((null != actionTuple.Before || null != actionTuple.After) && 0 == actionTuple.Sequence) + if ((null != actionSymbol.Before || null != actionSymbol.After) && 0 == actionSymbol.Sequence) { - this.Messaging.Write(WarningMessages.DecompiledStandardActionRelativelyScheduledInModule(actionTuple.SourceLineNumbers, actionTuple.SequenceTable.ToString(), actionTuple.Action)); + this.Messaging.Write(WarningMessages.DecompiledStandardActionRelativelyScheduledInModule(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action)); } - else if (actionTuple.Sequence.HasValue) + else if (actionSymbol.Sequence.HasValue) { - actionElement.Sequence = actionTuple.Sequence.Value; + actionElement.Sequence = actionSymbol.Sequence.Value; } } /// /// Applies the condition and relative sequence to an action element based on the action row data. /// - /// Action data from the database. + /// Action data from the database. /// Element to be sequenced. - private static void SequenceRelativeAction(WixActionTuple actionTuple, Wix.ActionModuleSequenceType actionElement) + private static void SequenceRelativeAction(WixActionSymbol actionSymbol, Wix.ActionModuleSequenceType actionElement) { - if (null != actionTuple.Condition) + if (null != actionSymbol.Condition) { - actionElement.Content = actionTuple.Condition; + actionElement.Content = actionSymbol.Condition; } - if (null != actionTuple.Before) + if (null != actionSymbol.Before) { - actionElement.Before = actionTuple.Before; + actionElement.Before = actionSymbol.Before; } - else if (null != actionTuple.After) + else if (null != actionSymbol.After) { - actionElement.After = actionTuple.After; + actionElement.After = actionSymbol.After; } - else if (actionTuple.Sequence.HasValue) + else if (actionSymbol.Sequence.HasValue) { - actionElement.Sequence = actionTuple.Sequence.Value; + actionElement.Sequence = actionSymbol.Sequence.Value; } } @@ -2507,53 +2507,53 @@ namespace WixToolset.Core.WindowsInstaller if (null != table) { - var actionTuples = new List(); + var actionSymbols = new List(); var needAbsoluteScheduling = this.SuppressRelativeActionSequencing; - var nonSequencedActionRows = new Dictionary(); - var suppressedRelativeActionRows = new Dictionary(); + var nonSequencedActionRows = new Dictionary(); + var suppressedRelativeActionRows = new Dictionary(); // create a sorted array of actions in this table foreach (var row in table.Rows) { var action = row.FieldAsString(0); - var actionTuple = new WixActionTuple(null, new Identifier(AccessModifier.Public, sequenceTable, action)); + var actionSymbol = new WixActionSymbol(null, new Identifier(AccessModifier.Public, sequenceTable, action)); - actionTuple.Action = action; + actionSymbol.Action = action; if (null != row[1]) { - actionTuple.Condition = Convert.ToString(row[1]); + actionSymbol.Condition = Convert.ToString(row[1]); } - actionTuple.Sequence = Convert.ToInt32(row[2]); + actionSymbol.Sequence = Convert.ToInt32(row[2]); - actionTuple.SequenceTable = sequenceTable; + actionSymbol.SequenceTable = sequenceTable; - actionTuples.Add(actionTuple); + actionSymbols.Add(actionSymbol); } - actionTuples = actionTuples.OrderBy(t => t.Sequence).ToList(); + actionSymbols = actionSymbols.OrderBy(t => t.Sequence).ToList(); - for (var i = 0; i < actionTuples.Count && !needAbsoluteScheduling; i++) + for (var i = 0; i < actionSymbols.Count && !needAbsoluteScheduling; i++) { - var actionTuple = actionTuples[i]; - this.StandardActions.TryGetValue(actionTuple.Id.Id, out var standardActionRow); + var actionSymbol = actionSymbols[i]; + this.StandardActions.TryGetValue(actionSymbol.Id.Id, out var standardActionRow); // create actions for custom actions, dialogs, AppSearch when its moved, and standard actions with non-standard conditions - if ("AppSearch" == actionTuple.Action || null == standardActionRow || actionTuple.Condition != standardActionRow.Condition) + if ("AppSearch" == actionSymbol.Action || null == standardActionRow || actionSymbol.Condition != standardActionRow.Condition) { - WixActionTuple previousActionTuple = null; - WixActionTuple nextActionTuple = null; + WixActionSymbol previousActionSymbol = null; + WixActionSymbol nextActionSymbol = null; // find the previous action row if there is one if (0 <= i - 1) { - previousActionTuple = actionTuples[i - 1]; + previousActionSymbol = actionSymbols[i - 1]; } // find the next action row if there is one - if (actionTuples.Count > i + 1) + if (actionSymbols.Count > i + 1) { - nextActionTuple = actionTuples[i + 1]; + nextActionSymbol = actionSymbols[i + 1]; } // the logic for setting the before or after attribute for an action: @@ -2565,47 +2565,47 @@ namespace WixToolset.Core.WindowsInstaller // 6. If this action is AppSearch and has all standard information, ignore it. // 7. If this action is standard and has a non-standard condition, create the action without any scheduling information. // 8. Everything must be absolutely sequenced. - if ((null != previousActionTuple && actionTuple.Sequence == previousActionTuple.Sequence) || (null != nextActionTuple && actionTuple.Sequence == nextActionTuple.Sequence)) + if ((null != previousActionSymbol && actionSymbol.Sequence == previousActionSymbol.Sequence) || (null != nextActionSymbol && actionSymbol.Sequence == nextActionSymbol.Sequence)) { needAbsoluteScheduling = true; } - else if (null != nextActionTuple && this.StandardActions.ContainsKey(nextActionTuple.Id.Id) && actionTuple.Sequence + 1 == nextActionTuple.Sequence) + else if (null != nextActionSymbol && this.StandardActions.ContainsKey(nextActionSymbol.Id.Id) && actionSymbol.Sequence + 1 == nextActionSymbol.Sequence) { - actionTuple.Before = nextActionTuple.Action; + actionSymbol.Before = nextActionSymbol.Action; } - else if (null != previousActionTuple && this.StandardActions.ContainsKey(previousActionTuple.Id.Id) && actionTuple.Sequence - 1 == previousActionTuple.Sequence) + else if (null != previousActionSymbol && this.StandardActions.ContainsKey(previousActionSymbol.Id.Id) && actionSymbol.Sequence - 1 == previousActionSymbol.Sequence) { - actionTuple.After = previousActionTuple.Action; + actionSymbol.After = previousActionSymbol.Action; } - else if (null == standardActionRow && null != previousActionTuple && actionTuple.Sequence - 1 == previousActionTuple.Sequence && previousActionTuple.Before != actionTuple.Action) + else if (null == standardActionRow && null != previousActionSymbol && actionSymbol.Sequence - 1 == previousActionSymbol.Sequence && previousActionSymbol.Before != actionSymbol.Action) { - actionTuple.After = previousActionTuple.Action; + actionSymbol.After = previousActionSymbol.Action; } - else if (null == standardActionRow && null != previousActionTuple && actionTuple.Sequence != previousActionTuple.Sequence && null != nextActionTuple && actionTuple.Sequence + 1 == nextActionTuple.Sequence) + else if (null == standardActionRow && null != previousActionSymbol && actionSymbol.Sequence != previousActionSymbol.Sequence && null != nextActionSymbol && actionSymbol.Sequence + 1 == nextActionSymbol.Sequence) { - actionTuple.Before = nextActionTuple.Action; + actionSymbol.Before = nextActionSymbol.Action; } - else if ("AppSearch" == actionTuple.Action && null != standardActionRow && actionTuple.Sequence == standardActionRow.Sequence && actionTuple.Condition == standardActionRow.Condition) + else if ("AppSearch" == actionSymbol.Action && null != standardActionRow && actionSymbol.Sequence == standardActionRow.Sequence && actionSymbol.Condition == standardActionRow.Condition) { // ignore an AppSearch row which has the WiX standard sequence and a standard condition } - else if (null != standardActionRow && actionTuple.Condition != standardActionRow.Condition) // standard actions get their standard sequence numbers + else if (null != standardActionRow && actionSymbol.Condition != standardActionRow.Condition) // standard actions get their standard sequence numbers { - nonSequencedActionRows.Add(actionTuple.Id.Id, actionTuple); + nonSequencedActionRows.Add(actionSymbol.Id.Id, actionSymbol); } - else if (0 < actionTuple.Sequence) + else if (0 < actionSymbol.Sequence) { needAbsoluteScheduling = true; } } else { - suppressedRelativeActionRows.Add(actionTuple.Id.Id, actionTuple); + suppressedRelativeActionRows.Add(actionSymbol.Id.Id, actionSymbol); } } // create the actions now that we know if they must be absolutely or relatively scheduled - foreach (var actionRow in actionTuples) + foreach (var actionRow in actionSymbols) { var key = actionRow.Id.Id; @@ -2650,7 +2650,7 @@ namespace WixToolset.Core.WindowsInstaller { foreach (var row in table.Rows) { - var actionRow = new WixActionTuple(null, new Identifier(AccessModifier.Public, sequenceTable, row.FieldAsString(0))); + var actionRow = new WixActionSymbol(null, new Identifier(AccessModifier.Public, sequenceTable, row.FieldAsString(0))); actionRow.Action = row.FieldAsString(0); diff --git a/src/WixToolset.Core.WindowsInstaller/Differ.cs b/src/WixToolset.Core.WindowsInstaller/Differ.cs index 0e1a7315..304d0152 100644 --- a/src/WixToolset.Core.WindowsInstaller/Differ.cs +++ b/src/WixToolset.Core.WindowsInstaller/Differ.cs @@ -10,7 +10,7 @@ namespace WixToolset.Core.WindowsInstaller using System.Globalization; using WixToolset.Core.WindowsInstaller.Msi; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Data.WindowsInstaller.Rows; using WixToolset.Extensibility; diff --git a/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs b/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs index a1df335c..0082bc7c 100644 --- a/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs +++ b/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs @@ -9,34 +9,34 @@ namespace WixToolset.Core.WindowsInstaller.ExtensibilityServices internal class WindowsInstallerBackendHelper : IWindowsInstallerBackendHelper { - public Row CreateRow(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinition tableDefinition) + public Row CreateRow(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinition tableDefinition) { var table = output.EnsureTable(tableDefinition); - var row = table.CreateRow(tuple.SourceLineNumbers); + var row = table.CreateRow(symbol.SourceLineNumbers); row.SectionId = section.Id; return row; } - public bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions) + public bool TryAddSymbolToOutputMatchingTableDefinitions(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinitionCollection tableDefinitions) { - var tableDefinition = tableDefinitions.FirstOrDefault(t => t.TupleDefinition?.Name == tuple.Definition.Name); + var tableDefinition = tableDefinitions.FirstOrDefault(t => t.SymbolDefinition?.Name == symbol.Definition.Name); if (tableDefinition == null) { return false; } - var row = this.CreateRow(section, tuple, output, tableDefinition); + var row = this.CreateRow(section, symbol, output, tableDefinition); var rowOffset = 0; - if (tableDefinition.TupleIdIsPrimaryKey) + if (tableDefinition.SymbolIdIsPrimaryKey) { - row[0] = tuple.Id.Id; + row[0] = symbol.Id.Id; rowOffset = 1; } - for (var i = 0; i < tuple.Fields.Length; ++i) + for (var i = 0; i < symbol.Fields.Length; ++i) { if (i < tableDefinition.Columns.Length) { @@ -45,11 +45,11 @@ namespace WixToolset.Core.WindowsInstaller.ExtensibilityServices switch (column.Type) { case ColumnType.Number: - row[i + rowOffset] = column.Nullable ? tuple.AsNullableNumber(i) : tuple.AsNumber(i); + row[i + rowOffset] = column.Nullable ? symbol.AsNullableNumber(i) : symbol.AsNumber(i); break; default: - row[i + rowOffset] = tuple.AsString(i); + row[i + rowOffset] = symbol.AsString(i); break; } } diff --git a/src/WixToolset.Core.WindowsInstaller/MspBackend.cs b/src/WixToolset.Core.WindowsInstaller/MspBackend.cs index 5dc64445..46ff7aa3 100644 --- a/src/WixToolset.Core.WindowsInstaller/MspBackend.cs +++ b/src/WixToolset.Core.WindowsInstaller/MspBackend.cs @@ -10,7 +10,7 @@ namespace WixToolset.Core.WindowsInstaller using WixToolset.Core.WindowsInstaller.Msi; using WixToolset.Core.WindowsInstaller.Unbind; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; diff --git a/src/WixToolset.Core/Bind/DelayedField.cs b/src/WixToolset.Core/Bind/DelayedField.cs index 7d0045e6..25641516 100644 --- a/src/WixToolset.Core/Bind/DelayedField.cs +++ b/src/WixToolset.Core/Bind/DelayedField.cs @@ -6,26 +6,26 @@ namespace WixToolset.Core.Bind using WixToolset.Extensibility.Data; /// - /// Structure used to hold a row and field that contain binder variables, which need to be resolved + /// Holds a symbol and field that contain binder variables, which need to be resolved /// later, once the files have been resolved. /// internal class DelayedField : IDelayedField { /// - /// Basic constructor for struct + /// Creates a delayed field. /// - /// Row for the field. + /// Symbol for the field. /// Field needing further resolution. - public DelayedField(IntermediateTuple row, IntermediateField field) + public DelayedField(IntermediateSymbol symbol, IntermediateField field) { - this.Row = row; + this.Symbol = symbol; this.Field = field; } /// /// The row containing the field. /// - public IntermediateTuple Row { get; } + public IntermediateSymbol Symbol { get; } /// /// The field needing further resolving. diff --git a/src/WixToolset.Core/Bind/FileFacade.cs b/src/WixToolset.Core/Bind/FileFacade.cs index 511f4aab..075d3d34 100644 --- a/src/WixToolset.Core/Bind/FileFacade.cs +++ b/src/WixToolset.Core/Bind/FileFacade.cs @@ -5,25 +5,25 @@ namespace WixToolset.Core.Bind using System; using System.Collections.Generic; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Data.WindowsInstaller.Rows; public class FileFacade { - public FileFacade(FileTuple file, AssemblyTuple assembly) + public FileFacade(FileSymbol file, AssemblySymbol assembly) { - this.FileTuple = file; - this.AssemblyTuple = assembly; + this.FileSymbol = file; + this.AssemblySymbol = assembly; this.Identifier = file.Id; this.ComponentRef = file.ComponentRef; } - public FileFacade(bool fromModule, FileTuple file) + public FileFacade(bool fromModule, FileSymbol file) { this.FromModule = fromModule; - this.FileTuple = file; + this.FileSymbol = file; this.Identifier = file.Id; this.ComponentRef = file.ComponentRef; @@ -44,9 +44,9 @@ namespace WixToolset.Core.Bind private FileRow FileRow { get; } - private FileTuple FileTuple { get; } + private FileSymbol FileSymbol { get; } - private AssemblyTuple AssemblyTuple { get; } + private AssemblySymbol AssemblySymbol { get; } public string Id => this.Identifier.Id; @@ -56,12 +56,12 @@ namespace WixToolset.Core.Bind public int DiskId { - get => this.FileRow == null ? this.FileTuple.DiskId ?? 1 : this.FileRow.DiskId; + get => this.FileRow == null ? this.FileSymbol.DiskId ?? 1 : this.FileRow.DiskId; set { if (this.FileRow == null) { - this.FileTuple.DiskId = value; + this.FileSymbol.DiskId = value; } else { @@ -70,16 +70,16 @@ namespace WixToolset.Core.Bind } } - public string FileName => this.FileRow == null ? this.FileTuple.Name : this.FileRow.FileName; + public string FileName => this.FileRow == null ? this.FileSymbol.Name : this.FileRow.FileName; public int FileSize { - get => this.FileRow == null ? this.FileTuple.FileSize : this.FileRow.FileSize; + get => this.FileRow == null ? this.FileSymbol.FileSize : this.FileRow.FileSize; set { if (this.FileRow == null) { - this.FileTuple.FileSize = value; + this.FileSymbol.FileSize = value; } else { @@ -90,12 +90,12 @@ namespace WixToolset.Core.Bind public string Language { - get => this.FileRow == null ? this.FileTuple.Language : this.FileRow.Language; + get => this.FileRow == null ? this.FileSymbol.Language : this.FileRow.Language; set { if (this.FileRow == null) { - this.FileTuple.Language = value; + this.FileSymbol.Language = value; } else { @@ -104,16 +104,16 @@ namespace WixToolset.Core.Bind } } - public int? PatchGroup => this.FileRow == null ? this.FileTuple.PatchGroup : null; + public int? PatchGroup => this.FileRow == null ? this.FileSymbol.PatchGroup : null; public int Sequence { - get => this.FileRow == null ? this.FileTuple.Sequence : this.FileRow.Sequence; + get => this.FileRow == null ? this.FileSymbol.Sequence : this.FileRow.Sequence; set { if (this.FileRow == null) { - this.FileTuple.Sequence = value; + this.FileSymbol.Sequence = value; } else { @@ -122,22 +122,22 @@ namespace WixToolset.Core.Bind } } - public SourceLineNumber SourceLineNumber => this.FileRow == null ? this.FileTuple.SourceLineNumbers : this.FileRow.SourceLineNumbers; + public SourceLineNumber SourceLineNumber => this.FileRow == null ? this.FileSymbol.SourceLineNumbers : this.FileRow.SourceLineNumbers; - public string SourcePath => this.FileRow == null ? this.FileTuple.Source.Path : this.FileRow.Source; + public string SourcePath => this.FileRow == null ? this.FileSymbol.Source.Path : this.FileRow.Source; - public bool Compressed => this.FileRow == null ? (this.FileTuple.Attributes & FileTupleAttributes.Compressed) == FileTupleAttributes.Compressed : (this.FileRow.Attributes & WindowsInstallerConstants.MsidbFileAttributesCompressed) == WindowsInstallerConstants.MsidbFileAttributesCompressed; + public bool Compressed => this.FileRow == null ? (this.FileSymbol.Attributes & FileSymbolAttributes.Compressed) == FileSymbolAttributes.Compressed : (this.FileRow.Attributes & WindowsInstallerConstants.MsidbFileAttributesCompressed) == WindowsInstallerConstants.MsidbFileAttributesCompressed; - public bool Uncompressed => this.FileRow == null ? (this.FileTuple.Attributes & FileTupleAttributes.Uncompressed) == FileTupleAttributes.Uncompressed : (this.FileRow.Attributes & WindowsInstallerConstants.MsidbFileAttributesNoncompressed) == WindowsInstallerConstants.MsidbFileAttributesNoncompressed; + public bool Uncompressed => this.FileRow == null ? (this.FileSymbol.Attributes & FileSymbolAttributes.Uncompressed) == FileSymbolAttributes.Uncompressed : (this.FileRow.Attributes & WindowsInstallerConstants.MsidbFileAttributesNoncompressed) == WindowsInstallerConstants.MsidbFileAttributesNoncompressed; public string Version { - get => this.FileRow == null ? this.FileTuple.Version : this.FileRow.Version; + get => this.FileRow == null ? this.FileSymbol.Version : this.FileRow.Version; set { if (this.FileRow == null) { - this.FileTuple.Version = value; + this.FileSymbol.Version = value; } else { @@ -146,22 +146,22 @@ namespace WixToolset.Core.Bind } } - public AssemblyType? AssemblyType => this.FileRow == null ? this.AssemblyTuple?.Type : null; + public AssemblyType? AssemblyType => this.FileRow == null ? this.AssemblySymbol?.Type : null; - public string AssemblyApplicationFileRef => this.FileRow == null ? this.AssemblyTuple?.ApplicationFileRef : throw new NotImplementedException(); + public string AssemblyApplicationFileRef => this.FileRow == null ? this.AssemblySymbol?.ApplicationFileRef : throw new NotImplementedException(); - public string AssemblyManifestFileRef => this.FileRow == null ? this.AssemblyTuple?.ManifestFileRef : throw new NotImplementedException(); + public string AssemblyManifestFileRef => this.FileRow == null ? this.AssemblySymbol?.ManifestFileRef : throw new NotImplementedException(); /// /// Gets the set of MsiAssemblyName rows created for this file. /// /// RowCollection of MsiAssemblyName table. - public List AssemblyNames { get; set; } + public List AssemblyNames { get; set; } /// /// Gets or sets the MsiFileHash row for this file. /// - public MsiFileHashTuple Hash { get; set; } + public MsiFileHashSymbol Hash { get; set; } /// /// Allows direct access to the underlying FileRow as requried for patching. diff --git a/src/WixToolset.Core/Bind/FileResolver.cs b/src/WixToolset.Core/Bind/FileResolver.cs index 6bc5a676..d11fcadc 100644 --- a/src/WixToolset.Core/Bind/FileResolver.cs +++ b/src/WixToolset.Core/Bind/FileResolver.cs @@ -41,13 +41,13 @@ namespace WixToolset.Core.Bind private IEnumerable LibrarianExtensions { get; } - public string Resolve(SourceLineNumber sourceLineNumbers, IntermediateTupleDefinition tupleDefinition, string source) + public string Resolve(SourceLineNumber sourceLineNumbers, IntermediateSymbolDefinition symbolDefinition, string source) { var checkedPaths = new List(); foreach (var extension in this.LibrarianExtensions) { - var resolved = extension.ResolveFile(sourceLineNumbers, tupleDefinition, source); + var resolved = extension.ResolveFile(sourceLineNumbers, symbolDefinition, source); if (resolved?.CheckedPaths != null) { @@ -60,7 +60,7 @@ namespace WixToolset.Core.Bind } } - return this.MustResolveUsingBindPaths(source, tupleDefinition, sourceLineNumbers, BindStage.Normal, checkedPaths); + return this.MustResolveUsingBindPaths(source, symbolDefinition, sourceLineNumbers, BindStage.Normal, checkedPaths); } /// @@ -72,7 +72,7 @@ namespace WixToolset.Core.Bind /// The binding stage used to determine what collection of bind paths will be used /// Optional collection of paths already checked. /// Should return a valid path for the stream to be imported. - public string ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage, IEnumerable alreadyCheckedPaths = null) + public string ResolveFile(string source, IntermediateSymbolDefinition symbolDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage, IEnumerable alreadyCheckedPaths = null) { var checkedPaths = new List(); @@ -83,7 +83,7 @@ namespace WixToolset.Core.Bind foreach (var extension in this.ResolverExtensions) { - var resolved = extension.ResolveFile(source, tupleDefinition, sourceLineNumbers, bindStage); + var resolved = extension.ResolveFile(source, symbolDefinition, sourceLineNumbers, bindStage); if (resolved?.CheckedPaths != null) { @@ -96,10 +96,10 @@ namespace WixToolset.Core.Bind } } - return this.MustResolveUsingBindPaths(source, tupleDefinition, sourceLineNumbers, bindStage, checkedPaths); + return this.MustResolveUsingBindPaths(source, symbolDefinition, sourceLineNumbers, bindStage, checkedPaths); } - private string MustResolveUsingBindPaths(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage, List checkedPaths) + private string MustResolveUsingBindPaths(string source, IntermediateSymbolDefinition symbolDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage, List checkedPaths) { string resolved = null; @@ -180,7 +180,7 @@ namespace WixToolset.Core.Bind if (null == resolved) { - throw new WixException(ErrorMessages.FileNotFound(sourceLineNumbers, source, tupleDefinition.Name, checkedPaths)); + throw new WixException(ErrorMessages.FileNotFound(sourceLineNumbers, source, symbolDefinition.Name, checkedPaths)); } return resolved; diff --git a/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs b/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs index be0e4578..a10b98dc 100644 --- a/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs +++ b/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs @@ -42,15 +42,15 @@ namespace WixToolset.Core.Bind { try { - var propertyRow = delayedField.Row; + var propertySymbol = delayedField.Symbol; // process properties first in case they refer to other binder variables - if (delayedField.Row.Definition.Type == TupleDefinitionType.Property) + if (delayedField.Symbol.Definition.Type == SymbolDefinitionType.Property) { - var value = ResolveDelayedVariables(propertyRow.SourceLineNumbers, delayedField.Field.AsString(), this.VariableCache); + var value = ResolveDelayedVariables(propertySymbol.SourceLineNumbers, delayedField.Field.AsString(), this.VariableCache); // update the variable cache with the new value - var key = String.Concat("property.", propertyRow.AsString(0)); + var key = String.Concat("property.", propertySymbol.Id.Id); this.VariableCache[key] = value; // update the field data @@ -103,7 +103,7 @@ namespace WixToolset.Core.Bind { try { - var value = ResolveDelayedVariables(delayedField.Row.SourceLineNumbers, delayedField.Field.AsString(), this.VariableCache); + var value = ResolveDelayedVariables(delayedField.Symbol.SourceLineNumbers, delayedField.Field.AsString(), this.VariableCache); delayedField.Field.Set(value); } catch (WixException we) diff --git a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs index af7e262a..629e5f28 100644 --- a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs +++ b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs @@ -6,7 +6,7 @@ namespace WixToolset.Core.Bind using System.Collections.Generic; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; @@ -45,13 +45,13 @@ namespace WixToolset.Core.Bind var fileResolver = new FileResolver(this.BindPaths, this.Extensions); // Build the column lookup only when needed. - Dictionary customColumnsById = null; + Dictionary customColumnsById = null; foreach (var sections in this.Intermediate.Sections) { - foreach (var tuple in sections.Tuples) + foreach (var symbol in sections.Symbols) { - foreach (var field in tuple.Fields) + foreach (var field in symbol.Fields) { if (field.IsNull()) { @@ -63,20 +63,20 @@ namespace WixToolset.Core.Bind // Custom table cells require an extra look up to the column definition as the // cell's data type is always a string (because strings can store anything) but // the column definition may be more specific. - if (tuple.Definition.Type == TupleDefinitionType.WixCustomTableCell) + if (symbol.Definition.Type == SymbolDefinitionType.WixCustomTableCell) { // We only care about the Data in a CustomTable cell. - if (field.Name != nameof(WixCustomTableCellTupleFields.Data)) + if (field.Name != nameof(WixCustomTableCellSymbolFields.Data)) { continue; } if (customColumnsById == null) { - customColumnsById = this.Intermediate.Sections.SelectMany(s => s.Tuples.OfType()).ToDictionary(t => t.Id.Id); + customColumnsById = this.Intermediate.Sections.SelectMany(s => s.Symbols.OfType()).ToDictionary(t => t.Id.Id); } - if (customColumnsById.TryGetValue(tuple.Fields[(int)WixCustomTableCellTupleFields.TableRef].AsString() + "/" + tuple.Fields[(int)WixCustomTableCellTupleFields.ColumnRef].AsString(), out var customColumn)) + if (customColumnsById.TryGetValue(symbol.Fields[(int)WixCustomTableCellSymbolFields.TableRef].AsString() + "/" + symbol.Fields[(int)WixCustomTableCellSymbolFields.ColumnRef].AsString(), out var customColumn)) { fieldType = customColumn.Type; } @@ -93,7 +93,7 @@ namespace WixToolset.Core.Bind var original = field.AsString(); if (!String.IsNullOrEmpty(original)) { - var resolution = this.VariableResolver.ResolveVariables(tuple.SourceLineNumbers, original, !this.AllowUnresolvedVariables); + var resolution = this.VariableResolver.ResolveVariables(symbol.SourceLineNumbers, original, !this.AllowUnresolvedVariables); if (resolution.UpdatedValue) { field.Set(resolution.Value); @@ -101,7 +101,7 @@ namespace WixToolset.Core.Bind if (resolution.DelayedResolve) { - delayedFields.Add(new DelayedField(tuple, field)); + delayedFields.Add(new DelayedField(symbol, field)); } isDefault = resolution.IsDefault; @@ -109,7 +109,7 @@ namespace WixToolset.Core.Bind } } - // Move to next tuple if we've hit an error resolving variables. + // Move to next symbol if we've hit an error resolving variables. if (this.Messaging.EncounteredError) // TODO: make this error handling more specific to just the failure to resolve variables in this field. { continue; @@ -122,7 +122,7 @@ namespace WixToolset.Core.Bind #if TODO_PATCHING // Skip file resolution if the file is to be deleted. - if (RowOperation.Delete == tuple.Operation) + if (RowOperation.Delete == symbol.Operation) { continue; } @@ -151,13 +151,13 @@ namespace WixToolset.Core.Bind #endif // resolve the path to the file - var value = fileResolver.ResolveFile(objectField.Path, tuple.Definition, tuple.SourceLineNumbers, BindStage.Normal); + var value = fileResolver.ResolveFile(objectField.Path, symbol.Definition, symbol.SourceLineNumbers, BindStage.Normal); field.Set(value); } else if (!fileResolver.RebaseTarget && !fileResolver.RebaseUpdated) // Normal binding for Patch Scenario (normal patch, no re-basing logic) { // resolve the path to the file - var value = fileResolver.ResolveFile(objectField.Path, tuple.Definition, tuple.SourceLineNumbers, BindStage.Normal); + var value = fileResolver.ResolveFile(objectField.Path, symbol.Definition, symbol.SourceLineNumbers, BindStage.Normal); field.Set(value); } #if TODO_PATCHING @@ -179,7 +179,7 @@ namespace WixToolset.Core.Bind } } - objectField.Data = fileResolver.ResolveFile(filePathToResolve, tuple.Definition.Name, tuple.SourceLineNumbers, BindStage.Updated); + objectField.Data = fileResolver.ResolveFile(filePathToResolve, symbol.Definition.Name, symbol.SourceLineNumbers, BindStage.Updated); } #endif } @@ -192,7 +192,7 @@ namespace WixToolset.Core.Bind #if TODO_PATCHING if (null != objectField.PreviousData) { - objectField.PreviousData = this.BindVariableResolver.ResolveVariables(tuple.SourceLineNumbers, objectField.PreviousData, false, out isDefault); + objectField.PreviousData = this.BindVariableResolver.ResolveVariables(symbol.SourceLineNumbers, objectField.PreviousData, false, out isDefault); if (!Messaging.Instance.EncounteredError) // TODO: make this error handling more specific to just the failure to resolve variables in this field. { @@ -217,7 +217,7 @@ namespace WixToolset.Core.Bind if (!fileResolver.RebaseTarget && !fileResolver.RebaseUpdated) { // resolve the path to the file - objectField.PreviousData = fileResolver.ResolveFile((string)objectField.PreviousData, tuple.Definition.Name, tuple.SourceLineNumbers, BindStage.Normal); + objectField.PreviousData = fileResolver.ResolveFile((string)objectField.PreviousData, symbol.Definition.Name, symbol.SourceLineNumbers, BindStage.Normal); } else { @@ -235,14 +235,14 @@ namespace WixToolset.Core.Bind } // resolve the path to the file - objectField.PreviousData = fileResolver.ResolveFile((string)objectField.PreviousData, tuple.Definition.Name, tuple.SourceLineNumbers, BindStage.Target); + objectField.PreviousData = fileResolver.ResolveFile((string)objectField.PreviousData, symbol.Definition.Name, symbol.SourceLineNumbers, BindStage.Target); } } catch (WixFileNotFoundException) { // display the error with source line information - Messaging.Instance.Write(WixErrors.FileNotFound(tuple.SourceLineNumbers, (string)objectField.PreviousData)); + Messaging.Instance.Write(WixErrors.FileNotFound(symbol.SourceLineNumbers, (string)objectField.PreviousData)); } } } diff --git a/src/WixToolset.Core/Binder.cs b/src/WixToolset.Core/Binder.cs index a670714a..faaa3ec0 100644 --- a/src/WixToolset.Core/Binder.cs +++ b/src/WixToolset.Core/Binder.cs @@ -7,7 +7,7 @@ namespace WixToolset.Core using System.Linq; using System.Reflection; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; @@ -35,7 +35,7 @@ namespace WixToolset.Core // Bind. // - this.WriteBuildInfoTuple(context.IntermediateRepresentation, context.OutputPath, context.PdbPath); + this.WriteBuildInfoSymbol(context.IntermediateRepresentation, context.OutputPath, context.PdbPath); var bindResult = this.BackendBind(context); @@ -74,14 +74,14 @@ namespace WixToolset.Core return null; } - private void WriteBuildInfoTuple(Intermediate output, string outputFile, string outputPdbPath) + private void WriteBuildInfoSymbol(Intermediate output, string outputFile, string outputPdbPath) { var entrySection = output.Sections.First(s => s.Type != SectionType.Fragment); var executingAssembly = Assembly.GetExecutingAssembly(); var fileVersion = FileVersionInfo.GetVersionInfo(executingAssembly.Location); - var buildInfoTuple = entrySection.AddTuple(new WixBuildInfoTuple() + var buildInfoSymbol = entrySection.AddSymbol(new WixBuildInfoSymbol() { WixVersion = fileVersion.FileVersion, WixOutputFile = outputFile, @@ -89,7 +89,7 @@ namespace WixToolset.Core if (!String.IsNullOrEmpty(outputPdbPath)) { - buildInfoTuple.WixPdbFile = outputPdbPath; + buildInfoSymbol.WixPdbFile = outputPdbPath; } } } diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs index 8602c514..04a55264 100644 --- a/src/WixToolset.Core/CommandLine/BuildCommand.cs +++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs @@ -88,7 +88,7 @@ namespace WixToolset.Core.CommandLine var filterCultures = this.commandLine.CalculateFilterCultures(); - var creator = this.ServiceProvider.GetService(); + var creator = this.ServiceProvider.GetService(); this.EvaluateSourceFiles(sourceFiles, creator, out var codeFiles, out var wixipl); @@ -174,7 +174,7 @@ namespace WixToolset.Core.CommandLine return this.commandLine.TryParseArgument(argument, parser); } - private void EvaluateSourceFiles(IEnumerable sourceFiles, ITupleDefinitionCreator creator, out List codeFiles, out Intermediate wixipl) + private void EvaluateSourceFiles(IEnumerable sourceFiles, ISymbolDefinitionCreator creator, out List codeFiles, out Intermediate wixipl) { codeFiles = new List(); @@ -278,7 +278,7 @@ namespace WixToolset.Core.CommandLine return library; } - private Intermediate LinkPhase(IEnumerable intermediates, IEnumerable libraryFiles, ITupleDefinitionCreator creator, CancellationToken cancellationToken) + private Intermediate LinkPhase(IEnumerable intermediates, IEnumerable libraryFiles, ISymbolDefinitionCreator creator, CancellationToken cancellationToken) { var libraries = this.LoadLibraries(libraryFiles, creator); @@ -292,7 +292,7 @@ namespace WixToolset.Core.CommandLine context.ExtensionData = this.ExtensionManager.GetServices(); context.ExpectedOutputType = this.OutputType; context.Intermediates = intermediates.Concat(libraries).ToList(); - context.TupleDefinitionCreator = creator; + context.SymbolDefinitionCreator = creator; context.CancellationToken = cancellationToken; var linker = this.ServiceProvider.GetService(); @@ -382,7 +382,7 @@ namespace WixToolset.Core.CommandLine } } - private IEnumerable LoadLibraries(IEnumerable libraryFiles, ITupleDefinitionCreator creator) + private IEnumerable LoadLibraries(IEnumerable libraryFiles, ISymbolDefinitionCreator creator) { try { diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 56f6322a..e598f540 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs @@ -12,7 +12,7 @@ namespace WixToolset.Core using System.Text.RegularExpressions; using System.Xml.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; @@ -252,16 +252,16 @@ namespace WixToolset.Core { foreach (var section in target.Sections) { - foreach (var tuple in section.Tuples) + foreach (var symbol in section.Symbols) { - foreach (var field in tuple.Fields) + foreach (var field in symbol.Fields) { if (field?.Type == IntermediateFieldType.String) { var data = field.AsString(); if (!String.IsNullOrEmpty(data)) { - var resolved = this.componentIdPlaceholdersResolver.ResolveVariables(tuple.SourceLineNumbers, data, errorOnUnknown: false); + var resolved = this.componentIdPlaceholdersResolver.ResolveVariables(symbol.SourceLineNumbers, data, errorOnUnknown: false); if (resolved.UpdatedValue) { field.Set(resolved.Value); @@ -332,7 +332,7 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.SearchPropertyNotUppercase(sourceLineNumbers, "Property", "Id", propertyId.Id)); } - this.Core.AddTuple(new AppSearchTuple(sourceLineNumbers, new Identifier(propertyId.Access, propertyId.Id, signature)) + this.Core.AddSymbol(new AppSearchSymbol(sourceLineNumbers, new Identifier(propertyId.Access, propertyId.Id, signature)) { PropertyRef = propertyId.Id, SignatureRef = signature @@ -377,7 +377,7 @@ namespace WixToolset.Core { var section = this.Core.ActiveSection; - // Add the tuple to a separate section if requested. + // Add the symbol to a separate section if requested. if (fragment) { var id = String.Concat(this.Core.ActiveSection.Id, ".", propertyId.Id); @@ -385,24 +385,24 @@ namespace WixToolset.Core section = this.Core.CreateSection(id, SectionType.Fragment, this.Core.ActiveSection.Codepage, this.Context.CompilationId); // Reference the property in the active section. - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Property, propertyId.Id); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Property, propertyId.Id); } - // Allow tuple to exist with no value so that PropertyRefs can be made for *Search elements - // the linker will remove these tuples before the final output is created. - section.AddTuple(new PropertyTuple(sourceLineNumbers, propertyId) + // Allow symbol to exist with no value so that PropertyRefs can be made for *Search elements + // the linker will remove these symbols before the final output is created. + section.AddSymbol(new PropertySymbol(sourceLineNumbers, propertyId) { Value = value, }); if (admin || hidden || secure) { - this.AddWixPropertyTuple(sourceLineNumbers, propertyId, admin, secure, hidden, section); + this.AddWixPropertySymbol(sourceLineNumbers, propertyId, admin, secure, hidden, section); } } } - private void AddWixPropertyTuple(SourceLineNumber sourceLineNumbers, Identifier property, bool admin, bool secure, bool hidden, IntermediateSection section = null) + private void AddWixPropertySymbol(SourceLineNumber sourceLineNumbers, Identifier property, bool admin, bool secure, bool hidden, IntermediateSection section = null) { if (secure && property.Id != property.Id.ToUpperInvariant()) { @@ -416,7 +416,7 @@ namespace WixToolset.Core this.Core.EnsureTable(sourceLineNumbers, WindowsInstallerTableDefinitions.Property); // Property table is always required when using WixProperty table. } - section.AddTuple(new WixPropertyTuple(sourceLineNumbers) + section.AddSymbol(new WixPropertySymbol(sourceLineNumbers) { PropertyRef = property.Id, Admin = admin, @@ -552,7 +552,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new AppIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, appId)) + this.Core.AddSymbol(new AppIdSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, appId)) { AppId = appId, RemoteServerName = remoteServerName, @@ -650,7 +650,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new MsiAssemblyNameTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, componentId, id)) + this.Core.AddSymbol(new MsiAssemblyNameSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, componentId, id)) { ComponentRef = componentId, Name = id, @@ -737,14 +737,14 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new BinaryTuple(sourceLineNumbers, id) + var symbol = this.Core.AddSymbol(new BinarySymbol(sourceLineNumbers, id) { Data = new IntermediateFieldPathValue { Path = sourceFile } }); if (YesNoType.Yes == suppressModularization) { - this.Core.AddTuple(new WixSuppressModularizationTuple(sourceLineNumbers, id)); + this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers, id)); } } @@ -814,7 +814,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new IconTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new IconSymbol(sourceLineNumbers, id) { Data = new IntermediateFieldPathValue { Path = sourceFile }, }); @@ -840,7 +840,7 @@ namespace WixToolset.Core { case "Property": property = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Property, property); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Property, property); break; default: this.Core.UnexpectedAttribute(node, attrib); @@ -936,7 +936,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixInstanceTransformsTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new WixInstanceTransformsSymbol(sourceLineNumbers, id) { PropertyId = propertyId, ProductCode = productCode, @@ -973,7 +973,7 @@ namespace WixToolset.Core break; case "Feature": feature = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Feature, feature); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Feature, feature); break; case "Qualifier": qualifier = this.Core.GetAttributeValue(sourceLineNumbers, attrib); @@ -1003,7 +1003,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new PublishComponentTuple(sourceLineNumbers) + this.Core.AddSymbol(new PublishComponentSymbol(sourceLineNumbers) { ComponentId = id, Qualifier = qualifier, @@ -1187,7 +1187,7 @@ namespace WixToolset.Core if (!String.IsNullOrEmpty(localFileServer)) { - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, localFileServer); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, localFileServer); } // Local variables used strictly for child node processing. @@ -1260,7 +1260,7 @@ namespace WixToolset.Core { foreach (var context in contexts) { - var tuple = this.Core.AddTuple(new ClassTuple(sourceLineNumbers) + var symbol = this.Core.AddSymbol(new ClassSymbol(sourceLineNumbers) { CLSID = classId, Context = context, @@ -1276,19 +1276,19 @@ namespace WixToolset.Core if (null != appId) { - tuple.AppIdRef = appId; - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.AppId, appId); + symbol.AppIdRef = appId; + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.AppId, appId); } if (null != icon) { - tuple.IconRef = icon; - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Icon, icon); + symbol.IconRef = icon; + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Icon, icon); } if (CompilerConstants.IntegerNotSet != iconIndex) { - tuple.IconIndex = iconIndex; + symbol.IconIndex = iconIndex; } } } @@ -1369,7 +1369,7 @@ namespace WixToolset.Core if (null != icon) // ClassId default icon { - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, icon); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, icon); icon = String.Format(CultureInfo.InvariantCulture, "\"[#{0}]\"", icon); @@ -1649,7 +1649,7 @@ namespace WixToolset.Core string maximum = null; string minimum = null; var excludeLanguages = false; - var maxInclusive = false; + var maxInclusive = false; var minInclusive = true; foreach (var attrib in node.Attributes()) @@ -1699,7 +1699,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new UpgradeTuple(sourceLineNumbers) + this.Core.AddSymbol(new UpgradeSymbol(sourceLineNumbers) { UpgradeCode = upgradeCode, VersionMin = minimum, @@ -1850,7 +1850,7 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName)); } oneChild = true; - var newId = this.ParseSimpleRefElement(child, TupleDefinitions.Signature); // FileSearch signatures override parent signatures + var newId = this.ParseSimpleRefElement(child, SymbolDefinitions.Signature); // FileSearch signatures override parent signatures id = new Identifier(AccessModifier.Private, newId); signature = null; break; @@ -1867,7 +1867,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new RegLocatorTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new RegLocatorSymbol(sourceLineNumbers, id) { Root = root.Value, Key = key, @@ -1898,7 +1898,7 @@ namespace WixToolset.Core { case "Id": id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.RegLocator, id); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.RegLocator, id); break; default: this.Core.UnexpectedAttribute(node, attrib); @@ -2085,7 +2085,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new CCPSearchTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, signature))); + this.Core.AddSymbol(new CCPSearchSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, signature))); } } @@ -2351,10 +2351,10 @@ namespace WixToolset.Core encounteredODBCDataSource = true; break; case "ODBCDriver": - this.ParseODBCDriverOrTranslator(child, id.Id, null, TupleDefinitionType.ODBCDriver); + this.ParseODBCDriverOrTranslator(child, id.Id, null, SymbolDefinitionType.ODBCDriver); break; case "ODBCTranslator": - this.ParseODBCDriverOrTranslator(child, id.Id, null, TupleDefinitionType.ODBCTranslator); + this.ParseODBCDriverOrTranslator(child, id.Id, null, SymbolDefinitionType.ODBCTranslator); break; case "ProgId": var foundExtension = false; @@ -2480,7 +2480,7 @@ namespace WixToolset.Core } // if there isn't an @Id attribute value, replace the placeholder with the id of the keypath. - // either an explicit KeyPath="yes" attribute must be specified or requirements for + // either an explicit KeyPath="yes" attribute must be specified or requirements for // generatable guid must be met. if (componentIdPlaceholderWixVariable == id.Id) { @@ -2505,7 +2505,7 @@ namespace WixToolset.Core // finally add the Component table row if (!this.Core.EncounteredError) { - this.Core.AddTuple(new ComponentTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new ComponentSymbol(sourceLineNumbers, id) { ComponentId = guid, DirectoryRef = directoryId, @@ -2525,7 +2525,7 @@ namespace WixToolset.Core if (multiInstance) { - this.Core.AddTuple(new WixInstanceComponentTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new WixInstanceComponentSymbol(sourceLineNumbers, id) { ComponentRef = id.Id, }); @@ -2533,7 +2533,7 @@ namespace WixToolset.Core if (0 < symbols.Count) { - this.Core.AddTuple(new WixDeltaPatchSymbolPathsTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, SymbolPathType.Component, id.Id)) + this.Core.AddSymbol(new WixDeltaPatchSymbolPathsSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, SymbolPathType.Component, id.Id)) { SymbolType = SymbolPathType.Component, SymbolId = id.Id, @@ -2544,7 +2544,7 @@ namespace WixToolset.Core // Complus if (CompilerConstants.IntegerNotSet != comPlusBits) { - this.Core.AddTuple(new ComplusTuple(sourceLineNumbers) + this.Core.AddSymbol(new ComplusSymbol(sourceLineNumbers) { ComponentRef = id.Id, ExpType = comPlusBits, @@ -2643,7 +2643,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixComponentGroupTuple(sourceLineNumbers, id)); + this.Core.AddSymbol(new WixComponentGroupSymbol(sourceLineNumbers, id)); // Add this componentGroup and its parent in WixGroup. this.Core.CreateWixGroupRow(sourceLineNumbers, parentType, parentId, ComplexReferenceChildType.ComponentGroup, id.Id); @@ -2673,7 +2673,7 @@ namespace WixToolset.Core { case "Id": id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixComponentGroup, id); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixComponentGroup, id); break; case "Primary": primary = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); @@ -2722,7 +2722,7 @@ namespace WixToolset.Core { case "Id": id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Component, id); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Component, id); break; case "Primary": primary = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); @@ -2846,7 +2846,7 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName)); } oneChild = true; - var newId = this.ParseSimpleRefElement(child, TupleDefinitions.Signature); // FileSearch signatures override parent signatures + var newId = this.ParseSimpleRefElement(child, SymbolDefinitions.Signature); // FileSearch signatures override parent signatures id = new Identifier(AccessModifier.Private, newId); signature = null; break; @@ -2863,7 +2863,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new CompLocatorTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new CompLocatorSymbol(sourceLineNumbers, id) { SignatureRef = id.Id, ComponentId = componentId, @@ -2934,7 +2934,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new CreateFolderTuple(sourceLineNumbers) + this.Core.AddSymbol(new CreateFolderSymbol(sourceLineNumbers) { DirectoryRef = directoryId, ComponentRef = componentId, @@ -2994,7 +2994,7 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } fileId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, fileId); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, fileId); break; case "SourceDirectory": sourceDirectory = this.Core.CreateDirectoryReferenceFromInlineSyntax(sourceLineNumbers, attrib, null); @@ -3059,7 +3059,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new MoveFileTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new MoveFileSymbol(sourceLineNumbers, id) { ComponentRef = componentId, SourceName = sourceName, @@ -3104,7 +3104,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new DuplicateFileTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new DuplicateFileSymbol(sourceLineNumbers, id) { ComponentRef = componentId, FileRef = fileId, @@ -3158,7 +3158,7 @@ namespace WixToolset.Core } source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); sourceType = CustomActionSourceType.Binary; - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Binary, source); // add a reference to the appropriate Binary + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Binary, source); // add a reference to the appropriate Binary break; case "Directory": if (null != source) @@ -3185,12 +3185,12 @@ namespace WixToolset.Core sourceType = CustomActionSourceType.File; targetType = CustomActionTargetType.TextData; - // The target can be either a formatted error string or a literal + // The target can be either a formatted error string or a literal // error number. Try to convert to error number to determine whether // to add a reference. No need to look at the value. if (Int32.TryParse(target, out var ignored)) { - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Error, target); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Error, target); } break; case "ExeCommand": @@ -3238,7 +3238,7 @@ namespace WixToolset.Core } source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); sourceType = CustomActionSourceType.File; - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, source); // add a reference to the appropriate File + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, source); // add a reference to the appropriate File break; case "HideTarget": hidden = YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); @@ -3459,7 +3459,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new CustomActionTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new CustomActionSymbol(sourceLineNumbers, id) { ExecutionType = executionType, Source = source, @@ -3478,7 +3478,7 @@ namespace WixToolset.Core if (YesNoType.Yes == suppressModularization) { - this.Core.AddTuple(new WixSuppressModularizationTuple(sourceLineNumbers, id)); + this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers, id)); } } } @@ -3487,9 +3487,9 @@ namespace WixToolset.Core /// Parses a simple reference element. /// /// Element to parse. - /// Tuple which contains the target of the simple reference. + /// Symbol which contains the target of the simple reference. /// Id of the referenced element. - private string ParseSimpleRefElement(XElement node, IntermediateTupleDefinition tupleDefinition) + private string ParseSimpleRefElement(XElement node, IntermediateSymbolDefinition symbolDefinition) { var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); string id = null; @@ -3502,7 +3502,7 @@ namespace WixToolset.Core { case "Id": id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, tupleDefinition.Name, id); + this.Core.CreateSimpleReference(sourceLineNumbers, symbolDefinition.Name, id); break; default: this.Core.UnexpectedAttribute(node, attrib); @@ -3565,7 +3565,7 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id")); } - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.MsiPatchSequence, primaryKeys); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.MsiPatchSequence, primaryKeys); this.Core.ParseForExtensionElements(node); @@ -3628,7 +3628,7 @@ namespace WixToolset.Core var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); string tableId = null; var unreal = false; - var columns = new List(); + var columns = new List(); foreach (var attrib in node.Attributes()) { @@ -3699,9 +3699,9 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var columnNames = String.Join(new string(WixCustomTableTuple.ColumnNamesSeparator, 1), columns.Select(c => c.Name)); + var columnNames = String.Join(new string(WixCustomTableSymbol.ColumnNamesSeparator, 1), columns.Select(c => c.Name)); - this.Core.AddTuple(new WixCustomTableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, tableId)) + this.Core.AddSymbol(new WixCustomTableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, tableId)) { ColumnNames = columnNames, Unreal = unreal, @@ -3716,7 +3716,7 @@ namespace WixToolset.Core /// Element to parse. /// Element's SourceLineNumbers. /// Table Id. - private WixCustomTableColumnTuple ParseColumnElement(XElement child, SourceLineNumber childSourceLineNumbers, string tableId) + private WixCustomTableColumnSymbol ParseColumnElement(XElement child, SourceLineNumber childSourceLineNumbers, string tableId) { string columnName = null; IntermediateFieldType? columnType = null; @@ -3968,12 +3968,12 @@ namespace WixToolset.Core return null; } - var attributes = primaryKey ? WixCustomTableColumnTupleAttributes.PrimaryKey : WixCustomTableColumnTupleAttributes.None; - attributes |= localizable ? WixCustomTableColumnTupleAttributes.Localizable : WixCustomTableColumnTupleAttributes.None; - attributes |= nullable ? WixCustomTableColumnTupleAttributes.Nullable : WixCustomTableColumnTupleAttributes.None; - attributes |= columnUnreal ? WixCustomTableColumnTupleAttributes.Unreal : WixCustomTableColumnTupleAttributes.None; + var attributes = primaryKey ? WixCustomTableColumnSymbolAttributes.PrimaryKey : WixCustomTableColumnSymbolAttributes.None; + attributes |= localizable ? WixCustomTableColumnSymbolAttributes.Localizable : WixCustomTableColumnSymbolAttributes.None; + attributes |= nullable ? WixCustomTableColumnSymbolAttributes.Nullable : WixCustomTableColumnSymbolAttributes.None; + attributes |= columnUnreal ? WixCustomTableColumnSymbolAttributes.Unreal : WixCustomTableColumnSymbolAttributes.None; - var column = this.Core.AddTuple(new WixCustomTableColumnTuple(childSourceLineNumbers, new Identifier(AccessModifier.Private, tableId, columnName)) + var column = this.Core.AddSymbol(new WixCustomTableColumnSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Private, tableId, columnName)) { TableRef = tableId, Name = columnName, @@ -4038,7 +4038,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixCustomTableCellTuple(childSourceLineNumbers, new Identifier(AccessModifier.Private, tableId, rowId, columnName)) + this.Core.AddSymbol(new WixCustomTableCellSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Private, tableId, rowId, columnName)) { RowId = rowId, ColumnRef = columnName, @@ -4055,7 +4055,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixCustomTable, tableId); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixCustomTable, tableId); } } @@ -4153,7 +4153,7 @@ namespace WixToolset.Core if (inlineSyntax[0].EndsWith(":")) { parentId = inlineSyntax[0].TrimEnd(':'); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Directory, parentId); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Directory, parentId); pathStartsAt = 1; } @@ -4298,7 +4298,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new DirectoryTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new DirectorySymbol(sourceLineNumbers, id) { ParentDirectoryRef = parentId, Name = name, @@ -4310,7 +4310,7 @@ namespace WixToolset.Core if (null != symbols) { - this.Core.AddTuple(new WixDeltaPatchSymbolPathsTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new WixDeltaPatchSymbolPathsSymbol(sourceLineNumbers, id) { SymbolType = SymbolPathType.Directory, SymbolId = id.Id, @@ -4340,7 +4340,7 @@ namespace WixToolset.Core { case "Id": id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Directory, id); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Directory, id); break; case "DiskId": diskId = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, Int16.MaxValue); @@ -4487,7 +4487,7 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName)); } oneChild = true; - signature = this.ParseSimpleRefElement(child, TupleDefinitions.Signature); + signature = this.ParseSimpleRefElement(child, SymbolDefinitions.Signature); break; default: this.Core.UnexpectedElement(node, child); @@ -4532,7 +4532,7 @@ namespace WixToolset.Core signature = id.Id; } - var tuple = this.Core.AddTuple(new DrLocatorTuple(sourceLineNumbers, new Identifier(access, rowId, parentSignature, path)) + var symbol = this.Core.AddSymbol(new DrLocatorSymbol(sourceLineNumbers, new Identifier(access, rowId, parentSignature, path)) { SignatureRef = rowId, Parent = parentSignature, @@ -4541,7 +4541,7 @@ namespace WixToolset.Core if (CompilerConstants.IntegerNotSet != depth) { - tuple.Depth = depth; + symbol.Depth = depth; } } @@ -4645,7 +4645,7 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName)); } oneChild = true; - signature = this.ParseSimpleRefElement(child, TupleDefinitions.Signature); + signature = this.ParseSimpleRefElement(child, SymbolDefinitions.Signature); break; default: this.Core.UnexpectedElement(node, child); @@ -4659,7 +4659,7 @@ namespace WixToolset.Core } - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.DrLocator, id.Id, parentSignature, path); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.DrLocator, id.Id, parentSignature, path); return signature; } @@ -4670,7 +4670,7 @@ namespace WixToolset.Core /// Element to parse. /// The type of parent. /// Optional identifer for parent feature. - /// Display value for last feature used to get the features to display in the same order as specified + /// Display value for last feature used to get the features to display in the same order as specified /// in the source code. [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] private void ParseFeatureElement(XElement node, ComplexReferenceParentType parentType, string parentId, ref int lastDisplay) @@ -4899,7 +4899,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new FeatureTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new FeatureSymbol(sourceLineNumbers, id) { ParentFeatureRef = null, // this field is set in the linker Title = title, @@ -4941,7 +4941,7 @@ namespace WixToolset.Core { case "Id": id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Feature, id); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Feature, id); break; case "IgnoreParent": ignoreParent = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); @@ -5091,7 +5091,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixFeatureGroupTuple(sourceLineNumbers, id)); + this.Core.AddSymbol(new WixFeatureGroupSymbol(sourceLineNumbers, id)); //Add this FeatureGroup and its parent in WixGroup. this.Core.CreateWixGroupRow(sourceLineNumbers, parentType, parentId, ComplexReferenceChildType.FeatureGroup, id.Id); @@ -5121,7 +5121,7 @@ namespace WixToolset.Core { case "Id": id = this.Core.GetAttributeValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixFeatureGroup, id); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixFeatureGroup, id); break; case "IgnoreParent": ignoreParent = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); @@ -5290,7 +5290,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new EnvironmentTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new EnvironmentSymbol(sourceLineNumbers, id) { Name = name, Value = value, @@ -5347,7 +5347,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new ErrorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, id)) + this.Core.AddSymbol(new ErrorSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, id)) { Message = message }); @@ -5436,7 +5436,7 @@ namespace WixToolset.Core { if (!this.Core.EncounteredError) { - this.Core.AddTuple(new ExtensionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, extension, componentId)) + this.Core.AddSymbol(new ExtensionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, extension, componentId)) { Extension = extension, ComponentRef = componentId, @@ -5542,11 +5542,11 @@ namespace WixToolset.Core break; case "AssemblyApplication": assemblyApplication = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, assemblyApplication); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, assemblyApplication); break; case "AssemblyManifest": assemblyManifest = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, assemblyManifest); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, assemblyManifest); break; case "BindPath": bindPath = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty); @@ -5560,7 +5560,7 @@ namespace WixToolset.Core break; case "CompanionFile": companionFile = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, companionFile); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, companionFile); break; case "Compressed": var compressedValue = this.Core.GetAttributeYesNoDefaultValue(sourceLineNumbers, attrib); @@ -5781,10 +5781,10 @@ namespace WixToolset.Core this.ParseRangeElement(child, ref ignoreOffsets, ref ignoreLengths); break; case "ODBCDriver": - this.ParseODBCDriverOrTranslator(child, componentId, id.Id, TupleDefinitionType.ODBCDriver); + this.ParseODBCDriverOrTranslator(child, componentId, id.Id, SymbolDefinitionType.ODBCDriver); break; case "ODBCTranslator": - this.ParseODBCDriverOrTranslator(child, componentId, id.Id, TupleDefinitionType.ODBCTranslator); + this.ParseODBCDriverOrTranslator(child, componentId, id.Id, SymbolDefinitionType.ODBCTranslator); break; case "Permission": this.ParsePermissionElement(child, id.Id, "File"); @@ -5848,17 +5848,17 @@ namespace WixToolset.Core source = null == name ? Path.Combine(source, shortName) : Path.Combine(source, name); } - var attributes = FileTupleAttributes.None; - attributes |= readOnly ? FileTupleAttributes.ReadOnly : 0; - attributes |= hidden ? FileTupleAttributes.Hidden : 0; - attributes |= system ? FileTupleAttributes.System : 0; - attributes |= vital ? FileTupleAttributes.Vital : 0; - attributes |= checksum ? FileTupleAttributes.Checksum : 0; - attributes |= compressed.HasValue && compressed == true ? FileTupleAttributes.Compressed : 0; - attributes |= compressed.HasValue && compressed == false ? FileTupleAttributes.Uncompressed : 0; - attributes |= generatedShortFileName ? FileTupleAttributes.GeneratedShortFileName : 0; + var attributes = FileSymbolAttributes.None; + attributes |= readOnly ? FileSymbolAttributes.ReadOnly : 0; + attributes |= hidden ? FileSymbolAttributes.Hidden : 0; + attributes |= system ? FileSymbolAttributes.System : 0; + attributes |= vital ? FileSymbolAttributes.Vital : 0; + attributes |= checksum ? FileSymbolAttributes.Checksum : 0; + attributes |= compressed.HasValue && compressed == true ? FileSymbolAttributes.Compressed : 0; + attributes |= compressed.HasValue && compressed == false ? FileSymbolAttributes.Uncompressed : 0; + attributes |= generatedShortFileName ? FileSymbolAttributes.GeneratedShortFileName : 0; - this.Core.AddTuple(new FileTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new FileSymbol(sourceLineNumbers, id) { ComponentRef = componentId, Name = name, @@ -5897,7 +5897,7 @@ namespace WixToolset.Core if (AssemblyType.NotAnAssembly != assemblyType) { - this.Core.AddTuple(new AssemblyTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new AssemblySymbol(sourceLineNumbers, id) { ComponentRef = componentId, FeatureRef = Guid.Empty.ToString("B"), @@ -5911,7 +5911,7 @@ namespace WixToolset.Core if (CompilerConstants.IntegerNotSet != diskId) { - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Media, diskId.ToString(CultureInfo.InvariantCulture.NumberFormat)); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Media, diskId.ToString(CultureInfo.InvariantCulture.NumberFormat)); } // If this component does not have a companion file this file is a possible keypath. @@ -6052,7 +6052,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new SignatureTuple(sourceLineNumbers, id) + var symbol = this.Core.AddSymbol(new SignatureSymbol(sourceLineNumbers, id) { FileName = name ?? shortName, MinVersion = minVersion, @@ -6062,22 +6062,22 @@ namespace WixToolset.Core if (CompilerConstants.IntegerNotSet != minSize) { - tuple.MinSize = minSize; + symbol.MinSize = minSize; } if (CompilerConstants.IntegerNotSet != maxSize) { - tuple.MaxSize = maxSize; + symbol.MaxSize = maxSize; } if (CompilerConstants.IntegerNotSet != minDate) { - tuple.MinDate = minDate; + symbol.MinDate = minDate; } if (CompilerConstants.IntegerNotSet != maxDate) { - tuple.MaxDate = maxDate; + symbol.MaxDate = maxDate; } // Create a DrLocator row to associate the file with a directory @@ -6088,7 +6088,7 @@ namespace WixToolset.Core { // Creates the DrLocator row for the directory search while // the parent DirectorySearch creates the file locator row. - this.Core.AddTuple(new DrLocatorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, parentSignature, id.Id, String.Empty)) + this.Core.AddSymbol(new DrLocatorSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, parentSignature, id.Id, String.Empty)) { SignatureRef = parentSignature, Parent = id.Id @@ -6096,7 +6096,7 @@ namespace WixToolset.Core } else { - this.Core.AddTuple(new DrLocatorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, id.Id, parentSignature, String.Empty)) + this.Core.AddSymbol(new DrLocatorSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, id.Id, parentSignature, String.Empty)) { SignatureRef = id.Id, Parent = parentSignature @@ -6191,7 +6191,7 @@ namespace WixToolset.Core this.ParseBundleExtensionElement(child); break; case "BundleExtensionRef": - this.ParseSimpleRefElement(child, TupleDefinitions.WixBundleExtension); + this.ParseSimpleRefElement(child, SymbolDefinitions.WixBundleExtension); break; case "ComplianceCheck": this.ParseComplianceCheckElement(child); @@ -6209,7 +6209,7 @@ namespace WixToolset.Core this.ParseCustomActionElement(child); break; case "CustomActionRef": - this.ParseSimpleRefElement(child, TupleDefinitions.CustomAction); + this.ParseSimpleRefElement(child, SymbolDefinitions.CustomAction); break; case "CustomTable": this.ParseCustomTableElement(child); @@ -6224,7 +6224,7 @@ namespace WixToolset.Core this.ParseEmbeddedChainerElement(child); break; case "EmbeddedChainerRef": - this.ParseSimpleRefElement(child, TupleDefinitions.MsiEmbeddedChainer); + this.ParseSimpleRefElement(child, SymbolDefinitions.MsiEmbeddedChainer); break; case "EnsureTable": this.ParseEnsureTableElement(child); @@ -6276,7 +6276,7 @@ namespace WixToolset.Core this.ParsePropertyElement(child); break; case "PropertyRef": - this.ParseSimpleRefElement(child, TupleDefinitions.Property); + this.ParseSimpleRefElement(child, SymbolDefinitions.Property); break; case "RelatedBundle": this.ParseRelatedBundleElement(child); @@ -6291,7 +6291,7 @@ namespace WixToolset.Core this.ParseSetVariableElement(child); break; case "SetVariableRef": - this.ParseSimpleRefElement(child, TupleDefinitions.WixSetVariable); + this.ParseSimpleRefElement(child, SymbolDefinitions.WixSetVariable); break; case "SFPCatalog": string parentName = null; @@ -6301,7 +6301,7 @@ namespace WixToolset.Core this.ParseUIElement(child); break; case "UIRef": - this.ParseSimpleRefElement(child, TupleDefinitions.WixUI); + this.ParseSimpleRefElement(child, SymbolDefinitions.WixUI); break; case "Upgrade": this.ParseUpgradeElement(child); @@ -6325,7 +6325,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError && null != id) { - this.Core.AddTuple(new WixFragmentTuple(sourceLineNumbers, id)); + this.Core.AddSymbol(new WixFragmentSymbol(sourceLineNumbers, id)); } } @@ -6377,7 +6377,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new LaunchConditionTuple(sourceLineNumbers) + this.Core.AddSymbol(new LaunchConditionSymbol(sourceLineNumbers) { Condition = condition, Description = message @@ -6521,7 +6521,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new IniFileTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new IniFileSymbol(sourceLineNumbers, id) { FileName = this.GetMsiFilenameValue(shortName, name), DirProperty = directory, @@ -6688,7 +6688,7 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName)); } oneChild = true; - var newId = this.ParseSimpleRefElement(child, TupleDefinitions.Signature); // FileSearch signatures override parent signatures + var newId = this.ParseSimpleRefElement(child, SymbolDefinitions.Signature); // FileSearch signatures override parent signatures id = new Identifier(AccessModifier.Private, newId); signature = null; break; @@ -6705,7 +6705,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new IniLocatorTuple(sourceLineNumbers, id) + var symbol = this.Core.AddSymbol(new IniLocatorSymbol(sourceLineNumbers, id) { SignatureRef = id.Id, FileName = this.GetMsiFilenameValue(shortName, name), @@ -6716,7 +6716,7 @@ namespace WixToolset.Core if (CompilerConstants.IntegerNotSet != field) { - tuple.Field = field; + symbol.Field = field; } } @@ -6741,7 +6741,7 @@ namespace WixToolset.Core { case "Shared": shared = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Component, shared); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Component, shared); break; default: this.Core.UnexpectedAttribute(node, attrib); @@ -6763,7 +6763,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new IsolatedComponentTuple(sourceLineNumbers) + this.Core.AddSymbol(new IsolatedComponentSymbol(sourceLineNumbers) { SharedComponentRef = shared, ApplicationComponentRef = componentId @@ -6805,7 +6805,7 @@ namespace WixToolset.Core { if ("PatchCertificates" == node.Name.LocalName) { - this.Core.AddTuple(new MsiPatchCertificateTuple(sourceLineNumbers) + this.Core.AddSymbol(new MsiPatchCertificateSymbol(sourceLineNumbers) { PatchCertificate = name, DigitalCertificateRef = name, @@ -6813,7 +6813,7 @@ namespace WixToolset.Core } else { - this.Core.AddTuple(new MsiPackageCertificateTuple(sourceLineNumbers) + this.Core.AddSymbol(new MsiPackageCertificateSymbol(sourceLineNumbers) { PackageCertificate = name, DigitalCertificateRef = name, @@ -6889,7 +6889,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new MsiDigitalCertificateTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new MsiDigitalCertificateSymbol(sourceLineNumbers, id) { CertData = sourceFile }); @@ -6962,7 +6962,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new MsiDigitalSignatureTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "Media", diskId)) + this.Core.AddSymbol(new MsiDigitalSignatureSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "Media", diskId)) { Table = "Media", SignObject = diskId, @@ -7084,7 +7084,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { // create the row that performs the upgrade (or downgrade) - var tuple = this.Core.AddTuple(new UpgradeTuple(sourceLineNumbers) + var symbol = this.Core.AddSymbol(new UpgradeSymbol(sourceLineNumbers) { UpgradeCode = upgradeCode, Remove = removeFeatures, @@ -7095,21 +7095,21 @@ namespace WixToolset.Core if (allowDowngrades) { - tuple.VersionMin = "0"; - tuple.Language = productLanguage; - tuple.VersionMinInclusive = true; + symbol.VersionMin = "0"; + symbol.Language = productLanguage; + symbol.VersionMinInclusive = true; } else { - tuple.VersionMax = productVersion; - tuple.Language = productLanguage; - tuple.VersionMaxInclusive = allowSameVersionUpgrades; + symbol.VersionMax = productVersion; + symbol.Language = productLanguage; + symbol.VersionMaxInclusive = allowSameVersionUpgrades; } // Add launch condition that blocks upgrades if (blockUpgrades) { - this.Core.AddTuple(new LaunchConditionTuple(sourceLineNumbers) + this.Core.AddSymbol(new LaunchConditionSymbol(sourceLineNumbers) { Condition = Common.UpgradePreventedCondition, Description = downgradeErrorMessage @@ -7119,7 +7119,7 @@ namespace WixToolset.Core // now create the Upgrade row and launch conditions to prevent downgrades (unless explicitly permitted) if (!allowDowngrades) { - this.Core.AddTuple(new UpgradeTuple(sourceLineNumbers) + this.Core.AddSymbol(new UpgradeSymbol(sourceLineNumbers) { UpgradeCode = upgradeCode, VersionMin = productVersion, @@ -7129,7 +7129,7 @@ namespace WixToolset.Core ActionProperty = Common.DowngradeDetectedProperty }); - this.Core.AddTuple(new LaunchConditionTuple(sourceLineNumbers) + this.Core.AddSymbol(new LaunchConditionSymbol(sourceLineNumbers) { Condition = Common.DowngradePreventedCondition, Description = downgradeErrorMessage @@ -7158,7 +7158,7 @@ namespace WixToolset.Core break; } - this.Core.ScheduleActionTuple(sourceLineNumbers, AccessModifier.Public, SequenceTable.InstallExecuteSequence, "RemoveExistingProducts", afterAction: after); + this.Core.ScheduleActionSymbol(sourceLineNumbers, AccessModifier.Public, SequenceTable.InstallExecuteSequence, "RemoveExistingProducts", afterAction: after); } } @@ -7199,7 +7199,7 @@ namespace WixToolset.Core break; case "DiskPrompt": diskPrompt = this.Core.GetAttributeValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Property, "DiskPrompt"); // ensure the output has a DiskPrompt Property defined + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Property, "DiskPrompt"); // ensure the output has a DiskPrompt Property defined break; case "EmbedCab": embedCab = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); @@ -7331,7 +7331,7 @@ namespace WixToolset.Core // add the row to the section if (!this.Core.EncounteredError) { - this.Core.AddTuple(new MediaTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, id)) + this.Core.AddSymbol(new MediaSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, id)) { DiskId = id, DiskPrompt = diskPrompt, @@ -7344,7 +7344,7 @@ namespace WixToolset.Core if (null != symbols) { - this.Core.AddTuple(new WixDeltaPatchSymbolPathsTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, SymbolPathType.Media, id)) + this.Core.AddSymbol(new WixDeltaPatchSymbolPathsSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, SymbolPathType.Media, id)) { SymbolType = SymbolPathType.Media, SymbolId = id.ToString(CultureInfo.InvariantCulture), @@ -7406,7 +7406,7 @@ namespace WixToolset.Core break; case "DiskPrompt": diskPrompt = this.Core.GetAttributeValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Property, "DiskPrompt"); // ensure the output has a DiskPrompt Property defined + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Property, "DiskPrompt"); // ensure the output has a DiskPrompt Property defined this.Core.Write(WarningMessages.ReservedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName)); break; case "EmbedCab": @@ -7440,12 +7440,12 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new MediaTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, 1)) + this.Core.AddSymbol(new MediaSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, 1)) { DiskId = 1 }); - this.Core.AddTuple(new WixMediaTemplateTuple(sourceLineNumbers) + this.Core.AddSymbol(new WixMediaTemplateSymbol(sourceLineNumbers) { CabinetTemplate = cabinetTemplate, VolumeLabel = volumeLabel, @@ -7478,7 +7478,7 @@ namespace WixToolset.Core var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); Identifier id = null; var configData = String.Empty; - FileTupleAttributes attributes = 0; + FileSymbolAttributes attributes = 0; string language = null; string sourceFile = null; @@ -7493,12 +7493,12 @@ namespace WixToolset.Core break; case "DiskId": diskId = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, Int16.MaxValue); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Media, diskId.ToString(CultureInfo.InvariantCulture.NumberFormat)); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Media, diskId.ToString(CultureInfo.InvariantCulture.NumberFormat)); break; case "FileCompression": var compress = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); - attributes |= compress == YesNoType.Yes ? FileTupleAttributes.Compressed : 0; - attributes |= compress == YesNoType.No ? FileTupleAttributes.Uncompressed : 0; + attributes |= compress == YesNoType.Yes ? FileSymbolAttributes.Compressed : 0; + attributes |= compress == YesNoType.No ? FileSymbolAttributes.Uncompressed : 0; break; case "Language": language = this.Core.GetAttributeLocalizableIntegerValue(sourceLineNumbers, attrib, 0, Int16.MaxValue); @@ -7561,7 +7561,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new WixMergeTuple(sourceLineNumbers, id) + var symbol = this.Core.AddSymbol(new WixMergeSymbol(sourceLineNumbers, id) { DirectoryRef = directoryId, SourceFile = sourceFile, @@ -7571,7 +7571,7 @@ namespace WixToolset.Core FeatureRef = Guid.Empty.ToString("B") }); - tuple.Set((int)WixMergeTupleFields.Language, language); + symbol.Set((int)WixMergeSymbolFields.Language, language); } } @@ -7692,7 +7692,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new ConditionTuple(sourceLineNumbers) + this.Core.AddSymbol(new ConditionSymbol(sourceLineNumbers) { FeatureRef = featureId, Level = level.Value, @@ -7722,7 +7722,7 @@ namespace WixToolset.Core { case "Id": id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixMerge, id); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixMerge, id); break; case "Primary": primary = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); @@ -7815,7 +7815,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new MIMETuple(sourceLineNumbers, new Identifier(AccessModifier.Private, contentType)) + this.Core.AddSymbol(new MIMESymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, contentType)) { ContentType = contentType, ExtensionRef = extension, @@ -7894,7 +7894,7 @@ namespace WixToolset.Core if (patch) { // /Patch/PatchProperty goes directly into MsiPatchMetadata table - this.Core.AddTuple(new MsiPatchMetadataTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, company, name)) + this.Core.AddSymbol(new MsiPatchMetadataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, company, name)) { Company = company, Property = name, @@ -7921,7 +7921,7 @@ namespace WixToolset.Core { if (!this.Core.EncounteredError) { - this.Core.AddTuple(new PropertyTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, name)) + this.Core.AddSymbol(new PropertySymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, name)) { Value = value }); @@ -7971,7 +7971,7 @@ namespace WixToolset.Core return id; } - + /// /// Parses a ReplacePatch element. /// @@ -8080,7 +8080,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixPatchRefTuple(sourceLineNumbers) + this.Core.AddSymbol(new WixPatchRefSymbol(sourceLineNumbers) { Table = "*", PrimaryKeys = "*", @@ -8127,7 +8127,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixPatchRefTuple(sourceLineNumbers) + this.Core.AddSymbol(new WixPatchRefSymbol(sourceLineNumbers) { Table = tableName, PrimaryKeys = id @@ -8245,7 +8245,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixPatchBaselineTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new WixPatchBaselineSymbol(sourceLineNumbers, id) { DiskId = diskId ?? 1, ValidationFlags = validationFlags, diff --git a/src/WixToolset.Core/CompilerCore.cs b/src/WixToolset.Core/CompilerCore.cs index 5d0edaf1..7ec83a7d 100644 --- a/src/WixToolset.Core/CompilerCore.cs +++ b/src/WixToolset.Core/CompilerCore.cs @@ -13,7 +13,7 @@ namespace WixToolset.Core using System.Text.RegularExpressions; using System.Xml.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; @@ -164,13 +164,13 @@ namespace WixToolset.Core public bool ShowPedanticMessages { get; set; } /// - /// Add a tuple to the active section. + /// Add a symbol to the active section. /// - /// Tuple to add. - public T AddTuple(T tuple) - where T : IntermediateTuple + /// Symbol to add. + public T AddSymbol(T symbol) + where T : IntermediateSymbol { - return this.ActiveSection.AddTuple(tuple); + return this.ActiveSection.AddSymbol(symbol); } /// @@ -355,39 +355,39 @@ namespace WixToolset.Core /// The component which will control installation/uninstallation of the registry entry. public Identifier CreateRegistryRow(SourceLineNumber sourceLineNumbers, RegistryRootType root, string key, string name, string value, string componentId) { - return this.parseHelper.CreateRegistryTuple(this.ActiveSection, sourceLineNumbers, root, key, name, value, componentId, true); + return this.parseHelper.CreateRegistrySymbol(this.ActiveSection, sourceLineNumbers, root, key, name, value, componentId, true); } /// - /// Create a WixSimpleReferenceTuple in the active section. + /// Create a WixSimpleReferenceSymbol in the active section. /// /// Source line information for the row. - /// The tuple name of the simple reference. + /// The symbol name of the simple reference. /// The primary keys of the simple reference. - public void CreateSimpleReference(SourceLineNumber sourceLineNumbers, string tupleName, params string[] primaryKeys) + public void CreateSimpleReference(SourceLineNumber sourceLineNumbers, string symbolName, params string[] primaryKeys) { if (!this.EncounteredError) { var joinedKeys = String.Join("/", primaryKeys); - var id = String.Concat(tupleName, ":", joinedKeys); + var id = String.Concat(symbolName, ":", joinedKeys); // If this simple reference hasn't been added to the active section already, add it. if (this.activeSectionSimpleReferences.Add(id)) { - this.parseHelper.CreateSimpleReference(this.ActiveSection, sourceLineNumbers, tupleName, primaryKeys); + this.parseHelper.CreateSimpleReference(this.ActiveSection, sourceLineNumbers, symbolName, primaryKeys); } } } /// - /// Create a WixSimpleReferenceTuple in the active section. + /// Create a WixSimpleReferenceSymbol in the active section. /// /// Source line information for the row. - /// The tuple definition of the simple reference. + /// The symbol definition of the simple reference. /// The primary keys of the simple reference. - public void CreateSimpleReference(SourceLineNumber sourceLineNumbers, IntermediateTupleDefinition tupleDefinition, params string[] primaryKeys) + public void CreateSimpleReference(SourceLineNumber sourceLineNumbers, IntermediateSymbolDefinition symbolDefinition, params string[] primaryKeys) { - this.CreateSimpleReference(sourceLineNumbers, tupleDefinition.Name, primaryKeys); + this.CreateSimpleReference(sourceLineNumbers, symbolDefinition.Name, primaryKeys); } /// @@ -402,12 +402,12 @@ namespace WixToolset.Core { if (!this.EncounteredError) { - this.parseHelper.CreateWixGroupTuple(this.ActiveSection, sourceLineNumbers, parentType, parentId, childType, childId); + this.parseHelper.CreateWixGroupSymbol(this.ActiveSection, sourceLineNumbers, parentType, parentId, childType, childId); } } /// - /// Add the appropriate tuples to make sure that the given table shows up + /// Add the appropriate symbols to make sure that the given table shows up /// in the resulting output. /// /// Source line numbers. @@ -421,7 +421,7 @@ namespace WixToolset.Core } /// - /// Add the appropriate tuples to make sure that the given table shows up + /// Add the appropriate symbols to make sure that the given table shows up /// in the resulting output. /// /// Source line numbers. @@ -1013,12 +1013,12 @@ namespace WixToolset.Core /// Identifier for the newly created row. internal Identifier CreateDirectoryRow(SourceLineNumber sourceLineNumbers, Identifier id, string parentId, string name, string shortName = null, string sourceName = null, string shortSourceName = null) { - return this.parseHelper.CreateDirectoryTuple(this.ActiveSection, sourceLineNumbers, id, parentId, name, this.activeSectionInlinedDirectoryIds, shortName, sourceName, shortSourceName); + return this.parseHelper.CreateDirectorySymbol(this.ActiveSection, sourceLineNumbers, id, parentId, name, this.activeSectionInlinedDirectoryIds, shortName, sourceName, shortSourceName); } - public void CreateWixSearchTuple(SourceLineNumber sourceLineNumbers, string elementName, Identifier id, string variable, string condition, string after) + public void CreateWixSearchSymbol(SourceLineNumber sourceLineNumbers, string elementName, Identifier id, string variable, string condition, string after) { - this.parseHelper.CreateWixSearchTuple(this.ActiveSection, sourceLineNumbers, elementName, id, variable, condition, after, null); + this.parseHelper.CreateWixSearchSymbol(this.ActiveSection, sourceLineNumbers, elementName, id, variable, condition, after, null); } /// @@ -1033,9 +1033,9 @@ namespace WixToolset.Core return this.parseHelper.GetAttributeInlineDirectorySyntax(sourceLineNumbers, attribute, resultUsedToCreateReference); } - internal WixActionTuple ScheduleActionTuple(SourceLineNumber sourceLineNumbers, AccessModifier access, SequenceTable sequence, string actionName, string condition = null, string beforeAction = null, string afterAction = null, bool overridable = false) + internal WixActionSymbol ScheduleActionSymbol(SourceLineNumber sourceLineNumbers, AccessModifier access, SequenceTable sequence, string actionName, string condition = null, string beforeAction = null, string afterAction = null, bool overridable = false) { - return this.parseHelper.ScheduleActionTuple(this.ActiveSection, sourceLineNumbers, access, sequence, actionName, condition, beforeAction, afterAction, overridable); + return this.parseHelper.ScheduleActionSymbol(this.ActiveSection, sourceLineNumbers, access, sequence, actionName, condition, beforeAction, afterAction, overridable); } /// diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs index 18a0366e..72550ed9 100644 --- a/src/WixToolset.Core/Compiler_2.cs +++ b/src/WixToolset.Core/Compiler_2.cs @@ -10,7 +10,7 @@ namespace WixToolset.Core using System.IO; using System.Xml.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; @@ -190,7 +190,7 @@ namespace WixToolset.Core this.ParseCustomActionElement(child); break; case "CustomActionRef": - this.ParseSimpleRefElement(child, TupleDefinitions.CustomAction); + this.ParseSimpleRefElement(child, SymbolDefinitions.CustomAction); break; case "CustomTable": this.ParseCustomTableElement(child); @@ -205,7 +205,7 @@ namespace WixToolset.Core this.ParseEmbeddedChainerElement(child); break; case "EmbeddedChainerRef": - this.ParseSimpleRefElement(child, TupleDefinitions.MsiEmbeddedChainer); + this.ParseSimpleRefElement(child, SymbolDefinitions.MsiEmbeddedChainer); break; case "EnsureTable": this.ParseEnsureTableElement(child); @@ -248,7 +248,7 @@ namespace WixToolset.Core this.ParsePropertyElement(child); break; case "PropertyRef": - this.ParseSimpleRefElement(child, TupleDefinitions.Property); + this.ParseSimpleRefElement(child, SymbolDefinitions.Property); break; case "SetDirectory": this.ParseSetDirectoryElement(child); @@ -274,7 +274,7 @@ namespace WixToolset.Core this.ParseUIElement(child); break; case "UIRef": - this.ParseSimpleRefElement(child, TupleDefinitions.WixUI); + this.ParseSimpleRefElement(child, SymbolDefinitions.WixUI); break; case "Upgrade": this.ParseUpgradeElement(child); @@ -297,7 +297,7 @@ namespace WixToolset.Core { if (null != symbols) { - this.Core.AddTuple(new WixDeltaPatchSymbolPathsTuple(sourceLineNumbers) + this.Core.AddSymbol(new WixDeltaPatchSymbolPathsSymbol(sourceLineNumbers) { SymbolId = productCode, SymbolType = SymbolPathType.Product, @@ -318,8 +318,8 @@ namespace WixToolset.Core /// Element to parse. /// Identifier of parent component. /// Default identifer for driver/translator file. - /// Tuple type we're processing for. - private void ParseODBCDriverOrTranslator(XElement node, string componentId, string fileId, TupleDefinitionType tupleDefinitionType) + /// Symbol type we're processing for. + private void ParseODBCDriverOrTranslator(XElement node, string componentId, string fileId, SymbolDefinitionType symbolDefinitionType) { var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); Identifier id = null; @@ -338,14 +338,14 @@ namespace WixToolset.Core break; case "File": driver = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, driver); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, driver); break; case "Name": name = this.Core.GetAttributeValue(sourceLineNumbers, attrib); break; case "SetupFile": setup = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, setup); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, setup); break; default: this.Core.UnexpectedAttribute(node, attrib); @@ -369,7 +369,7 @@ namespace WixToolset.Core } // drivers have a few possible children - if (TupleDefinitionType.ODBCDriver == tupleDefinitionType) + if (SymbolDefinitionType.ODBCDriver == symbolDefinitionType) { // process any data sources for the driver foreach (var child in node.Elements()) @@ -383,7 +383,7 @@ namespace WixToolset.Core this.ParseODBCDataSource(child, componentId, name, out ignoredKeyPath); break; case "Property": - this.ParseODBCProperty(child, id.Id, TupleDefinitionType.ODBCAttribute); + this.ParseODBCProperty(child, id.Id, SymbolDefinitionType.ODBCAttribute); break; default: this.Core.UnexpectedElement(node, child); @@ -403,10 +403,10 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - switch (tupleDefinitionType) + switch (symbolDefinitionType) { - case TupleDefinitionType.ODBCDriver: - this.Core.AddTuple(new ODBCDriverTuple(sourceLineNumbers, id) + case SymbolDefinitionType.ODBCDriver: + this.Core.AddSymbol(new ODBCDriverSymbol(sourceLineNumbers, id) { ComponentRef = componentId, Description = name, @@ -414,8 +414,8 @@ namespace WixToolset.Core SetupFileRef = setup, }); break; - case TupleDefinitionType.ODBCTranslator: - this.Core.AddTuple(new ODBCTranslatorTuple(sourceLineNumbers, id) + case SymbolDefinitionType.ODBCTranslator: + this.Core.AddSymbol(new ODBCTranslatorSymbol(sourceLineNumbers, id) { ComponentRef = componentId, Description = name, @@ -424,7 +424,7 @@ namespace WixToolset.Core }); break; default: - throw new ArgumentOutOfRangeException(nameof(tupleDefinitionType)); + throw new ArgumentOutOfRangeException(nameof(symbolDefinitionType)); } } } @@ -434,8 +434,8 @@ namespace WixToolset.Core /// /// Element to parse. /// Identifier of parent driver or translator. - /// Name of the table to create property in. - private void ParseODBCProperty(XElement node, string parentId, TupleDefinitionType tupleDefinitionType) + /// Name of the table to create property in. + private void ParseODBCProperty(XElement node, string parentId, SymbolDefinitionType symbolDefinitionType) { var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); string id = null; @@ -474,18 +474,18 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { var identifier = new Identifier(AccessModifier.Private, parentId, id); - switch (tupleDefinitionType) + switch (symbolDefinitionType) { - case TupleDefinitionType.ODBCAttribute: - this.Core.AddTuple(new ODBCAttributeTuple(sourceLineNumbers, identifier) + case SymbolDefinitionType.ODBCAttribute: + this.Core.AddSymbol(new ODBCAttributeSymbol(sourceLineNumbers, identifier) { DriverRef = parentId, Attribute = id, Value = propertyValue, }); break; - case TupleDefinitionType.ODBCSourceAttribute: - this.Core.AddTuple(new ODBCSourceAttributeTuple(sourceLineNumbers, identifier) + case SymbolDefinitionType.ODBCSourceAttribute: + this.Core.AddSymbol(new ODBCSourceAttributeSymbol(sourceLineNumbers, identifier) { DataSourceRef = parentId, Attribute = id, @@ -493,7 +493,7 @@ namespace WixToolset.Core }); break; default: - throw new ArgumentOutOfRangeException(nameof(tupleDefinitionType)); + throw new ArgumentOutOfRangeException(nameof(symbolDefinitionType)); } } } @@ -578,7 +578,7 @@ namespace WixToolset.Core switch (child.Name.LocalName) { case "Property": - this.ParseODBCProperty(child, id.Id, TupleDefinitionType.ODBCSourceAttribute); + this.ParseODBCProperty(child, id.Id, SymbolDefinitionType.ODBCSourceAttribute); break; default: this.Core.UnexpectedElement(node, child); @@ -593,7 +593,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new ODBCDataSourceTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new ODBCDataSourceSymbol(sourceLineNumbers, id) { ComponentRef = componentId, Description = name, @@ -712,7 +712,7 @@ namespace WixToolset.Core switch (installScope) { case "perMachine": - this.Core.AddTuple(new PropertyTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "ALLUSERS")) + this.Core.AddSymbol(new PropertySymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "ALLUSERS")) { Value = "1" }); @@ -870,67 +870,67 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.Codepage, Value = codepage }); - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.Title, Value = "Installation Database" }); - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.Subject, Value = packageName }); - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.Author, Value = packageAuthor }); - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.Keywords, Value = keywords }); - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.Comments, Value = comments }); - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.PlatformAndLanguage, Value = String.Format(CultureInfo.InvariantCulture, "{0};{1}", platform, packageLanguages) }); - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.PackageCode, Value = packageCode }); - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.WindowsInstallerVersion, Value = msiVersion.ToString(CultureInfo.InvariantCulture) }); - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.WordCount, Value = sourceBits.ToString(CultureInfo.InvariantCulture) }); - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.Security, Value = YesNoDefaultType.No == security ? "0" : YesNoDefaultType.Yes == security ? "4" : "2" @@ -1007,13 +1007,13 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.Codepage, Value = codepage }); - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.Title, Value = "Patch" @@ -1021,7 +1021,7 @@ namespace WixToolset.Core if (null != packageName) { - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.Subject, Value = packageName @@ -1030,7 +1030,7 @@ namespace WixToolset.Core if (null != packageAuthor) { - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.Author, Value = packageAuthor @@ -1039,7 +1039,7 @@ namespace WixToolset.Core if (null != keywords) { - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.Keywords, Value = keywords @@ -1048,26 +1048,26 @@ namespace WixToolset.Core if (null != comments) { - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.Comments, Value = comments }); } - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.WindowsInstallerVersion, Value = msiVersion.ToString(CultureInfo.InvariantCulture) }); - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.WordCount, Value = "0" }); - this.Core.AddTuple(new SummaryInformationTuple(sourceLineNumbers) + this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers) { PropertyId = SummaryInformationType.Security, Value = YesNoDefaultType.No == security ? "0" : YesNoDefaultType.Yes == security ? "4" : "2" @@ -1163,7 +1163,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new LockPermissionsTuple(sourceLineNumbers) + this.Core.AddSymbol(new LockPermissionsSymbol(sourceLineNumbers) { LockObject = objectId, Table = tableName, @@ -1239,7 +1239,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new MsiLockPermissionsExTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new MsiLockPermissionsExSymbol(sourceLineNumbers, id) { LockObject = objectId, Table = tableName, @@ -1371,7 +1371,7 @@ namespace WixToolset.Core { if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new ProgIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, progId)) + var symbol = this.Core.AddSymbol(new ProgIdSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, progId)) { ProgId = progId, ParentProgIdRef = parent, @@ -1381,13 +1381,13 @@ namespace WixToolset.Core if (null != icon) { - tuple.IconRef = icon; - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Icon, icon); + symbol.IconRef = icon; + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Icon, icon); } if (CompilerConstants.IntegerNotSet != iconIndex) { - tuple.IconIndex = iconIndex; + symbol.IconIndex = iconIndex; } this.Core.EnsureTable(sourceLineNumbers, WindowsInstallerTableDefinitions.Class); @@ -1419,7 +1419,7 @@ namespace WixToolset.Core if (null != icon) // ProgId's Default Icon { - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, icon); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, icon); icon = String.Format(CultureInfo.InvariantCulture, "\"[#{0}]\"", icon); @@ -1515,7 +1515,7 @@ namespace WixToolset.Core if ("ErrorDialog" == id.Id) { - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Dialog, value); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Dialog, value); } foreach (var child in node.Elements()) @@ -1550,7 +1550,7 @@ namespace WixToolset.Core { if (complianceCheck && !this.Core.EncounteredError) { - this.Core.AddTuple(new CCPSearchTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, sig))); + this.Core.AddSymbol(new CCPSearchSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, sig))); } this.AddAppSearch(sourceLineNumbers, id, sig); @@ -1579,7 +1579,7 @@ namespace WixToolset.Core { this.Core.Write(WarningMessages.PropertyModularizationSuppressed(sourceLineNumbers)); - this.Core.AddTuple(new WixSuppressModularizationTuple(sourceLineNumbers, id)); + this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers, id)); } } @@ -1766,7 +1766,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError && null != name) { - this.Core.AddTuple(new RegistryTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new RegistrySymbol(sourceLineNumbers, id) { Root = root.Value, Key = key, @@ -2008,7 +2008,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new RegistryTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new RegistrySymbol(sourceLineNumbers, id) { Root = root.Value, Key = key, @@ -2154,7 +2154,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new RemoveRegistryTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new RemoveRegistrySymbol(sourceLineNumbers, id) { Root = root.Value, Key = key, @@ -2230,7 +2230,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new RemoveRegistryTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new RemoveRegistrySymbol(sourceLineNumbers, id) { Root = root.Value, Key = key, @@ -2349,7 +2349,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new RemoveFileTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new RemoveFileSymbol(sourceLineNumbers, id) { ComponentRef = componentId, FileName = this.GetMsiFilenameValue(shortName, name), @@ -2437,7 +2437,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new RemoveFileTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new RemoveFileSymbol(sourceLineNumbers, id) { ComponentRef = componentId, DirProperty = directory ?? property ?? parentDirectory, @@ -2508,7 +2508,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new ReserveCostTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new ReserveCostSymbol(sourceLineNumbers, id) { ComponentRef = componentId, ReserveFolder = directoryId, @@ -2552,7 +2552,7 @@ namespace WixToolset.Core if (customAction) { actionName = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib); - this.Core.CreateSimpleReference(childSourceLineNumbers, TupleDefinitions.CustomAction, actionName); + this.Core.CreateSimpleReference(childSourceLineNumbers, SymbolDefinitions.CustomAction, actionName); } else { @@ -2563,7 +2563,7 @@ namespace WixToolset.Core if (customAction || showDialog || specialAction || specialStandardAction) { afterAction = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib); - this.Core.CreateSimpleReference(childSourceLineNumbers, TupleDefinitions.WixAction, sequenceTable.ToString(), afterAction); + this.Core.CreateSimpleReference(childSourceLineNumbers, SymbolDefinitions.WixAction, sequenceTable.ToString(), afterAction); } else { @@ -2574,7 +2574,7 @@ namespace WixToolset.Core if (customAction || showDialog || specialAction || specialStandardAction) { beforeAction = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib); - this.Core.CreateSimpleReference(childSourceLineNumbers, TupleDefinitions.WixAction, sequenceTable.ToString(), beforeAction); + this.Core.CreateSimpleReference(childSourceLineNumbers, SymbolDefinitions.WixAction, sequenceTable.ToString(), beforeAction); } else { @@ -2588,7 +2588,7 @@ namespace WixToolset.Core if (showDialog) { actionName = this.Core.GetAttributeIdentifierValue(childSourceLineNumbers, attrib); - this.Core.CreateSimpleReference(childSourceLineNumbers, TupleDefinitions.Dialog, actionName); + this.Core.CreateSimpleReference(childSourceLineNumbers, SymbolDefinitions.Dialog, actionName); } else { @@ -2703,7 +2703,7 @@ namespace WixToolset.Core { if (suppress) { - this.Core.AddTuple(new WixSuppressActionTuple(childSourceLineNumbers, new Identifier(AccessModifier.Public, sequenceTable, actionName)) + this.Core.AddSymbol(new WixSuppressActionSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Public, sequenceTable, actionName)) { SequenceTable = sequenceTable, Action = actionName @@ -2711,7 +2711,7 @@ namespace WixToolset.Core } else { - var tuple = this.Core.AddTuple(new WixActionTuple(childSourceLineNumbers, new Identifier(AccessModifier.Public, sequenceTable, actionName)) + var symbol = this.Core.AddSymbol(new WixActionSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Public, sequenceTable, actionName)) { SequenceTable = sequenceTable, Action = actionName, @@ -2723,7 +2723,7 @@ namespace WixToolset.Core if (CompilerConstants.IntegerNotSet != sequence) { - tuple.Sequence = sequence; + symbol.Sequence = sequence; } } } @@ -2897,7 +2897,7 @@ namespace WixToolset.Core { if (!String.IsNullOrEmpty(delayedAutoStart)) { - this.Core.AddTuple(new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".DS"))) + this.Core.AddSymbol(new MsiServiceConfigSymbol(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".DS"))) { Name = name, OnInstall = install, @@ -2911,7 +2911,7 @@ namespace WixToolset.Core if (!String.IsNullOrEmpty(failureActionsWhen)) { - this.Core.AddTuple(new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".FA"))) + this.Core.AddSymbol(new MsiServiceConfigSymbol(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".FA"))) { Name = name, OnInstall = install, @@ -2925,7 +2925,7 @@ namespace WixToolset.Core if (!String.IsNullOrEmpty(sid)) { - this.Core.AddTuple(new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".SS"))) + this.Core.AddSymbol(new MsiServiceConfigSymbol(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".SS"))) { Name = name, OnInstall = install, @@ -2939,7 +2939,7 @@ namespace WixToolset.Core if (!String.IsNullOrEmpty(requiredPrivileges)) { - this.Core.AddTuple(new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".RP"))) + this.Core.AddSymbol(new MsiServiceConfigSymbol(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".RP"))) { Name = name, OnInstall = install, @@ -2953,7 +2953,7 @@ namespace WixToolset.Core if (!String.IsNullOrEmpty(preShutdownDelay)) { - this.Core.AddTuple(new MsiServiceConfigTuple(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".PD"))) + this.Core.AddSymbol(new MsiServiceConfigSymbol(sourceLineNumbers, new Identifier(id.Access, String.Concat(id.Id, ".PD"))) { Name = name, OnInstall = install, @@ -3279,12 +3279,12 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new MsiServiceConfigFailureActionsTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new MsiServiceConfigFailureActionsSymbol(sourceLineNumbers, id) { Name = name, - OnInstall = install, - OnReinstall = reinstall, - OnUninstall = uninstall, + OnInstall = install, + OnReinstall = reinstall, + OnUninstall = uninstall, ResetPeriod = resetPeriod, RebootMessage = rebootMessage, Command = command, @@ -3427,7 +3427,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new ServiceControlTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new ServiceControlSymbol(sourceLineNumbers, id) { Name = name, InstallRemove = installRemove, @@ -3715,7 +3715,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new ServiceInstallTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new ServiceInstallSymbol(sourceLineNumbers, id) { Name = name, DisplayName = displayName, @@ -3763,7 +3763,7 @@ namespace WixToolset.Core break; case "Id": id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Directory, id); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Directory, id); break; case "Sequence": var sequenceValue = this.Core.GetAttributeValue(sourceLineNumbers, attrib); @@ -3819,7 +3819,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new CustomActionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName)) + this.Core.AddSymbol(new CustomActionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName)) { ExecutionType = executionType, SourceType = CustomActionSourceType.Directory, @@ -3830,7 +3830,7 @@ namespace WixToolset.Core foreach (var sequence in sequences) { - this.Core.ScheduleActionTuple(sourceLineNumbers, AccessModifier.Public, sequence, actionName, condition, afterAction: "CostInitialize"); + this.Core.ScheduleActionSymbol(sourceLineNumbers, AccessModifier.Public, sequence, actionName, condition, afterAction: "CostInitialize"); } } } @@ -3946,7 +3946,7 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.ActionScheduledRelativeToItself(sourceLineNumbers, node.Name.LocalName, "After", afterAction)); } - this.Core.AddTuple(new CustomActionTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName)) + this.Core.AddSymbol(new CustomActionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName)) { ExecutionType = executionType, SourceType = CustomActionSourceType.Property, @@ -3957,7 +3957,7 @@ namespace WixToolset.Core foreach (var sequence in sequences) { - this.Core.ScheduleActionTuple(sourceLineNumbers, AccessModifier.Public, sequence, actionName, condition, beforeAction, afterAction); + this.Core.ScheduleActionSymbol(sourceLineNumbers, AccessModifier.Public, sequence, actionName, condition, beforeAction, afterAction); } } } @@ -4001,7 +4001,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new FileSFPCatalogTuple(sourceLineNumbers) + this.Core.AddSymbol(new FileSFPCatalogSymbol(sourceLineNumbers) { FileRef = id, SFPCatalogRef = parentSFPCatalog @@ -4094,7 +4094,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new SFPCatalogTuple(sourceLineNumbers) + this.Core.AddSymbol(new SFPCatalogSymbol(sourceLineNumbers) { SFPCatalog = name, Catalog = sourceFile, @@ -4170,7 +4170,7 @@ namespace WixToolset.Core break; case "Icon": icon = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Icon, icon); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Icon, icon); break; case "IconIndex": iconIndex = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, Int16.MinValue + 1, Int16.MaxValue); @@ -4368,7 +4368,7 @@ namespace WixToolset.Core target = String.Format(CultureInfo.InvariantCulture, "[#{0}]", defaultTarget); } - this.Core.AddTuple(new ShortcutTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new ShortcutSymbol(sourceLineNumbers, id) { DirectoryRef = directory, Name = name, @@ -4445,7 +4445,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new MsiShortcutPropertyTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new MsiShortcutPropertySymbol(sourceLineNumbers, id) { ShortcutRef = shortcutId, PropertyKey = key, @@ -4642,7 +4642,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new TypeLibTuple(sourceLineNumbers) + var symbol = this.Core.AddSymbol(new TypeLibSymbol(sourceLineNumbers) { LibId = id, Language = language, @@ -4654,12 +4654,12 @@ namespace WixToolset.Core if (CompilerConstants.IntegerNotSet != majorVersion || CompilerConstants.IntegerNotSet != minorVersion) { - tuple.Version = (CompilerConstants.IntegerNotSet != majorVersion ? majorVersion * 256 : 0) + (CompilerConstants.IntegerNotSet != minorVersion ? minorVersion : 0); + symbol.Version = (CompilerConstants.IntegerNotSet != majorVersion ? majorVersion * 256 : 0) + (CompilerConstants.IntegerNotSet != minorVersion ? minorVersion : 0); } if (CompilerConstants.IntegerNotSet != cost) { - tuple.Cost = cost; + symbol.Cost = cost; } } } @@ -4855,7 +4855,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new UpgradeTuple(sourceLineNumbers) + this.Core.AddSymbol(new UpgradeSymbol(sourceLineNumbers) { UpgradeCode = upgradeId, VersionMin = minimum, @@ -4875,7 +4875,7 @@ namespace WixToolset.Core // if at least one row in Upgrade table lacks the OnlyDetect attribute. if (!onlyDetect) { - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixAction, "InstallExecuteSequence", "RemoveExistingProducts"); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixAction, "InstallExecuteSequence", "RemoveExistingProducts"); } } } @@ -4923,7 +4923,7 @@ namespace WixToolset.Core break; case "TargetFile": targetFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, targetFile); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, targetFile); break; case "TargetProperty": targetProperty = this.Core.GetAttributeValue(sourceLineNumbers, attrib); @@ -4980,7 +4980,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new VerbTuple(sourceLineNumbers) + var symbol = this.Core.AddSymbol(new VerbSymbol(sourceLineNumbers) { ExtensionRef = extension, Verb = id, @@ -4990,7 +4990,7 @@ namespace WixToolset.Core if (CompilerConstants.IntegerNotSet != sequence) { - tuple.Sequence = sequence; + symbol.Sequence = sequence; } } } @@ -5086,7 +5086,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixVariableTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new WixVariableSymbol(sourceLineNumbers, id) { Value = value, Overridable = overridable diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs index d88cb7f5..578c7dcd 100644 --- a/src/WixToolset.Core/Compiler_Bundle.cs +++ b/src/WixToolset.Core/Compiler_Bundle.cs @@ -11,7 +11,7 @@ namespace WixToolset.Core using System.Xml.Linq; using WixToolset.Data; using WixToolset.Data.Burn; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; /// @@ -85,7 +85,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixApprovedExeForElevationTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new WixApprovedExeForElevationSymbol(sourceLineNumbers, id) { Key = key, ValueName = valueName, @@ -287,7 +287,7 @@ namespace WixToolset.Core this.ParseBundleExtensionElement(child); break; case "BundleExtensionRef": - this.ParseSimpleRefElement(child, TupleDefinitions.WixBundleExtension); + this.ParseSimpleRefElement(child, SymbolDefinitions.WixBundleExtension); break; case "OptionalUpdateRegistration": this.ParseOptionalUpdateRegistrationElement(child, manufacturer, parentName, name); @@ -308,7 +308,7 @@ namespace WixToolset.Core this.ParseContainerElement(child); break; case "ContainerRef": - this.ParseSimpleRefElement(child, TupleDefinitions.WixBundleContainer); + this.ParseSimpleRefElement(child, SymbolDefinitions.WixBundleContainer); break; case "Log": if (logSeen) @@ -332,7 +332,7 @@ namespace WixToolset.Core this.ParseSetVariableElement(child); break; case "SetVariableRef": - this.ParseSimpleRefElement(child, TupleDefinitions.WixSetVariable); + this.ParseSimpleRefElement(child, SymbolDefinitions.WixSetVariable); break; case "Update": this.ParseUpdateElement(child); @@ -361,7 +361,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new WixBundleTuple(sourceLineNumbers) + var symbol = this.Core.AddSymbol(new WixBundleSymbol(sourceLineNumbers) { UpgradeCode = upgradeCode, Version = version, @@ -385,46 +385,46 @@ namespace WixToolset.Core if (!String.IsNullOrEmpty(logVariablePrefixAndExtension)) { var split = logVariablePrefixAndExtension.Split(':'); - tuple.LogPathVariable = split[0]; - tuple.LogPrefix = split[1]; - tuple.LogExtension = split[2]; + symbol.LogPathVariable = split[0]; + symbol.LogPrefix = split[1]; + symbol.LogExtension = split[2]; } if (null != upgradeCode) { - this.Core.AddTuple(new WixRelatedBundleTuple(sourceLineNumbers) + this.Core.AddSymbol(new WixRelatedBundleSymbol(sourceLineNumbers) { BundleId = upgradeCode, Action = RelatedBundleActionType.Upgrade, }); } - this.Core.AddTuple(new WixBundleContainerTuple(sourceLineNumbers, Compiler.BurnDefaultAttachedContainerId) + this.Core.AddSymbol(new WixBundleContainerSymbol(sourceLineNumbers, Compiler.BurnDefaultAttachedContainerId) { Name = "bundle-attached.cab", Type = ContainerType.Attached, }); // Ensure that the bundle stores the well-known persisted values. - this.Core.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_NAME)) + this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_NAME)) { Hidden = false, Persisted = true, }); - this.Core.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_ORIGINAL_SOURCE)) + this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_ORIGINAL_SOURCE)) { Hidden = false, Persisted = true, }); - this.Core.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_ORIGINAL_SOURCE_FOLDER)) + this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_ORIGINAL_SOURCE_FOLDER)) { Hidden = false, Persisted = true, }); - this.Core.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_LAST_USED_SOURCE)) + this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_LAST_USED_SOURCE)) { Hidden = false, Persisted = true, @@ -529,7 +529,7 @@ namespace WixToolset.Core { this.CreatePayloadRow(sourceLineNumbers, id, Path.GetFileName(sourceFile), sourceFile, null, ComplexReferenceParentType.Container, Compiler.BurnUXContainerId, ComplexReferenceChildType.Unknown, null, YesNoDefaultType.Yes, YesNoType.Yes, null, null, null); - this.Core.AddTuple(new WixBundleCatalogTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new WixBundleCatalogSymbol(sourceLineNumbers, id) { PayloadRef = id.Id, }); @@ -631,7 +631,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixBundleContainerTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new WixBundleContainerSymbol(sourceLineNumbers, id) { Name = name, Type = type, @@ -694,7 +694,7 @@ namespace WixToolset.Core // Add the application as an attached container and if an Id was provided add that too. if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixBundleContainerTuple(sourceLineNumbers, Compiler.BurnUXContainerId) + this.Core.AddSymbol(new WixBundleContainerSymbol(sourceLineNumbers, Compiler.BurnUXContainerId) { Name = "bundle-ux.cab", Type = ContainerType.Attached @@ -702,7 +702,7 @@ namespace WixToolset.Core if (null != id) { - this.Core.AddTuple(new WixBootstrapperApplicationTuple(sourceLineNumbers, id)); + this.Core.AddSymbol(new WixBootstrapperApplicationSymbol(sourceLineNumbers, id)); } } } @@ -770,7 +770,7 @@ namespace WixToolset.Core } else { - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixBootstrapperApplication, id); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixBootstrapperApplication, id); } } @@ -786,7 +786,7 @@ namespace WixToolset.Core string customDataId = null; WixBundleCustomDataType? customDataType = null; string extensionId = null; - var attributeDefinitions = new List(); + var attributeDefinitions = new List(); var foundAttributeDefinitions = false; foreach (var attrib in node.Attributes()) @@ -816,7 +816,7 @@ namespace WixToolset.Core break; case "ExtensionId": extensionId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixBundleExtension, extensionId); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixBundleExtension, extensionId); break; default: this.Core.UnexpectedAttribute(node, attrib); @@ -890,9 +890,9 @@ namespace WixToolset.Core { if (!this.Core.EncounteredError) { - var attributeNames = String.Join(new string(WixBundleCustomDataTuple.AttributeNamesSeparator, 1), attributeDefinitions.Select(c => c.Name)); + var attributeNames = String.Join(new string(WixBundleCustomDataSymbol.AttributeNamesSeparator, 1), attributeDefinitions.Select(c => c.Name)); - this.Core.AddTuple(new WixBundleCustomDataTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, customDataId)) + this.Core.AddSymbol(new WixBundleCustomDataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, customDataId)) { AttributeNames = attributeNames, Type = customDataType.Value, @@ -975,7 +975,7 @@ namespace WixToolset.Core /// Element to parse. /// Element's SourceLineNumbers. /// BundleCustomData Id. - private WixBundleCustomDataAttributeTuple ParseBundleAttributeDefinitionElement(XElement node, SourceLineNumber sourceLineNumbers, string customDataId) + private WixBundleCustomDataAttributeSymbol ParseBundleAttributeDefinitionElement(XElement node, SourceLineNumber sourceLineNumbers, string customDataId) { string attributeName = null; @@ -1004,7 +1004,7 @@ namespace WixToolset.Core return null; } - var customDataAttribute = this.Core.AddTuple(new WixBundleCustomDataAttributeTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, customDataId, attributeName)) + var customDataAttribute = this.Core.AddSymbol(new WixBundleCustomDataAttributeSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, customDataId, attributeName)) { CustomDataRef = customDataId, Name = attributeName, @@ -1058,7 +1058,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixBundleCustomDataCellTuple(childSourceLineNumbers, new Identifier(AccessModifier.Private, customDataId, elementId, attributeName)) + this.Core.AddSymbol(new WixBundleCustomDataCellSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Private, customDataId, elementId, attributeName)) { ElementId = elementId, AttributeRef = attributeName, @@ -1075,7 +1075,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixBundleCustomData, customDataId); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixBundleCustomData, customDataId); } } @@ -1138,7 +1138,7 @@ namespace WixToolset.Core // Add the BundleExtension. if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixBundleExtensionTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new WixBundleExtensionSymbol(sourceLineNumbers, id) { PayloadRef = id.Id, }); @@ -1236,7 +1236,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixUpdateRegistrationTuple(sourceLineNumbers) + this.Core.AddSymbol(new WixUpdateRegistrationSymbol(sourceLineNumbers) { Manufacturer = manufacturer, Department = department, @@ -1493,15 +1493,15 @@ namespace WixToolset.Core /// Element to parse /// ComplexReferenceParentType of parent element /// Identifier of parent element. - private WixBundlePayloadTuple CreatePayloadRow(SourceLineNumber sourceLineNumbers, Identifier id, string name, string sourceFile, string downloadUrl, ComplexReferenceParentType parentType, + private WixBundlePayloadSymbol CreatePayloadRow(SourceLineNumber sourceLineNumbers, Identifier id, string name, string sourceFile, string downloadUrl, ComplexReferenceParentType parentType, Identifier parentId, ComplexReferenceChildType previousType, Identifier previousId, YesNoDefaultType compressed, YesNoType enableSignatureVerification, string displayName, string description, RemotePayload remotePayload) { - WixBundlePayloadTuple tuple = null; + WixBundlePayloadSymbol symbol = null; if (!this.Core.EncounteredError) { - tuple = this.Core.AddTuple(new WixBundlePayloadTuple(sourceLineNumbers, id) + symbol = this.Core.AddSymbol(new WixBundlePayloadSymbol(sourceLineNumbers, id) { Name = String.IsNullOrEmpty(name) ? Path.GetFileName(sourceFile) : name, SourceFile = new IntermediateFieldPathValue { Path = sourceFile }, @@ -1515,19 +1515,19 @@ namespace WixToolset.Core if (null != remotePayload) { - tuple.Description = remotePayload.Description; - tuple.DisplayName = remotePayload.ProductName; - tuple.Hash = remotePayload.Hash; - tuple.PublicKey = remotePayload.CertificatePublicKey; - tuple.Thumbprint = remotePayload.CertificateThumbprint; - tuple.FileSize = remotePayload.Size; - tuple.Version = remotePayload.Version; + symbol.Description = remotePayload.Description; + symbol.DisplayName = remotePayload.ProductName; + symbol.Hash = remotePayload.Hash; + symbol.PublicKey = remotePayload.CertificatePublicKey; + symbol.Thumbprint = remotePayload.CertificateThumbprint; + symbol.FileSize = remotePayload.Size; + symbol.Version = remotePayload.Version; } this.CreateGroupAndOrderingRows(sourceLineNumbers, parentType, parentId.Id, ComplexReferenceChildType.Payload, id.Id, previousType, previousId?.Id); } - return tuple; + return symbol; } /// @@ -1599,7 +1599,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixBundlePayloadGroupTuple(sourceLineNumbers, id)); + this.Core.AddSymbol(new WixBundlePayloadGroupSymbol(sourceLineNumbers, id)); this.CreateGroupAndOrderingRows(sourceLineNumbers, parentType, parentId?.Id, ComplexReferenceChildType.PayloadGroup, id.Id, ComplexReferenceChildType.Unknown, null); } @@ -1627,7 +1627,7 @@ namespace WixToolset.Core { case "Id": id = this.Core.GetAttributeIdentifier(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixBundlePayloadGroup, id.Id); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, id.Id); break; default: this.Core.UnexpectedAttribute(node, attrib); @@ -1682,7 +1682,7 @@ namespace WixToolset.Core // TODO: Should we define our own enum for this, just to ensure there's no "cross-contamination"? // TODO: Also, we could potentially include an 'Attributes' field to track things like // 'before' vs. 'after', and explicit vs. inferred dependencies. - this.Core.AddTuple(new WixOrderingTuple(sourceLineNumbers) + this.Core.AddSymbol(new WixOrderingSymbol(sourceLineNumbers) { ItemType = type, ItemIdRef = id, @@ -1739,7 +1739,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixBundlePackageExitCodeTuple(sourceLineNumbers) + this.Core.AddSymbol(new WixBundlePackageExitCodeSymbol(sourceLineNumbers) { ChainPackageId = packageId, Code = value, @@ -1847,7 +1847,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixChainTuple(sourceLineNumbers) + this.Core.AddSymbol(new WixChainSymbol(sourceLineNumbers) { Attributes = attributes }); @@ -2393,13 +2393,13 @@ namespace WixToolset.Core this.CreatePayloadRow(sourceLineNumbers, id, name, sourceFile, downloadUrl, ComplexReferenceParentType.Package, id, ComplexReferenceChildType.Unknown, null, compressed, enableSignatureVerification, displayName, description, remotePayload); - this.Core.AddTuple(new WixChainItemTuple(sourceLineNumbers, id)); + this.Core.AddSymbol(new WixChainItemSymbol(sourceLineNumbers, id)); WixBundlePackageAttributes attributes = 0; attributes |= (YesNoType.Yes == permanent) ? WixBundlePackageAttributes.Permanent : 0; attributes |= (YesNoType.Yes == visible) ? WixBundlePackageAttributes.Visible : 0; - var chainPackageTuple = this.Core.AddTuple(new WixBundlePackageTuple(sourceLineNumbers, id) + var chainPackageSymbol = this.Core.AddSymbol(new WixBundlePackageSymbol(sourceLineNumbers, id) { Type = packageType, PayloadRef = id.Id, @@ -2412,28 +2412,28 @@ namespace WixToolset.Core if (YesNoAlwaysType.NotSet != cache) { - chainPackageTuple.Cache = cache; + chainPackageSymbol.Cache = cache; } if (YesNoType.NotSet != vital) { - chainPackageTuple.Vital = (vital == YesNoType.Yes); + chainPackageSymbol.Vital = (vital == YesNoType.Yes); } if (YesNoDefaultType.NotSet != perMachine) { - chainPackageTuple.PerMachine = perMachine; + chainPackageSymbol.PerMachine = perMachine; } if (CompilerConstants.IntegerNotSet != installSize) { - chainPackageTuple.InstallSize = installSize; + chainPackageSymbol.InstallSize = installSize; } switch (packageType) { case WixBundlePackageType.Exe: - this.Core.AddTuple(new WixBundleExePackageTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new WixBundleExePackageSymbol(sourceLineNumbers, id) { Attributes = WixBundleExePackageAttributes.None, DetectCondition = detectCondition, @@ -2449,7 +2449,7 @@ namespace WixToolset.Core msiAttributes |= (YesNoType.Yes == enableFeatureSelection) ? WixBundleMsiPackageAttributes.EnableFeatureSelection : 0; msiAttributes |= (YesNoType.Yes == forcePerMachine) ? WixBundleMsiPackageAttributes.ForcePerMachine : 0; - this.Core.AddTuple(new WixBundleMsiPackageTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new WixBundleMsiPackageSymbol(sourceLineNumbers, id) { Attributes = msiAttributes }); @@ -2459,14 +2459,14 @@ namespace WixToolset.Core WixBundleMspPackageAttributes mspAttributes = 0; mspAttributes |= (YesNoType.Yes == slipstream) ? WixBundleMspPackageAttributes.Slipstream : 0; - this.Core.AddTuple(new WixBundleMspPackageTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new WixBundleMspPackageSymbol(sourceLineNumbers, id) { Attributes = mspAttributes }); break; case WixBundlePackageType.Msu: - this.Core.AddTuple(new WixBundleMsuPackageTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new WixBundleMsuPackageSymbol(sourceLineNumbers, id) { DetectCondition = detectCondition, MsuKB = msuKB @@ -2530,7 +2530,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixBundlePackageCommandLineTuple(sourceLineNumbers) + this.Core.AddSymbol(new WixBundlePackageCommandLineSymbol(sourceLineNumbers) { WixBundlePackageRef = packageId, InstallArgument = installArgument, @@ -2622,7 +2622,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixBundlePackageGroupTuple(sourceLineNumbers, id)); + this.Core.AddSymbol(new WixBundlePackageGroupSymbol(sourceLineNumbers, id)); } } @@ -2664,7 +2664,7 @@ namespace WixToolset.Core { case "Id": id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixBundlePackageGroup, id); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixBundlePackageGroup, id); break; case "After": after = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); @@ -2717,9 +2717,9 @@ namespace WixToolset.Core /// Identifier of previous item, if any. private void CreateRollbackBoundary(SourceLineNumber sourceLineNumbers, Identifier id, YesNoType vital, YesNoType transaction, ComplexReferenceParentType parentType, string parentId, ComplexReferenceChildType previousType, string previousId) { - this.Core.AddTuple(new WixChainItemTuple(sourceLineNumbers, id)); + this.Core.AddSymbol(new WixChainItemSymbol(sourceLineNumbers, id)); - var rollbackBoundary = this.Core.AddTuple(new WixBundleRollbackBoundaryTuple(sourceLineNumbers, id)); + var rollbackBoundary = this.Core.AddSymbol(new WixBundleRollbackBoundarySymbol(sourceLineNumbers, id)); if (YesNoType.NotSet != vital) { @@ -2812,7 +2812,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new WixBundleMsiPropertyTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, packageId, name)) + var symbol = this.Core.AddSymbol(new WixBundleMsiPropertySymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, packageId, name)) { PackageRef = packageId, Name = name, @@ -2821,7 +2821,7 @@ namespace WixToolset.Core if (!String.IsNullOrEmpty(condition)) { - tuple.Condition = condition; + symbol.Condition = condition; } } } @@ -2844,7 +2844,7 @@ namespace WixToolset.Core { case "Id": id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixBundlePackage, id); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixBundlePackage, id); break; default: this.Core.UnexpectedAttribute(node, attrib); @@ -2866,7 +2866,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixBundleSlipstreamMspTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, packageId, id)) + this.Core.AddSymbol(new WixBundleSlipstreamMspSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, packageId, id)) { TargetPackageRef = packageId, MspPackageRef = id @@ -2940,7 +2940,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixRelatedBundleTuple(sourceLineNumbers) + this.Core.AddSymbol(new WixRelatedBundleSymbol(sourceLineNumbers) { BundleId = id, Action = actionType, @@ -2986,7 +2986,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixBundleUpdateTuple(sourceLineNumbers) + this.Core.AddSymbol(new WixBundleUpdateSymbol(sourceLineNumbers) { Location = location }); @@ -3052,11 +3052,11 @@ namespace WixToolset.Core id = this.Core.CreateIdentifier("sbv", variable, condition, after, value, type); } - this.Core.CreateWixSearchTuple(sourceLineNumbers, node.Name.LocalName, id, variable, condition, after); + this.Core.CreateWixSearchSymbol(sourceLineNumbers, node.Name.LocalName, id, variable, condition, after); if (!this.Messaging.EncounteredError) { - this.Core.AddTuple(new WixSetVariableTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new WixSetVariableSymbol(sourceLineNumbers, id) { Value = value, Type = type, @@ -3130,7 +3130,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, name)) + this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, name)) { Value = value, Type = type, @@ -3145,7 +3145,7 @@ namespace WixToolset.Core var newType = type; if (newType == null && value != null) { - // Infer the type from the current value... + // Infer the type from the current value... if (value.StartsWith("v", StringComparison.OrdinalIgnoreCase)) { // Version constructor does not support simple "v#" syntax so check to see if the value is diff --git a/src/WixToolset.Core/Compiler_EmbeddedUI.cs b/src/WixToolset.Core/Compiler_EmbeddedUI.cs index 847ee2a8..4353e3cd 100644 --- a/src/WixToolset.Core/Compiler_EmbeddedUI.cs +++ b/src/WixToolset.Core/Compiler_EmbeddedUI.cs @@ -6,7 +6,7 @@ namespace WixToolset.Core using System.IO; using System.Xml.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; /// @@ -43,7 +43,7 @@ namespace WixToolset.Core } source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); type = 0x2; - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Binary, source); // add a reference to the appropriate Binary + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Binary, source); // add a reference to the appropriate Binary break; case "CommandLine": commandLine = this.Core.GetAttributeValue(sourceLineNumbers, attrib); @@ -58,7 +58,7 @@ namespace WixToolset.Core } source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); type = 0x12; - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.File, source); // add a reference to the appropriate File + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, source); // add a reference to the appropriate File break; case "PropertySource": if (null != source) @@ -92,7 +92,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new MsiEmbeddedChainerTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new MsiEmbeddedChainerSymbol(sourceLineNumbers, id) { Condition = condition, CommandLine = commandLine, @@ -318,7 +318,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new MsiEmbeddedUITuple(sourceLineNumbers, id) + this.Core.AddSymbol(new MsiEmbeddedUISymbol(sourceLineNumbers, id) { FileName = name, EntryPoint = true, @@ -405,7 +405,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new MsiEmbeddedUITuple(sourceLineNumbers, id) + this.Core.AddSymbol(new MsiEmbeddedUISymbol(sourceLineNumbers, id) { FileName = name, Source = sourceFile diff --git a/src/WixToolset.Core/Compiler_Module.cs b/src/WixToolset.Core/Compiler_Module.cs index 6166ae72..a7d94701 100644 --- a/src/WixToolset.Core/Compiler_Module.cs +++ b/src/WixToolset.Core/Compiler_Module.cs @@ -6,7 +6,7 @@ namespace WixToolset.Core using System.Globalization; using System.Xml.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; /// @@ -136,7 +136,7 @@ namespace WixToolset.Core this.ParseCustomActionElement(child); break; case "CustomActionRef": - this.ParseSimpleRefElement(child, TupleDefinitions.CustomAction); + this.ParseSimpleRefElement(child, SymbolDefinitions.CustomAction); break; case "CustomTable": this.ParseCustomTableElement(child); @@ -154,7 +154,7 @@ namespace WixToolset.Core this.ParseEmbeddedChainerElement(child); break; case "EmbeddedChainerRef": - this.ParseSimpleRefElement(child, TupleDefinitions.MsiEmbeddedChainer); + this.ParseSimpleRefElement(child, SymbolDefinitions.MsiEmbeddedChainer); break; case "EnsureTable": this.ParseEnsureTableElement(child); @@ -178,7 +178,7 @@ namespace WixToolset.Core this.ParsePropertyElement(child); break; case "PropertyRef": - this.ParseSimpleRefElement(child, TupleDefinitions.Property); + this.ParseSimpleRefElement(child, SymbolDefinitions.Property); break; case "SetDirectory": this.ParseSetDirectoryElement(child); @@ -197,7 +197,7 @@ namespace WixToolset.Core this.ParseUIElement(child); break; case "UIRef": - this.ParseSimpleRefElement(child, TupleDefinitions.WixUI); + this.ParseSimpleRefElement(child, SymbolDefinitions.WixUI); break; case "WixVariable": this.ParseWixVariableElement(child); @@ -216,13 +216,13 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new ModuleSignatureTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, this.activeName, this.activeLanguage)) + var symbol = this.Core.AddSymbol(new ModuleSignatureSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, this.activeName, this.activeLanguage)) { ModuleID = this.activeName, Version = version }); - tuple.Set((int)ModuleSignatureTupleFields.Language, this.activeLanguage); + symbol.Set((int)ModuleSignatureSymbolFields.Language, this.activeLanguage); } } finally @@ -284,7 +284,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new ModuleDependencyTuple(sourceLineNumbers) + var symbol = this.Core.AddSymbol(new ModuleDependencySymbol(sourceLineNumbers) { ModuleID = this.activeName, RequiredID = requiredId, @@ -292,7 +292,7 @@ namespace WixToolset.Core RequiredVersion = requiredVersion }); - tuple.Set((int)ModuleDependencyTupleFields.ModuleLanguage, this.activeLanguage); + symbol.Set((int)ModuleDependencySymbolFields.ModuleLanguage, this.activeLanguage); } } @@ -365,7 +365,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new ModuleExclusionTuple(sourceLineNumbers) + var symbol = this.Core.AddSymbol(new ModuleExclusionSymbol(sourceLineNumbers) { ModuleID = this.activeName, ExcludedID = excludedId, @@ -373,8 +373,8 @@ namespace WixToolset.Core ExcludedMaxVersion = excludedMaxVersion }); - tuple.Set((int)ModuleExclusionTupleFields.ModuleLanguage, this.activeLanguage); - tuple.Set((int)ModuleExclusionTupleFields.ExcludedLanguage, excludedLanguageField); + symbol.Set((int)ModuleExclusionSymbolFields.ModuleLanguage, this.activeLanguage); + symbol.Set((int)ModuleExclusionSymbolFields.ExcludedLanguage, excludedLanguageField); } } @@ -485,7 +485,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new ModuleConfigurationTuple(sourceLineNumbers, name) + this.Core.AddSymbol(new ModuleConfigurationSymbol(sourceLineNumbers, name) { Format = format, Type = type, @@ -563,7 +563,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new ModuleSubstitutionTuple(sourceLineNumbers) + this.Core.AddSymbol(new ModuleSubstitutionSymbol(sourceLineNumbers) { Table = table, Row = rowKeys, @@ -616,7 +616,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixSuppressModularizationTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, name))); + this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, name))); } } @@ -658,7 +658,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new ModuleIgnoreTableTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, id))); + this.Core.AddSymbol(new ModuleIgnoreTableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, id))); } } } diff --git a/src/WixToolset.Core/Compiler_Patch.cs b/src/WixToolset.Core/Compiler_Patch.cs index f7481143..73e7f521 100644 --- a/src/WixToolset.Core/Compiler_Patch.cs +++ b/src/WixToolset.Core/Compiler_Patch.cs @@ -8,7 +8,7 @@ namespace WixToolset.Core using System.Globalization; using System.Xml.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; /// @@ -197,7 +197,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixPatchIdTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, patchId)) + this.Core.AddSymbol(new WixPatchIdSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, patchId)) { ClientPatchId = clientPatchId, OptimizePatchSizeForLargeFiles = optimizePatchSizeForLargeFiles, @@ -425,7 +425,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new MsiPatchSequenceTuple(sourceLineNumbers) + this.Core.AddSymbol(new MsiPatchSequenceSymbol(sourceLineNumbers) { PatchFamily = id.Id, ProductCode = productCode, @@ -504,7 +504,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new WixPatchFamilyGroupTuple(sourceLineNumbers, id)); + this.Core.AddSymbol(new WixPatchFamilyGroupSymbol(sourceLineNumbers, id)); //Add this PatchFamilyGroup and its parent in WixGroup. this.Core.CreateWixGroupRow(sourceLineNumbers, parentType, parentId, ComplexReferenceChildType.PatchFamilyGroup, id.Id); @@ -532,7 +532,7 @@ namespace WixToolset.Core { case "Id": id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixPatchFamilyGroup, id); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixPatchFamilyGroup, id); break; default: this.Core.UnexpectedAttribute(node, attrib); @@ -621,7 +621,7 @@ namespace WixToolset.Core // By default, target ProductCodes should be added. if (!replace) { - this.Core.AddTuple(new WixPatchTargetTuple(sourceLineNumbers) + this.Core.AddSymbol(new WixPatchTargetSymbol(sourceLineNumbers) { ProductCode = "*" }); @@ -629,7 +629,7 @@ namespace WixToolset.Core foreach (var targetProductCode in targetProductCodes) { - this.Core.AddTuple(new WixPatchTargetTuple(sourceLineNumbers) + this.Core.AddSymbol(new WixPatchTargetSymbol(sourceLineNumbers) { ProductCode = targetProductCode }); @@ -639,7 +639,7 @@ namespace WixToolset.Core private void AddMsiPatchMetadata(SourceLineNumber sourceLineNumbers, string company, string property, string value) { - this.Core.AddTuple(new MsiPatchMetadataTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, company, property)) + this.Core.AddSymbol(new MsiPatchMetadataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, company, property)) { Company = company, Property = property, diff --git a/src/WixToolset.Core/Compiler_PatchCreation.cs b/src/WixToolset.Core/Compiler_PatchCreation.cs index 3371d84e..ddd07654 100644 --- a/src/WixToolset.Core/Compiler_PatchCreation.cs +++ b/src/WixToolset.Core/Compiler_PatchCreation.cs @@ -7,7 +7,7 @@ namespace WixToolset.Core using System.Globalization; using System.Xml.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; /// @@ -258,7 +258,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new ImageFamiliesTuple(sourceLineNumbers) + var symbol = this.Core.AddSymbol(new ImageFamiliesSymbol(sourceLineNumbers) { Family = name, MediaSrcPropName = mediaSrcProp, @@ -268,12 +268,12 @@ namespace WixToolset.Core if (CompilerConstants.IntegerNotSet != diskId) { - tuple.MediaDiskId = diskId; + symbol.MediaDiskId = diskId; } if (CompilerConstants.IntegerNotSet != sequenceStart) { - tuple.FileSequenceStart = sequenceStart; + symbol.FileSequenceStart = sequenceStart; } } } @@ -379,7 +379,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new UpgradedImagesTuple(sourceLineNumbers) + this.Core.AddSymbol(new UpgradedImagesSymbol(sourceLineNumbers) { Upgraded = upgrade, MsiPath = sourceFile, @@ -462,7 +462,7 @@ namespace WixToolset.Core { if (ignore) { - this.Core.AddTuple(new UpgradedFilesToIgnoreTuple(sourceLineNumbers) + this.Core.AddSymbol(new UpgradedFilesToIgnoreSymbol(sourceLineNumbers) { Upgraded = upgrade, FTK = file @@ -470,7 +470,7 @@ namespace WixToolset.Core } else { - this.Core.AddTuple(new UpgradedFilesOptionalDataTuple(sourceLineNumbers) + this.Core.AddSymbol(new UpgradedFilesOptionalDataSymbol(sourceLineNumbers) { Upgraded = upgrade, FTK = file, @@ -591,7 +591,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new TargetImagesTuple(sourceLineNumbers) + this.Core.AddSymbol(new TargetImagesSymbol(sourceLineNumbers) { Target = target, MsiPath = sourceFile, @@ -673,7 +673,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new TargetFilesOptionalDataTuple(sourceLineNumbers) + var symbol = this.Core.AddSymbol(new TargetFilesOptionalDataSymbol(sourceLineNumbers) { Target = target, FTK = file, @@ -684,9 +684,9 @@ namespace WixToolset.Core if (null != protectOffsets) { - tuple.RetainOffsets = protectOffsets; + symbol.RetainOffsets = protectOffsets; - this.Core.AddTuple(new FamilyFileRangesTuple(sourceLineNumbers) + this.Core.AddSymbol(new FamilyFileRangesSymbol(sourceLineNumbers) { Family = family, FTK = file, @@ -793,7 +793,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new ExternalFilesTuple(sourceLineNumbers) + var symbol = this.Core.AddSymbol(new ExternalFilesSymbol(sourceLineNumbers) { Family = family, FTK = file, @@ -805,17 +805,17 @@ namespace WixToolset.Core if (null != protectOffsets) { - tuple.RetainOffsets = protectOffsets; + symbol.RetainOffsets = protectOffsets; } if (CompilerConstants.IntegerNotSet != order) { - tuple.Order = order; + symbol.Order = order; } if (null != protectOffsets) { - this.Core.AddTuple(new FamilyFileRangesTuple(sourceLineNumbers) + this.Core.AddSymbol(new FamilyFileRangesSymbol(sourceLineNumbers) { Family = family, FTK = file, @@ -890,7 +890,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new FamilyFileRangesTuple(sourceLineNumbers) + this.Core.AddSymbol(new FamilyFileRangesSymbol(sourceLineNumbers) { Family = family, FTK = file, @@ -1251,7 +1251,7 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttributes(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "Target", "ProductCode")); } target = this.Core.GetAttributeValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.TargetImages, target); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.TargetImages, target); break; case "Sequence": sequence = this.Core.GetAttributeVersionValue(sourceLineNumbers, attrib); @@ -1282,7 +1282,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new PatchSequenceTuple(sourceLineNumbers) + this.Core.AddSymbol(new PatchSequenceSymbol(sourceLineNumbers) { PatchFamily = family, Target = target, @@ -1294,7 +1294,7 @@ namespace WixToolset.Core private void AddPatchMetadata(SourceLineNumber sourceLineNumbers, string company, string property, string value) { - this.Core.AddTuple(new PatchMetadataTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, company, property)) + this.Core.AddSymbol(new PatchMetadataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, company, property)) { Company = company, Property = property, diff --git a/src/WixToolset.Core/Compiler_UI.cs b/src/WixToolset.Core/Compiler_UI.cs index 9038f727..1ecf4f64 100644 --- a/src/WixToolset.Core/Compiler_UI.cs +++ b/src/WixToolset.Core/Compiler_UI.cs @@ -6,7 +6,7 @@ namespace WixToolset.Core using System.Collections; using System.Xml.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; @@ -70,13 +70,13 @@ namespace WixToolset.Core this.ParseBillboardActionElement(child); break; case "ComboBox": - this.ParseControlGroupElement(child, TupleDefinitionType.ComboBox, "ListItem"); + this.ParseControlGroupElement(child, SymbolDefinitionType.ComboBox, "ListItem"); break; case "Dialog": this.ParseDialogElement(child); break; case "DialogRef": - this.ParseSimpleRefElement(child, TupleDefinitions.Dialog); + this.ParseSimpleRefElement(child, SymbolDefinitions.Dialog); break; case "EmbeddedUI": if (0 < embeddedUICount) // there can be only one embedded UI @@ -91,10 +91,10 @@ namespace WixToolset.Core this.ParseErrorElement(child); break; case "ListBox": - this.ParseControlGroupElement(child, TupleDefinitionType.ListBox, "ListItem"); + this.ParseControlGroupElement(child, SymbolDefinitionType.ListBox, "ListItem"); break; case "ListView": - this.ParseControlGroupElement(child, TupleDefinitionType.ListView, "ListItem"); + this.ParseControlGroupElement(child, SymbolDefinitionType.ListView, "ListItem"); break; case "ProgressText": this.ParseActionTextElement(child); @@ -132,10 +132,10 @@ namespace WixToolset.Core this.ParsePropertyElement(child); break; case "PropertyRef": - this.ParseSimpleRefElement(child, TupleDefinitions.Property); + this.ParseSimpleRefElement(child, SymbolDefinitions.Property); break; case "UIRef": - this.ParseSimpleRefElement(child, TupleDefinitions.WixUI); + this.ParseSimpleRefElement(child, SymbolDefinitions.WixUI); break; default: @@ -151,7 +151,7 @@ namespace WixToolset.Core if (null != id && !this.Core.EncounteredError) { - this.Core.AddTuple(new WixUITuple(sourceLineNumbers, id)); + this.Core.AddSymbol(new WixUISymbol(sourceLineNumbers, id)); } } @@ -159,10 +159,10 @@ namespace WixToolset.Core /// Parses a list item element. /// /// Element to parse. - /// Type of tuple to create. + /// Type of symbol to create. /// Identifier of property referred to by list item. /// Relative order of list items. - private void ParseListItemElement(XElement node, TupleDefinitionType tupleType, string property, ref int order) + private void ParseListItemElement(XElement node, SymbolDefinitionType symbolType, string property, ref int order) { var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); string icon = null; @@ -176,10 +176,10 @@ namespace WixToolset.Core switch (attrib.Name.LocalName) { case "Icon": - if (TupleDefinitionType.ListView == tupleType) + if (SymbolDefinitionType.ListView == symbolType) { icon = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Binary, icon); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Binary, icon); } else { @@ -212,10 +212,10 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - switch (tupleType) + switch (symbolType) { - case TupleDefinitionType.ComboBox: - this.Core.AddTuple(new ComboBoxTuple(sourceLineNumbers) + case SymbolDefinitionType.ComboBox: + this.Core.AddSymbol(new ComboBoxSymbol(sourceLineNumbers) { Property = property, Order = ++order, @@ -223,8 +223,8 @@ namespace WixToolset.Core Text = text, }); break; - case TupleDefinitionType.ListBox: - this.Core.AddTuple(new ListBoxTuple(sourceLineNumbers) + case SymbolDefinitionType.ListBox: + this.Core.AddSymbol(new ListBoxSymbol(sourceLineNumbers) { Property = property, Order = ++order, @@ -232,8 +232,8 @@ namespace WixToolset.Core Text = text, }); break; - case TupleDefinitionType.ListView: - var tuple = this.Core.AddTuple(new ListViewTuple(sourceLineNumbers) + case SymbolDefinitionType.ListView: + var symbol = this.Core.AddSymbol(new ListViewSymbol(sourceLineNumbers) { Property = property, Order = ++order, @@ -243,11 +243,11 @@ namespace WixToolset.Core if (null != icon) { - tuple.BinaryRef = icon; + symbol.BinaryRef = icon; } break; default: - throw new ArgumentOutOfRangeException(nameof(tupleType)); + throw new ArgumentOutOfRangeException(nameof(symbolType)); } } } @@ -284,7 +284,7 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttributes(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "Icon", "Text")); } text = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Binary, text); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Binary, text); type = RadioButtonType.Bitmap; break; case "Height": @@ -299,7 +299,7 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttributes(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "Bitmap", "Text")); } text = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Binary, text); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Binary, text); type = RadioButtonType.Icon; break; case "Text": @@ -365,7 +365,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new RadioButtonTuple(sourceLineNumbers) + var symbol = this.Core.AddSymbol(new RadioButtonSymbol(sourceLineNumbers) { Property = property, Order = ++order, @@ -374,10 +374,10 @@ namespace WixToolset.Core Help = (null != tooltip || null != help) ? String.Concat(tooltip, "|", help) : null }); - tuple.Set((int)RadioButtonTupleFields.X, x); - tuple.Set((int)RadioButtonTupleFields.Y, y); - tuple.Set((int)RadioButtonTupleFields.Width, width); - tuple.Set((int)RadioButtonTupleFields.Height, height); + symbol.Set((int)RadioButtonSymbolFields.X, x); + symbol.Set((int)RadioButtonSymbolFields.Y, y); + symbol.Set((int)RadioButtonSymbolFields.Width, width); + symbol.Set((int)RadioButtonSymbolFields.Height, height); } return type; @@ -401,7 +401,7 @@ namespace WixToolset.Core { case "Id": action = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.WixAction, "InstallExecuteSequence", action); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.WixAction, "InstallExecuteSequence", action); break; default: this.Core.UnexpectedAttribute(node, attrib); @@ -464,7 +464,7 @@ namespace WixToolset.Core break; case "Feature": feature = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Feature, feature); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Feature, feature); break; default: this.Core.UnexpectedAttribute(node, attrib); @@ -490,12 +490,12 @@ namespace WixToolset.Core { case "Control": // These are all thrown away. - ControlTuple lastTabTuple = null; + ControlSymbol lastTabSymbol = null; string firstControl = null; string defaultControl = null; string cancelControl = null; - this.ParseControlElement(child, id.Id, TupleDefinitionType.BBControl, ref lastTabTuple, ref firstControl, ref defaultControl, ref cancelControl); + this.ParseControlElement(child, id.Id, SymbolDefinitionType.BBControl, ref lastTabSymbol, ref firstControl, ref defaultControl, ref cancelControl); break; default: this.Core.UnexpectedElement(node, child); @@ -511,7 +511,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new BillboardTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new BillboardSymbol(sourceLineNumbers, id) { FeatureRef = feature, Action = action, @@ -524,9 +524,9 @@ namespace WixToolset.Core /// Parses a control group element. /// /// Element to parse. - /// Tuple type referred to by control group. + /// Symbol type referred to by control group. /// Expected child elements. - private void ParseControlGroupElement(XElement node, TupleDefinitionType tupleType, string childTag) + private void ParseControlGroupElement(XElement node, SymbolDefinitionType symbolType, string childTag) { var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); var order = 0; @@ -569,7 +569,7 @@ namespace WixToolset.Core switch (child.Name.LocalName) { case "ListItem": - this.ParseListItemElement(child, tupleType, property, ref order); + this.ParseListItemElement(child, symbolType, property, ref order); break; case "Property": this.ParsePropertyElement(child); @@ -607,7 +607,7 @@ namespace WixToolset.Core { case "Property": property = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Property, property); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Property, property); break; default: this.Core.UnexpectedAttribute(node, attrib); @@ -704,7 +704,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new ActionTextTuple(sourceLineNumbers) + this.Core.AddSymbol(new ActionTextSymbol(sourceLineNumbers) { Action = action, Description = message, @@ -755,7 +755,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new UITextTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new UITextSymbol(sourceLineNumbers, id) { Text = text, }); @@ -860,7 +860,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var tuple = this.Core.AddTuple(new TextStyleTuple(sourceLineNumbers, id) + var symbol = this.Core.AddSymbol(new TextStyleSymbol(sourceLineNumbers, id) { FaceName = faceName, Red = red, @@ -872,7 +872,7 @@ namespace WixToolset.Core Underline = underline, }); - tuple.Set((int)TextStyleTupleFields.Size, size); + symbol.Set((int)TextStyleSymbolFields.Size, size); } } @@ -976,7 +976,7 @@ namespace WixToolset.Core id = Identifier.Invalid; } - ControlTuple lastTabTuple = null; + ControlSymbol lastTabSymbol = null; string cancelControl = null; string defaultControl = null; string firstControl = null; @@ -988,7 +988,7 @@ namespace WixToolset.Core switch (child.Name.LocalName) { case "Control": - this.ParseControlElement(child, id.Id, TupleDefinitionType.Control, ref lastTabTuple, ref firstControl, ref defaultControl, ref cancelControl); + this.ParseControlElement(child, id.Id, SymbolDefinitionType.Control, ref lastTabSymbol, ref firstControl, ref defaultControl, ref cancelControl); break; default: this.Core.UnexpectedElement(node, child); @@ -1001,11 +1001,11 @@ namespace WixToolset.Core } } - if (null != lastTabTuple && null != lastTabTuple.Control) + if (null != lastTabSymbol && null != lastTabSymbol.Control) { - if (firstControl != lastTabTuple.Control) + if (firstControl != lastTabSymbol.Control) { - lastTabTuple.NextControlRef = firstControl; + lastTabSymbol.NextControlRef = firstControl; } } @@ -1016,7 +1016,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new DialogTuple(sourceLineNumbers, id) + this.Core.AddSymbol(new DialogSymbol(sourceLineNumbers, id) { HCentering = x, VCentering = y, @@ -1047,12 +1047,12 @@ namespace WixToolset.Core /// Element to parse. /// Identifier for parent dialog. /// Table control belongs in. - /// Last control in the tab order. + /// Last control in the tab order. /// Name of the first control in the tab order. /// Name of the default control. /// Name of the candle control. /// True if the containing dialog tracks disk space. - private void ParseControlElement(XElement node, string dialog, TupleDefinitionType tupleType, ref ControlTuple lastTabTuple, ref string firstControl, ref string defaultControl, ref string cancelControl) + private void ParseControlElement(XElement node, string dialog, SymbolDefinitionType symbolType, ref ControlSymbol lastTabSymbol, ref string firstControl, ref string defaultControl, ref string cancelControl) { var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); Identifier controlId = null; @@ -1379,13 +1379,13 @@ namespace WixToolset.Core this.ParseBinaryElement(child); break; case "ComboBox": - this.ParseControlGroupElement(child, TupleDefinitionType.ComboBox, "ListItem"); + this.ParseControlGroupElement(child, SymbolDefinitionType.ComboBox, "ListItem"); break; case "ListBox": - this.ParseControlGroupElement(child, TupleDefinitionType.ListBox, "ListItem"); + this.ParseControlGroupElement(child, SymbolDefinitionType.ListBox, "ListItem"); break; case "ListView": - this.ParseControlGroupElement(child, TupleDefinitionType.ListView, "ListItem"); + this.ParseControlGroupElement(child, SymbolDefinitionType.ListView, "ListItem"); break; case "Property": this.ParsePropertyElement(child); @@ -1454,7 +1454,7 @@ namespace WixToolset.Core } // the logic for creating control rows is a little tricky because of the way tabable controls are set - IntermediateTuple tuple = null; + IntermediateSymbol symbol = null; if (!this.Core.EncounteredError) { if ("CheckBox" == controlType) @@ -1469,7 +1469,7 @@ namespace WixToolset.Core } else if (!String.IsNullOrEmpty(property)) { - this.Core.AddTuple(new CheckBoxTuple(sourceLineNumbers) + this.Core.AddSymbol(new CheckBoxSymbol(sourceLineNumbers) { Property = property, Value = checkboxValue, @@ -1477,15 +1477,15 @@ namespace WixToolset.Core } else { - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.CheckBox, checkBoxPropertyRef); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.CheckBox, checkBoxPropertyRef); } } var id = new Identifier(controlId.Access, dialog, controlId.Id); - if (TupleDefinitionType.BBControl == tupleType) + if (SymbolDefinitionType.BBControl == symbolType) { - var bbTuple = this.Core.AddTuple(new BBControlTuple(sourceLineNumbers, id) + var bbSymbol = this.Core.AddSymbol(new BBControlSymbol(sourceLineNumbers, id) { BillboardRef = dialog, BBControl = controlId.Id, @@ -1503,16 +1503,16 @@ namespace WixToolset.Core SourceFile = String.IsNullOrEmpty(sourceFile) ? null : new IntermediateFieldPathValue { Path = sourceFile } }); - bbTuple.Set((int)BBControlTupleFields.X, x); - bbTuple.Set((int)BBControlTupleFields.Y, y); - bbTuple.Set((int)BBControlTupleFields.Width, width); - bbTuple.Set((int)BBControlTupleFields.Height, height); + bbSymbol.Set((int)BBControlSymbolFields.X, x); + bbSymbol.Set((int)BBControlSymbolFields.Y, y); + bbSymbol.Set((int)BBControlSymbolFields.Width, width); + bbSymbol.Set((int)BBControlSymbolFields.Height, height); - tuple = bbTuple; + symbol = bbSymbol; } else { - var controlTuple = this.Core.AddTuple(new ControlTuple(sourceLineNumbers, id) + var controlSymbol = this.Core.AddSymbol(new ControlSymbol(sourceLineNumbers, id) { DialogRef = dialog, Control = controlId.Id, @@ -1532,17 +1532,17 @@ namespace WixToolset.Core SourceFile = String.IsNullOrEmpty(sourceFile) ? null : new IntermediateFieldPathValue { Path = sourceFile } }); - controlTuple.Set((int)BBControlTupleFields.X, x); - controlTuple.Set((int)BBControlTupleFields.Y, y); - controlTuple.Set((int)BBControlTupleFields.Width, width); - controlTuple.Set((int)BBControlTupleFields.Height, height); + controlSymbol.Set((int)BBControlSymbolFields.X, x); + controlSymbol.Set((int)BBControlSymbolFields.Y, y); + controlSymbol.Set((int)BBControlSymbolFields.Width, width); + controlSymbol.Set((int)BBControlSymbolFields.Height, height); - tuple = controlTuple; + symbol = controlSymbol; } if (!String.IsNullOrEmpty(defaultCondition)) { - this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers) + this.Core.AddSymbol(new ControlConditionSymbol(sourceLineNumbers) { DialogRef = dialog, ControlRef = controlId.Id, @@ -1553,7 +1553,7 @@ namespace WixToolset.Core if (!String.IsNullOrEmpty(enableCondition)) { - this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers) + this.Core.AddSymbol(new ControlConditionSymbol(sourceLineNumbers) { DialogRef = dialog, ControlRef = controlId.Id, @@ -1564,7 +1564,7 @@ namespace WixToolset.Core if (!String.IsNullOrEmpty(disableCondition)) { - this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers) + this.Core.AddSymbol(new ControlConditionSymbol(sourceLineNumbers) { DialogRef = dialog, ControlRef = controlId.Id, @@ -1575,7 +1575,7 @@ namespace WixToolset.Core if (!String.IsNullOrEmpty(hideCondition)) { - this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers) + this.Core.AddSymbol(new ControlConditionSymbol(sourceLineNumbers) { DialogRef = dialog, ControlRef = controlId.Id, @@ -1586,7 +1586,7 @@ namespace WixToolset.Core if (!String.IsNullOrEmpty(showCondition)) { - this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers) + this.Core.AddSymbol(new ControlConditionSymbol(sourceLineNumbers) { DialogRef = dialog, ControlRef = controlId.Id, @@ -1598,15 +1598,15 @@ namespace WixToolset.Core if (!notTabbable) { - if (tuple is ControlTuple controlTuple) + if (symbol is ControlSymbol controlSymbol) { - if (null != lastTabTuple) + if (null != lastTabSymbol) { - lastTabTuple.NextControlRef = controlTuple.Control; + lastTabSymbol.NextControlRef = controlSymbol.Control; } - lastTabTuple = controlTuple; + lastTabSymbol = controlSymbol; } - else if (tuple != null) + else if (symbol != null) { this.Core.Write(ErrorMessages.TabbableControlNotAllowedInBillboard(sourceLineNumbers, node.Name.LocalName, controlType)); } @@ -1621,7 +1621,7 @@ namespace WixToolset.Core // add a reference if the identifier of the binary entry is known during compilation if (("Bitmap" == controlType || "Icon" == controlType) && Common.IsIdentifier(text)) { - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Binary, text); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Binary, text); } } @@ -1665,7 +1665,7 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName)); } dialog = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Dialog, dialog); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Dialog, dialog); break; case "Event": controlEvent = Compiler.UppercaseFirstChar(this.Core.GetAttributeValue(sourceLineNumbers, attrib)); @@ -1726,7 +1726,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new ControlEventTuple(sourceLineNumbers) + this.Core.AddSymbol(new ControlEventSymbol(sourceLineNumbers) { DialogRef = dialog, ControlRef = control, @@ -1739,18 +1739,18 @@ namespace WixToolset.Core if ("DoAction" == controlEvent && null != argument) { - // if we're not looking at a standard action or a formatted string then create a reference + // if we're not looking at a standard action or a formatted string then create a reference // to the custom action. if (!WindowsInstallerStandard.IsStandardAction(argument) && !Common.ContainsProperty(argument)) { - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.CustomAction, argument); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.CustomAction, argument); } } // if we're referring to a dialog but not through a property, add it to the references if (("NewDialog" == controlEvent || "SpawnDialog" == controlEvent || "SpawnWaitDialog" == controlEvent || "SelectionBrowse" == controlEvent) && Common.IsIdentifier(argument)) { - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Dialog, argument); + this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Dialog, argument); } } @@ -1793,7 +1793,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddTuple(new EventMappingTuple(sourceLineNumbers) + this.Core.AddSymbol(new EventMappingSymbol(sourceLineNumbers) { DialogRef = dialog, ControlRef = control, diff --git a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs index 3c092bd4..7160c32e 100644 --- a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs +++ b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs @@ -12,7 +12,7 @@ namespace WixToolset.Core.ExtensibilityServices using System.Text.RegularExpressions; using System.Xml.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; @@ -44,7 +44,7 @@ namespace WixToolset.Core.ExtensibilityServices private IMessaging Messaging { get; } - private ITupleDefinitionCreator Creator { get; set; } + private ISymbolDefinitionCreator Creator { get; set; } public bool ContainsProperty(string possibleProperty) { @@ -54,7 +54,7 @@ namespace WixToolset.Core.ExtensibilityServices public void CreateComplexReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, ComplexReferenceParentType parentType, string parentId, string parentLanguage, ComplexReferenceChildType childType, string childId, bool isPrimary) { - section.AddTuple(new WixComplexReferenceTuple(sourceLineNumbers) + section.AddSymbol(new WixComplexReferenceSymbol(sourceLineNumbers) { Parent = parentId, ParentType = parentType, @@ -64,16 +64,16 @@ namespace WixToolset.Core.ExtensibilityServices IsPrimary = isPrimary }); - this.CreateWixGroupTuple(section, sourceLineNumbers, parentType, parentId, childType, childId); + this.CreateWixGroupSymbol(section, sourceLineNumbers, parentType, parentId, childType, childId); } [Obsolete] public Identifier CreateDirectoryRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, string name, ISet sectionInlinedDirectoryIds, string shortName = null, string sourceName = null, string shortSourceName = null) { - return this.CreateDirectoryTuple(section, sourceLineNumbers, id, parentId, name, sectionInlinedDirectoryIds, shortName, sourceName, shortSourceName); + return this.CreateDirectorySymbol(section, sourceLineNumbers, id, parentId, name, sectionInlinedDirectoryIds, shortName, sourceName, shortSourceName); } - public Identifier CreateDirectoryTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, string name, ISet sectionInlinedDirectoryIds, string shortName = null, string sourceName = null, string shortSourceName = null) + public Identifier CreateDirectorySymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, string name, ISet sectionInlinedDirectoryIds, string shortName = null, string sourceName = null, string shortSourceName = null) { if (String.IsNullOrEmpty(shortName) && !name.Equals("SourceDir") && !this.IsValidShortFilename(name)) { @@ -86,7 +86,7 @@ namespace WixToolset.Core.ExtensibilityServices } // For anonymous directories, create the identifier. If this identifier already exists in the - // active section, bail so we don't add duplicate anonymous directory tuples (which are legal + // active section, bail so we don't add duplicate anonymous directory symbols (which are legal // but bloat the intermediate and ultimately make the linker do "busy work"). if (null == id) { @@ -98,7 +98,7 @@ namespace WixToolset.Core.ExtensibilityServices } } - var tuple = section.AddTuple(new DirectoryTuple(sourceLineNumbers, id) + var symbol = section.AddSymbol(new DirectorySymbol(sourceLineNumbers, id) { ParentDirectoryRef = parentId, Name = name, @@ -107,7 +107,7 @@ namespace WixToolset.Core.ExtensibilityServices SourceShortName = shortSourceName }); - return tuple.Id; + return symbol.Id; } public string CreateDirectoryReferenceFromInlineSyntax(IntermediateSection section, SourceLineNumber sourceLineNumbers, string parentId, XAttribute attribute, ISet sectionInlinedDirectoryIds) @@ -122,9 +122,9 @@ namespace WixToolset.Core.ExtensibilityServices if (1 == inlineSyntax.Length) { id = inlineSyntax[0]; - this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Directory, id); + this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Directory, id); } - else // start creating tuples for the entries in the inline syntax + else // start creating symbols for the entries in the inline syntax { id = parentId; @@ -138,14 +138,14 @@ namespace WixToolset.Core.ExtensibilityServices //} id = inlineSyntax[0].TrimEnd(':'); - this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Directory, id); + this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Directory, id); pathStartsAt = 1; } for (var i = pathStartsAt; i < inlineSyntax.Length; ++i) { - var inlineId = this.CreateDirectoryTuple(section, sourceLineNumbers, null, id, inlineSyntax[i], sectionInlinedDirectoryIds); + var inlineId = this.CreateDirectorySymbol(section, sourceLineNumbers, null, id, inlineSyntax[i], sectionInlinedDirectoryIds); id = inlineId.Id; } } @@ -174,10 +174,10 @@ namespace WixToolset.Core.ExtensibilityServices [Obsolete] public Identifier CreateRegistryRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, RegistryRootType root, string key, string name, string value, string componentId, bool escapeLeadingHash) { - return this.CreateRegistryTuple(section, sourceLineNumbers, root, key, name, value, componentId, escapeLeadingHash); + return this.CreateRegistrySymbol(section, sourceLineNumbers, root, key, name, value, componentId, escapeLeadingHash); } - public Identifier CreateRegistryTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, RegistryRootType root, string key, string name, string value, string componentId, bool escapeLeadingHash) + public Identifier CreateRegistrySymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, RegistryRootType root, string key, string name, string value, string componentId, bool escapeLeadingHash) { if (RegistryRootType.Unknown == root) { @@ -202,7 +202,7 @@ namespace WixToolset.Core.ExtensibilityServices var id = this.CreateIdentifier("reg", componentId, ((int)root).ToString(CultureInfo.InvariantCulture.NumberFormat), key.ToLowerInvariant(), (null != name ? name.ToLowerInvariant() : name)); - var tuple = section.AddTuple(new RegistryTuple(sourceLineNumbers, id) + var symbol = section.AddSymbol(new RegistrySymbol(sourceLineNumbers, id) { Root = root, Key = key, @@ -211,30 +211,30 @@ namespace WixToolset.Core.ExtensibilityServices ComponentRef = componentId, }); - return tuple.Id; + return symbol.Id; } - public void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tupleName, params string[] primaryKeys) + public void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, string symbolName, params string[] primaryKeys) { - section.AddTuple(new WixSimpleReferenceTuple(sourceLineNumbers) + section.AddSymbol(new WixSimpleReferenceSymbol(sourceLineNumbers) { - Table = tupleName, + Table = symbolName, PrimaryKeys = String.Join("/", primaryKeys) }); } - public void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateTupleDefinition tupleDefinition, params string[] primaryKeys) + public void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateSymbolDefinition symbolDefinition, params string[] primaryKeys) { - this.CreateSimpleReference(section, sourceLineNumbers, tupleDefinition.Name, primaryKeys); + this.CreateSimpleReference(section, sourceLineNumbers, symbolDefinition.Name, primaryKeys); } [Obsolete] public void CreateWixGroupRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, ComplexReferenceParentType parentType, string parentId, ComplexReferenceChildType childType, string childId) { - this.CreateWixGroupTuple(section, sourceLineNumbers, parentType, parentId, childType, childId); + this.CreateWixGroupSymbol(section, sourceLineNumbers, parentType, parentId, childType, childId); } - public void CreateWixGroupTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, ComplexReferenceParentType parentType, string parentId, ComplexReferenceChildType childType, string childId) + public void CreateWixGroupSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, ComplexReferenceParentType parentType, string parentId, ComplexReferenceChildType childType, string childId) { if (null == parentId || ComplexReferenceParentType.Unknown == parentType) { @@ -246,7 +246,7 @@ namespace WixToolset.Core.ExtensibilityServices throw new ArgumentNullException("childId"); } - section.AddTuple(new WixGroupTuple(sourceLineNumbers) + section.AddSymbol(new WixGroupSymbol(sourceLineNumbers) { ParentId = parentId, ParentType = parentType, @@ -255,7 +255,7 @@ namespace WixToolset.Core.ExtensibilityServices }); } - public void CreateWixSearchTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, string elementName, Identifier id, string variable, string condition, string after, string bundleExtensionId) + public void CreateWixSearchSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, string elementName, Identifier id, string variable, string condition, string after, string bundleExtensionId) { // TODO: verify variable is not a standard bundle variable if (variable == null) @@ -263,7 +263,7 @@ namespace WixToolset.Core.ExtensibilityServices this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, elementName, "Variable")); } - section.AddTuple(new WixSearchTuple(sourceLineNumbers, id) + section.AddSymbol(new WixSearchSymbol(sourceLineNumbers, id) { Variable = variable, Condition = condition, @@ -272,20 +272,20 @@ namespace WixToolset.Core.ExtensibilityServices if (after != null) { - this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixSearch, after); + this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixSearch, after); // TODO: We're currently defaulting to "always run after", which we will need to change... - this.CreateWixSearchRelationTuple(section, sourceLineNumbers, id, after, 2); + this.CreateWixSearchRelationSymbol(section, sourceLineNumbers, id, after, 2); } if (!String.IsNullOrEmpty(bundleExtensionId)) { - this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixBundleExtension, bundleExtensionId); + this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundleExtension, bundleExtensionId); } } - public void CreateWixSearchRelationTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, int attributes) + public void CreateWixSearchRelationSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, int attributes) { - section.AddTuple(new WixSearchRelationTuple(sourceLineNumbers, id) + section.AddSymbol(new WixSearchRelationSymbol(sourceLineNumbers, id) { ParentSearchRef = parentId, Attributes = attributes, @@ -293,43 +293,43 @@ namespace WixToolset.Core.ExtensibilityServices } [Obsolete] - public IntermediateTuple CreateRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tableName, Identifier identifier = null) + public IntermediateSymbol CreateRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tableName, Identifier identifier = null) { - return this.CreateTuple(section, sourceLineNumbers, tableName, identifier); + return this.CreateSymbol(section, sourceLineNumbers, tableName, identifier); } [Obsolete] - public IntermediateTuple CreateRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, TupleDefinitionType tupleType, Identifier identifier = null) + public IntermediateSymbol CreateRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, SymbolDefinitionType symbolType, Identifier identifier = null) { - return this.CreateTuple(section, sourceLineNumbers, tupleType, identifier); + return this.CreateSymbol(section, sourceLineNumbers, symbolType, identifier); } - public IntermediateTuple CreateTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tupleName, Identifier identifier = null) + public IntermediateSymbol CreateSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, string symbolName, Identifier identifier = null) { if (this.Creator == null) { - this.CreateTupleDefinitionCreator(); + this.CreateSymbolDefinitionCreator(); } - if (!this.Creator.TryGetTupleDefinitionByName(tupleName, out var tupleDefinition)) + if (!this.Creator.TryGetSymbolDefinitionByName(symbolName, out var symbolDefinition)) { - throw new ArgumentException(nameof(tupleName)); + throw new ArgumentException(nameof(symbolName)); } - return this.CreateTuple(section, sourceLineNumbers, tupleDefinition, identifier); + return this.CreateSymbol(section, sourceLineNumbers, symbolDefinition, identifier); } [Obsolete] - public IntermediateTuple CreateTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, TupleDefinitionType tupleType, Identifier identifier = null) + public IntermediateSymbol CreateSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, SymbolDefinitionType symbolType, Identifier identifier = null) { - var tupleDefinition = TupleDefinitions.ByType(tupleType); + var symbolDefinition = SymbolDefinitions.ByType(symbolType); - return this.CreateTuple(section, sourceLineNumbers, tupleDefinition, identifier); + return this.CreateSymbol(section, sourceLineNumbers, symbolDefinition, identifier); } - public IntermediateTuple CreateTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateTupleDefinition tupleDefinition, Identifier identifier = null) + public IntermediateSymbol CreateSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateSymbolDefinition symbolDefinition, Identifier identifier = null) { - return section.AddTuple(tupleDefinition.CreateTuple(sourceLineNumbers, identifier)); + return section.AddSymbol(symbolDefinition.CreateSymbol(sourceLineNumbers, identifier)); } public string CreateShortName(string longName, bool keepExtension, bool allowWildcards, params string[] args) @@ -384,34 +384,34 @@ namespace WixToolset.Core.ExtensibilityServices public void EnsureTable(IntermediateSection section, SourceLineNumber sourceLineNumbers, TableDefinition tableDefinition) { - section.AddTuple(new WixEnsureTableTuple(sourceLineNumbers) + section.AddSymbol(new WixEnsureTableSymbol(sourceLineNumbers) { Table = tableDefinition.Name, }); // TODO: Check if the given table definition is a custom table. For now we have to assume that it isn't. - //this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixCustomTable, tableDefinition.Name); + //this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixCustomTable, tableDefinition.Name); } public void EnsureTable(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tableName) { - section.AddTuple(new WixEnsureTableTuple(sourceLineNumbers) + section.AddSymbol(new WixEnsureTableSymbol(sourceLineNumbers) { Table = tableName, }); if (this.Creator == null) { - this.CreateTupleDefinitionCreator(); + this.CreateSymbolDefinitionCreator(); } - // TODO: The tableName may not be the same as the tupleName. For now, we have to assume that it is. + // TODO: The tableName may not be the same as the symbolName. For now, we have to assume that it is. // We don't add custom table definitions to the tableDefinitions collection, // so if it's not in there, it better be a custom table. If the Id is just wrong, // instead of a custom table, we get an unresolved reference at link time. - if (!this.Creator.TryGetTupleDefinitionByName(tableName, out var _)) + if (!this.Creator.TryGetSymbolDefinitionByName(tableName, out var _)) { - this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixCustomTable, tableName); + this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixCustomTable, tableName); } } @@ -898,11 +898,11 @@ namespace WixToolset.Core.ExtensibilityServices } } - public WixActionTuple ScheduleActionTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, AccessModifier access, SequenceTable sequence, string actionName, string condition, string beforeAction, string afterAction, bool overridable = false) + public WixActionSymbol ScheduleActionSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, AccessModifier access, SequenceTable sequence, string actionName, string condition, string beforeAction, string afterAction, bool overridable = false) { var actionId = new Identifier(access, sequence, actionName); - var actionTuple = section.AddTuple(new WixActionTuple(sourceLineNumbers, actionId) + var actionSymbol = section.AddSymbol(new WixActionSymbol(sourceLineNumbers, actionId) { SequenceTable = sequence, Action = actionName, @@ -916,11 +916,11 @@ namespace WixToolset.Core.ExtensibilityServices { if (WindowsInstallerStandard.IsStandardAction(beforeAction)) { - this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixAction, sequence.ToString(), beforeAction); + this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixAction, sequence.ToString(), beforeAction); } else { - this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, beforeAction); + this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, beforeAction); } } @@ -928,15 +928,15 @@ namespace WixToolset.Core.ExtensibilityServices { if (WindowsInstallerStandard.IsStandardAction(afterAction)) { - this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixAction, sequence.ToString(), afterAction); + this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixAction, sequence.ToString(), afterAction); } else { - this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, afterAction); + this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, afterAction); } } - return actionTuple; + return actionSymbol; } public void CreateCustomActionReference(SourceLineNumber sourceLineNumbers, IntermediateSection section, string customAction, Platform currentPlatform, CustomActionPlatforms supportedPlatforms) @@ -968,7 +968,7 @@ namespace WixToolset.Core.ExtensibilityServices break; } - this.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, name + suffix); + this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, name + suffix); } } @@ -984,9 +984,9 @@ namespace WixToolset.Core.ExtensibilityServices this.Messaging.Write(ErrorMessages.UnexpectedElement(sourceLineNumbers, parentElement.Name.LocalName, childElement.Name.LocalName)); } - private void CreateTupleDefinitionCreator() + private void CreateSymbolDefinitionCreator() { - this.Creator = this.ServiceProvider.GetService(); + this.Creator = this.ServiceProvider.GetService(); } private static bool TryFindExtension(IEnumerable extensions, XNamespace ns, out ICompilerExtension extension) diff --git a/src/WixToolset.Core/ExtensibilityServices/TupleDefinitionCreator.cs b/src/WixToolset.Core/ExtensibilityServices/TupleDefinitionCreator.cs index 7ef72afc..2bff21d6 100644 --- a/src/WixToolset.Core/ExtensibilityServices/TupleDefinitionCreator.cs +++ b/src/WixToolset.Core/ExtensibilityServices/TupleDefinitionCreator.cs @@ -8,9 +8,9 @@ namespace WixToolset.Core.ExtensibilityServices using WixToolset.Extensibility; using WixToolset.Extensibility.Services; - internal class TupleDefinitionCreator : ITupleDefinitionCreator + internal class SymbolDefinitionCreator : ISymbolDefinitionCreator { - public TupleDefinitionCreator(IWixToolsetServiceProvider serviceProvider) + public SymbolDefinitionCreator(IWixToolsetServiceProvider serviceProvider) { this.ServiceProvider = serviceProvider; } @@ -19,9 +19,9 @@ namespace WixToolset.Core.ExtensibilityServices private IEnumerable ExtensionData { get; set; } - private Dictionary CustomDefinitionByName { get; } = new Dictionary(); + private Dictionary CustomDefinitionByName { get; } = new Dictionary(); - public void AddCustomTupleDefinition(IntermediateTupleDefinition definition) + public void AddCustomSymbolDefinition(IntermediateSymbolDefinition definition) { if (!this.CustomDefinitionByName.TryGetValue(definition.Name, out var existing) || definition.Revision > existing.Revision) { @@ -29,12 +29,12 @@ namespace WixToolset.Core.ExtensibilityServices } } - public bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) + public bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) { // First, look in the built-ins. - tupleDefinition = TupleDefinitions.ByName(name); + symbolDefinition = SymbolDefinitions.ByName(name); - if (tupleDefinition == null) + if (symbolDefinition == null) { if (this.ExtensionData == null) { @@ -44,20 +44,20 @@ namespace WixToolset.Core.ExtensibilityServices // Second, look in the extensions. foreach (var data in this.ExtensionData) { - if (data.TryGetTupleDefinitionByName(name, out tupleDefinition)) + if (data.TryGetSymbolDefinitionByName(name, out symbolDefinition)) { break; } } - // Finally, look in the custom tuple definitions provided during an intermediate load. - if (tupleDefinition == null) + // Finally, look in the custom symbol definitions provided during an intermediate load. + if (symbolDefinition == null) { - this.CustomDefinitionByName.TryGetValue(name, out tupleDefinition); + this.CustomDefinitionByName.TryGetValue(name, out symbolDefinition); } } - return tupleDefinition != null; + return symbolDefinition != null; } private void LoadExtensionData() diff --git a/src/WixToolset.Core/Librarian.cs b/src/WixToolset.Core/Librarian.cs index 0c519b88..6dc8611d 100644 --- a/src/WixToolset.Core/Librarian.cs +++ b/src/WixToolset.Core/Librarian.cs @@ -89,17 +89,17 @@ namespace WixToolset.Core var fileResolver = new FileResolver(context.BindPaths, context.Extensions); - foreach (var tuple in sections.SelectMany(s => s.Tuples)) + foreach (var symbol in sections.SelectMany(s => s.Symbols)) { - foreach (var field in tuple.Fields.Where(f => f?.Type == IntermediateFieldType.Path)) + foreach (var field in symbol.Fields.Where(f => f?.Type == IntermediateFieldType.Path)) { var pathField = field.AsPath(); if (pathField != null && !String.IsNullOrEmpty(pathField.Path)) { - var resolution = variableResolver.ResolveVariables(tuple.SourceLineNumbers, pathField.Path); + var resolution = variableResolver.ResolveVariables(symbol.SourceLineNumbers, pathField.Path); - var file = fileResolver.Resolve(tuple.SourceLineNumbers, tuple.Definition, resolution.Value); + var file = fileResolver.Resolve(symbol.SourceLineNumbers, symbol.Definition, resolution.Value); if (!String.IsNullOrEmpty(file)) { @@ -108,7 +108,7 @@ namespace WixToolset.Core } else { - this.Messaging.Write(ErrorMessages.FileNotFound(tuple.SourceLineNumbers, pathField.Path, tuple.Definition.Name)); + this.Messaging.Write(ErrorMessages.FileNotFound(symbol.SourceLineNumbers, pathField.Path, symbol.Definition.Name)); } } } diff --git a/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs b/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs index 31cbf0b8..1c2ca8eb 100644 --- a/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs +++ b/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs @@ -31,17 +31,17 @@ namespace WixToolset.Core.Link /// /// Gets the collection of loaded symbols. /// - public IDictionary TuplesByName { get; private set; } + public IDictionary SymbolsByName { get; private set; } /// /// Gets the collection of possibly conflicting symbols. /// - public IEnumerable PossibleConflicts { get; private set; } + public IEnumerable PossibleConflicts { get; private set; } public void Execute() { - var tuplesByName = new Dictionary(); - var possibleConflicts = new HashSet(); + var symbolsByName = new Dictionary(); + var possibleConflicts = new HashSet(); if (!Enum.TryParse(this.ExpectedOutputType.ToString(), out SectionType expectedEntrySectionType)) { @@ -66,44 +66,44 @@ namespace WixToolset.Core.Link } else { - this.Messaging.Write(ErrorMessages.MultipleEntrySections(this.EntrySection.Tuples.FirstOrDefault()?.SourceLineNumbers, this.EntrySection.Id, section.Id)); - this.Messaging.Write(ErrorMessages.MultipleEntrySections2(section.Tuples.FirstOrDefault()?.SourceLineNumbers)); + this.Messaging.Write(ErrorMessages.MultipleEntrySections(this.EntrySection.Symbols.FirstOrDefault()?.SourceLineNumbers, this.EntrySection.Id, section.Id)); + this.Messaging.Write(ErrorMessages.MultipleEntrySections2(section.Symbols.FirstOrDefault()?.SourceLineNumbers)); } } // Load all the symbols from the section's tables that create symbols. - foreach (var tuple in section.Tuples.Where(t => t.Id != null)) + foreach (var symbol in section.Symbols.Where(t => t.Id != null)) { - var symbol = new TupleWithSection(section, tuple); + var symbolWithSection = new SymbolWithSection(section, symbol); - if (!tuplesByName.TryGetValue(symbol.Name, out var existingSymbol)) + if (!symbolsByName.TryGetValue(symbolWithSection.Name, out var existingSymbol)) { - tuplesByName.Add(symbol.Name, symbol); + symbolsByName.Add(symbolWithSection.Name, symbolWithSection); } else // uh-oh, duplicate symbols. { // If the duplicate symbols are both private directories, there is a chance that they - // point to identical tuples. Identical directory tuples are redundant and will not cause + // point to identical symbols. Identical directory symbols are redundant and will not cause // conflicts. - if (AccessModifier.Private == existingSymbol.Access && AccessModifier.Private == symbol.Access && - TupleDefinitionType.Directory == existingSymbol.Tuple.Definition.Type && existingSymbol.Tuple.IsIdentical(symbol.Tuple)) + if (AccessModifier.Private == existingSymbol.Access && AccessModifier.Private == symbolWithSection.Access && + SymbolDefinitionType.Directory == existingSymbol.Symbol.Definition.Type && existingSymbol.Symbol.IsIdentical(symbolWithSection.Symbol)) { - // Ensure identical symbol's tuple is marked redundant to ensure (should the tuple be + // Ensure identical symbol's symbol is marked redundant to ensure (should the symbol be // referenced into the final output) it will not add duplicate primary keys during // the .IDT importing. //symbol.Row.Redundant = true; - TODO: remove this - existingSymbol.AddRedundant(symbol); + existingSymbol.AddRedundant(symbolWithSection); } else { - existingSymbol.AddPossibleConflict(symbol); + existingSymbol.AddPossibleConflict(symbolWithSection); possibleConflicts.Add(existingSymbol); } } } } - this.TuplesByName = tuplesByName; + this.SymbolsByName = symbolsByName; this.PossibleConflicts = possibleConflicts; } } diff --git a/src/WixToolset.Core/Link/IntermediateTupleExtensions.cs b/src/WixToolset.Core/Link/IntermediateTupleExtensions.cs index c4c12e81..db53f1ce 100644 --- a/src/WixToolset.Core/Link/IntermediateTupleExtensions.cs +++ b/src/WixToolset.Core/Link/IntermediateTupleExtensions.cs @@ -4,12 +4,12 @@ namespace WixToolset.Core.Link { using WixToolset.Data; - internal static class IntermediateTupleExtensions + internal static class IntermediateSymbolExtensions { - public static bool IsIdentical(this IntermediateTuple first, IntermediateTuple second) + public static bool IsIdentical(this IntermediateSymbol first, IntermediateSymbol second) { - var identical = (first.Definition.Type == second.Definition.Type && - first.Definition.Name == second.Definition.Name && + var identical = (first.Definition.Type == second.Definition.Type && + first.Definition.Name == second.Definition.Name && first.Definition.FieldDefinitions.Length == second.Definition.FieldDefinitions.Length); for (int i = 0; identical && i < first.Definition.FieldDefinitions.Length; ++i) diff --git a/src/WixToolset.Core/Link/ReportConflictingTuplesCommand.cs b/src/WixToolset.Core/Link/ReportConflictingTuplesCommand.cs index ff01f573..ace2e19d 100644 --- a/src/WixToolset.Core/Link/ReportConflictingTuplesCommand.cs +++ b/src/WixToolset.Core/Link/ReportConflictingTuplesCommand.cs @@ -7,9 +7,9 @@ namespace WixToolset.Core.Link using WixToolset.Data; using WixToolset.Extensibility.Services; - internal class ReportConflictingTuplesCommand + internal class ReportConflictingSymbolsCommand { - public ReportConflictingTuplesCommand(IMessaging messaging, IEnumerable possibleConflicts, IEnumerable resolvedSections) + public ReportConflictingSymbolsCommand(IMessaging messaging, IEnumerable possibleConflicts, IEnumerable resolvedSections) { this.Messaging = messaging; this.PossibleConflicts = possibleConflicts; @@ -18,18 +18,18 @@ namespace WixToolset.Core.Link private IMessaging Messaging { get; } - private IEnumerable PossibleConflicts { get; } + private IEnumerable PossibleConflicts { get; } private IEnumerable ResolvedSections { get; } public void Execute() { // Do a quick check if there are any possibly conflicting symbols that don't come from tables that allow - // overriding. Hopefully the tuples with possible conflicts list is usually very short list (empty should + // overriding. Hopefully the symbols with possible conflicts list is usually very short list (empty should // be the most common). If we find any matches, we'll do a more costly check to see if the possible conflicting - // tuples are in sections we actually referenced. From the resulting set, show an error for each duplicate - // (aka: conflicting) tuple. - var illegalDuplicates = this.PossibleConflicts.Where(s => s.Tuple.Definition.Type != TupleDefinitionType.WixAction && s.Tuple.Definition.Type != TupleDefinitionType.WixVariable).ToList(); + // symbols are in sections we actually referenced. From the resulting set, show an error for each duplicate + // (aka: conflicting) symbol. + var illegalDuplicates = this.PossibleConflicts.Where(s => s.Symbol.Definition.Type != SymbolDefinitionType.WixAction && s.Symbol.Definition.Type != SymbolDefinitionType.WixVariable).ToList(); if (0 < illegalDuplicates.Count) { var referencedSections = new HashSet(this.ResolvedSections); @@ -40,11 +40,11 @@ namespace WixToolset.Core.Link if (actuallyReferencedDuplicates.Any()) { - this.Messaging.Write(ErrorMessages.DuplicateSymbol(referencedDuplicate.Tuple.SourceLineNumbers, referencedDuplicate.Name)); + this.Messaging.Write(ErrorMessages.DuplicateSymbol(referencedDuplicate.Symbol.SourceLineNumbers, referencedDuplicate.Name)); foreach (var duplicate in actuallyReferencedDuplicates) { - this.Messaging.Write(ErrorMessages.DuplicateSymbol2(duplicate.Tuple.SourceLineNumbers)); + this.Messaging.Write(ErrorMessages.DuplicateSymbol2(duplicate.Symbol.SourceLineNumbers)); } } } diff --git a/src/WixToolset.Core/Link/ResolveReferencesCommand.cs b/src/WixToolset.Core/Link/ResolveReferencesCommand.cs index 4ffb5443..d2be0699 100644 --- a/src/WixToolset.Core/Link/ResolveReferencesCommand.cs +++ b/src/WixToolset.Core/Link/ResolveReferencesCommand.cs @@ -6,7 +6,7 @@ namespace WixToolset.Core.Link using System.Collections.Generic; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Services; /// @@ -15,19 +15,19 @@ namespace WixToolset.Core.Link internal class ResolveReferencesCommand { private readonly IntermediateSection entrySection; - private readonly IDictionary tuplesWithSections; - private HashSet referencedTuples; + private readonly IDictionary symbolsWithSections; + private HashSet referencedSymbols; private HashSet resolvedSections; - public ResolveReferencesCommand(IMessaging messaging, IntermediateSection entrySection, IDictionary tuplesWithSections) + public ResolveReferencesCommand(IMessaging messaging, IntermediateSection entrySection, IDictionary symbolsWithSections) { this.Messaging = messaging; this.entrySection = entrySection; - this.tuplesWithSections = tuplesWithSections; + this.symbolsWithSections = symbolsWithSections; this.BuildingMergeModule = (SectionType.Module == entrySection.Type); } - public IEnumerable ReferencedTupleWithSections => this.referencedTuples; + public IEnumerable ReferencedSymbolWithSections => this.referencedSymbols; public IEnumerable ResolvedSections => this.resolvedSections; @@ -41,7 +41,7 @@ namespace WixToolset.Core.Link public void Execute() { this.resolvedSections = new HashSet(); - this.referencedTuples = new HashSet(); + this.referencedSymbols = new HashSet(); this.RecursivelyResolveReferences(this.entrySection); } @@ -60,10 +60,10 @@ namespace WixToolset.Core.Link } // Process all of the references contained in this section using the collection of - // tuples provided. Then recursively call this method to process the - // located tuple's section. All in all this is a very simple depth-first + // symbols provided. Then recursively call this method to process the + // located symbol's section. All in all this is a very simple depth-first // search of the references per-section. - foreach (var wixSimpleReferenceRow in section.Tuples.OfType()) + foreach (var wixSimpleReferenceRow in section.Symbols.OfType()) { // If we're building a Merge Module, ignore all references to the Media table // because Merge Modules don't have Media tables. @@ -72,44 +72,44 @@ namespace WixToolset.Core.Link continue; } - if (!this.tuplesWithSections.TryGetValue(wixSimpleReferenceRow.SymbolicName, out var tupleWithSection)) + if (!this.symbolsWithSections.TryGetValue(wixSimpleReferenceRow.SymbolicName, out var symbolWithSection)) { this.Messaging.Write(ErrorMessages.UnresolvedReference(wixSimpleReferenceRow.SourceLineNumbers, wixSimpleReferenceRow.SymbolicName)); } - else // see if the tuple (and any of its duplicates) are appropriately accessible. + else // see if the symbol (and any of its duplicates) are appropriately accessible. { - var accessible = this.DetermineAccessibleTuples(section, tupleWithSection); + var accessible = this.DetermineAccessibleSymbols(section, symbolWithSection); if (!accessible.Any()) { - this.Messaging.Write(ErrorMessages.UnresolvedReference(wixSimpleReferenceRow.SourceLineNumbers, wixSimpleReferenceRow.SymbolicName, tupleWithSection.Access)); + this.Messaging.Write(ErrorMessages.UnresolvedReference(wixSimpleReferenceRow.SourceLineNumbers, wixSimpleReferenceRow.SymbolicName, symbolWithSection.Access)); } else if (1 == accessible.Count) { - var accessibleTuple = accessible[0]; - this.referencedTuples.Add(accessibleTuple); + var accessibleSymbol = accessible[0]; + this.referencedSymbols.Add(accessibleSymbol); - if (null != accessibleTuple.Section) + if (null != accessibleSymbol.Section) { - this.RecursivelyResolveReferences(accessibleTuple.Section); + this.RecursivelyResolveReferences(accessibleSymbol.Section); } } - else // display errors for the duplicate tuples. + else // display errors for the duplicate symbols. { - var accessibleTuple = accessible[0]; + var accessibleSymbol = accessible[0]; var referencingSourceLineNumber = wixSimpleReferenceRow.SourceLineNumbers?.ToString(); if (String.IsNullOrEmpty(referencingSourceLineNumber)) { - this.Messaging.Write(ErrorMessages.DuplicateSymbol(accessibleTuple.Tuple.SourceLineNumbers, accessibleTuple.Name)); + this.Messaging.Write(ErrorMessages.DuplicateSymbol(accessibleSymbol.Symbol.SourceLineNumbers, accessibleSymbol.Name)); } else { - this.Messaging.Write(ErrorMessages.DuplicateSymbol(accessibleTuple.Tuple.SourceLineNumbers, accessibleTuple.Name, referencingSourceLineNumber)); + this.Messaging.Write(ErrorMessages.DuplicateSymbol(accessibleSymbol.Symbol.SourceLineNumbers, accessibleSymbol.Name, referencingSourceLineNumber)); } foreach (var accessibleDuplicate in accessible.Skip(1)) { - this.Messaging.Write(ErrorMessages.DuplicateSymbol2(accessibleDuplicate.Tuple.SourceLineNumbers)); + this.Messaging.Write(ErrorMessages.DuplicateSymbol2(accessibleDuplicate.Symbol.SourceLineNumbers)); } } } @@ -117,67 +117,67 @@ namespace WixToolset.Core.Link } /// - /// Determine if the tuple and any of its duplicates are accessbile by referencing section. + /// Determine if the symbol and any of its duplicates are accessbile by referencing section. /// - /// Section referencing the tuple. - /// Tuple being referenced. - /// List of tuples accessible by referencing section. - private List DetermineAccessibleTuples(IntermediateSection referencingSection, TupleWithSection tupleWithSection) + /// Section referencing the symbol. + /// Symbol being referenced. + /// List of symbols accessible by referencing section. + private List DetermineAccessibleSymbols(IntermediateSection referencingSection, SymbolWithSection symbolWithSection) { - var accessibleTuples = new List(); + var accessibleSymbols = new List(); - if (this.AccessibleTuple(referencingSection, tupleWithSection)) + if (this.AccessibleSymbol(referencingSection, symbolWithSection)) { - accessibleTuples.Add(tupleWithSection); + accessibleSymbols.Add(symbolWithSection); } - foreach (var dupe in tupleWithSection.PossiblyConflicts) + foreach (var dupe in symbolWithSection.PossiblyConflicts) { - // don't count overridable WixActionTuples - var tupleAction = tupleWithSection.Tuple as WixActionTuple; - var dupeAction = dupe.Tuple as WixActionTuple; - if (tupleAction?.Overridable != dupeAction?.Overridable) + // don't count overridable WixActionSymbols + var symbolAction = symbolWithSection.Symbol as WixActionSymbol; + var dupeAction = dupe.Symbol as WixActionSymbol; + if (symbolAction?.Overridable != dupeAction?.Overridable) { continue; } - if (this.AccessibleTuple(referencingSection, dupe)) + if (this.AccessibleSymbol(referencingSection, dupe)) { - accessibleTuples.Add(dupe); + accessibleSymbols.Add(dupe); } } - foreach (var dupe in tupleWithSection.Redundants) + foreach (var dupe in symbolWithSection.Redundants) { - if (this.AccessibleTuple(referencingSection, dupe)) + if (this.AccessibleSymbol(referencingSection, dupe)) { - accessibleTuples.Add(dupe); + accessibleSymbols.Add(dupe); } } - return accessibleTuples; + return accessibleSymbols; } /// - /// Determine if a single tuple is accessible by the referencing section. + /// Determine if a single symbol is accessible by the referencing section. /// - /// Section referencing the tuple. - /// Tuple being referenced. - /// True if tuple is accessible. - private bool AccessibleTuple(IntermediateSection referencingSection, TupleWithSection tupleWithSection) + /// Section referencing the symbol. + /// Symbol being referenced. + /// True if symbol is accessible. + private bool AccessibleSymbol(IntermediateSection referencingSection, SymbolWithSection symbolWithSection) { - switch (tupleWithSection.Access) + switch (symbolWithSection.Access) { case AccessModifier.Public: return true; case AccessModifier.Internal: - return tupleWithSection.Section.CompilationId.Equals(referencingSection.CompilationId) || (null != tupleWithSection.Section.LibraryId && tupleWithSection.Section.LibraryId.Equals(referencingSection.LibraryId)); + return symbolWithSection.Section.CompilationId.Equals(referencingSection.CompilationId) || (null != symbolWithSection.Section.LibraryId && symbolWithSection.Section.LibraryId.Equals(referencingSection.LibraryId)); case AccessModifier.Protected: - return tupleWithSection.Section.CompilationId.Equals(referencingSection.CompilationId); + return symbolWithSection.Section.CompilationId.Equals(referencingSection.CompilationId); case AccessModifier.Private: - return referencingSection == tupleWithSection.Section; + return referencingSection == symbolWithSection.Section; default: - throw new ArgumentOutOfRangeException(nameof(tupleWithSection.Access)); + throw new ArgumentOutOfRangeException(nameof(symbolWithSection.Access)); } } } diff --git a/src/WixToolset.Core/Link/WixComplexReferenceTupleExtensions.cs b/src/WixToolset.Core/Link/WixComplexReferenceTupleExtensions.cs index 80cafa50..1702d3ca 100644 --- a/src/WixToolset.Core/Link/WixComplexReferenceTupleExtensions.cs +++ b/src/WixToolset.Core/Link/WixComplexReferenceTupleExtensions.cs @@ -3,17 +3,17 @@ namespace WixToolset.Core.Link { using System; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; - internal static class WixComplexReferenceTupleExtensions + internal static class WixComplexReferenceSymbolExtensions { /// /// Creates a shallow copy of the ComplexReference. /// /// A shallow copy of the ComplexReference. - public static WixComplexReferenceTuple Clone(this WixComplexReferenceTuple source) + public static WixComplexReferenceSymbol Clone(this WixComplexReferenceSymbol source) { - var clone = new WixComplexReferenceTuple(source.SourceLineNumbers, source.Id); + var clone = new WixComplexReferenceSymbol(source.SourceLineNumbers, source.Id); clone.ParentType = source.ParentType; clone.Parent = source.Parent; clone.ParentLanguage = source.ParentLanguage; @@ -29,23 +29,23 @@ namespace WixToolset.Core.Link /// /// Complex reference to compare to. /// Zero if the objects are equivalent, negative number if the provided object is less, positive if greater. - public static int CompareToWithoutConsideringPrimary(this WixComplexReferenceTuple tuple, WixComplexReferenceTuple other) + public static int CompareToWithoutConsideringPrimary(this WixComplexReferenceSymbol symbol, WixComplexReferenceSymbol other) { - var comparison = tuple.ChildType - other.ChildType; + var comparison = symbol.ChildType - other.ChildType; if (0 == comparison) { - comparison = String.Compare(tuple.Child, other.Child, StringComparison.Ordinal); + comparison = String.Compare(symbol.Child, other.Child, StringComparison.Ordinal); if (0 == comparison) { - comparison = tuple.ParentType - other.ParentType; + comparison = symbol.ParentType - other.ParentType; if (0 == comparison) { - string thisParentLanguage = null == tuple.ParentLanguage ? String.Empty : tuple.ParentLanguage; + string thisParentLanguage = null == symbol.ParentLanguage ? String.Empty : symbol.ParentLanguage; string otherParentLanguage = null == other.ParentLanguage ? String.Empty : other.ParentLanguage; comparison = String.Compare(thisParentLanguage, otherParentLanguage, StringComparison.Ordinal); if (0 == comparison) { - comparison = String.Compare(tuple.Parent, other.Parent, StringComparison.Ordinal); + comparison = String.Compare(symbol.Parent, other.Parent, StringComparison.Ordinal); } } } @@ -58,15 +58,15 @@ namespace WixToolset.Core.Link /// Changes all of the parent references to point to the passed in parent reference. /// /// New parent complex reference. - public static void Reparent(this WixComplexReferenceTuple tuple, WixComplexReferenceTuple parent) + public static void Reparent(this WixComplexReferenceSymbol symbol, WixComplexReferenceSymbol parent) { - tuple.Parent = parent.Parent; - tuple.ParentLanguage = parent.ParentLanguage; - tuple.ParentType = parent.ParentType; + symbol.Parent = parent.Parent; + symbol.ParentLanguage = parent.ParentLanguage; + symbol.ParentType = parent.ParentType; - if (!tuple.IsPrimary) + if (!symbol.IsPrimary) { - tuple.IsPrimary = parent.IsPrimary; + symbol.IsPrimary = parent.IsPrimary; } } } diff --git a/src/WixToolset.Core/Link/WixGroupingOrdering.cs b/src/WixToolset.Core/Link/WixGroupingOrdering.cs index 7e0030ca..a7013062 100644 --- a/src/WixToolset.Core/Link/WixGroupingOrdering.cs +++ b/src/WixToolset.Core/Link/WixGroupingOrdering.cs @@ -10,7 +10,7 @@ namespace WixToolset.Core.Link using System.Linq; using System.Text; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Services; using WixToolset.Data.Burn; @@ -155,7 +155,7 @@ namespace WixToolset.Core.Link foreach (int rowIndex in sortedIndexes) { //wixGroupTable.Rows.RemoveAt(rowIndex); - this.EntrySection.Tuples.RemoveAt(rowIndex); + this.EntrySection.Symbols.RemoveAt(rowIndex); } } @@ -173,7 +173,7 @@ namespace WixToolset.Core.Link // groups to read from that table instead. foreach (var item in orderedItems) { - this.EntrySection.AddTuple(new WixGroupTuple(item.Row.SourceLineNumbers) + this.EntrySection.AddSymbol(new WixGroupSymbol(item.Row.SourceLineNumbers) { ParentId = parentId, ParentType = (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), parentType), @@ -238,9 +238,9 @@ namespace WixToolset.Core.Link //} // Collect all of the groups - for (int rowIndex = 0; rowIndex < this.EntrySection.Tuples.Count; ++rowIndex) + for (int rowIndex = 0; rowIndex < this.EntrySection.Symbols.Count; ++rowIndex) { - if (this.EntrySection.Tuples[rowIndex] is WixGroupTuple row) + if (this.EntrySection.Symbols[rowIndex] is WixGroupSymbol row) { var rowParentName = row.ParentId; var rowParentType = row.ParentType.ToString(); @@ -357,7 +357,7 @@ namespace WixToolset.Core.Link // return; //} - foreach (var row in this.EntrySection.Tuples.OfType()) + foreach (var row in this.EntrySection.Symbols.OfType()) { var rowItemType = row.ItemType.ToString(); var rowItemName = row.ItemIdRef; @@ -513,7 +513,7 @@ namespace WixToolset.Core.Link private readonly ItemCollection beforeItems; // for checking for circular references private bool flattenedAfterItems; - public Item(IntermediateTuple row, string type, string id) + public Item(IntermediateSymbol row, string type, string id) { this.Row = row; this.Type = type; @@ -526,7 +526,7 @@ namespace WixToolset.Core.Link this.flattenedAfterItems = false; } - public IntermediateTuple Row { get; private set; } + public IntermediateSymbol Row { get; private set; } public string Type { get; private set; } public string Id { get; private set; } public string Key { get; private set; } diff --git a/src/WixToolset.Core/LinkContext.cs b/src/WixToolset.Core/LinkContext.cs index 65b1179e..2f5ecf59 100644 --- a/src/WixToolset.Core/LinkContext.cs +++ b/src/WixToolset.Core/LinkContext.cs @@ -26,7 +26,7 @@ namespace WixToolset.Core public IEnumerable Intermediates { get; set; } - public ITupleDefinitionCreator TupleDefinitionCreator { get; set; } + public ISymbolDefinitionCreator SymbolDefinitionCreator { get; set; } public CancellationToken CancellationToken { get; set; } } diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs index 862681bb..cdefa5c7 100644 --- a/src/WixToolset.Core/Linker.cs +++ b/src/WixToolset.Core/Linker.cs @@ -10,7 +10,7 @@ namespace WixToolset.Core using System.Linq; using WixToolset.Core.Link; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; @@ -60,9 +60,9 @@ namespace WixToolset.Core { this.Context = context; - if (this.Context.TupleDefinitionCreator == null) + if (this.Context.SymbolDefinitionCreator == null) { - this.Context.TupleDefinitionCreator = this.ServiceProvider.GetService(); + this.Context.SymbolDefinitionCreator = this.ServiceProvider.GetService(); } foreach (var extension in this.Context.Extensions) @@ -85,7 +85,7 @@ namespace WixToolset.Core // Add sections from the extensions with data. foreach (var data in this.Context.ExtensionData) { - var library = data.GetLibrary(this.Context.TupleDefinitionCreator); + var library = data.GetLibrary(this.Context.SymbolDefinitionCreator); if (library != null) { @@ -107,7 +107,7 @@ namespace WixToolset.Core var multipleFeatureComponents = new Hashtable(); - var wixVariables = new Dictionary(); + var wixVariables = new Dictionary(); #if MOVE_TO_BACKEND // verify that modularization types match for foreign key relationships @@ -149,12 +149,12 @@ namespace WixToolset.Core throw new WixException(ErrorMessages.MissingEntrySection(this.Context.ExpectedOutputType.ToString())); } - // Add the missing standard action tuples. - this.LoadStandardActions(find.EntrySection, find.TuplesByName); + // Add the missing standard action symbols. + this.LoadStandardActions(find.EntrySection, find.SymbolsByName); - // Resolve the tuple references to find the set of sections we care about for linking. + // Resolve the symbol references to find the set of sections we care about for linking. // Of course, we start with the entry section (that's how it got its name after all). - var resolve = new ResolveReferencesCommand(this.Messaging, find.EntrySection, find.TuplesByName); + var resolve = new ResolveReferencesCommand(this.Messaging, find.EntrySection, find.SymbolsByName); resolve.Execute(); @@ -190,16 +190,16 @@ namespace WixToolset.Core } // Display an error message for Components that were not referenced by a Feature. - foreach (var tupleWithSection in resolve.ReferencedTupleWithSections.Where(s => s.Tuple.Definition.Type == TupleDefinitionType.Component)) + foreach (var symbolWithSection in resolve.ReferencedSymbolWithSections.Where(s => s.Symbol.Definition.Type == SymbolDefinitionType.Component)) { - if (!referencedComponents.Contains(tupleWithSection.Name)) + if (!referencedComponents.Contains(symbolWithSection.Name)) { - this.Messaging.Write(ErrorMessages.OrphanedComponent(tupleWithSection.Tuple.SourceLineNumbers, tupleWithSection.Tuple.Id.Id)); + this.Messaging.Write(ErrorMessages.OrphanedComponent(symbolWithSection.Symbol.SourceLineNumbers, symbolWithSection.Symbol.Id.Id)); } } // Report duplicates that would ultimately end up being primary key collisions. - var reportDupes = new ReportConflictingTuplesCommand(this.Messaging, find.PossibleConflicts, resolve.ResolvedSections); + var reportDupes = new ReportConflictingSymbolsCommand(this.Messaging, find.PossibleConflicts, resolve.ResolvedSections); reportDupes.Execute(); if (this.Messaging.EncounteredError) @@ -208,7 +208,7 @@ namespace WixToolset.Core } // resolve the feature to feature connects - this.ResolveFeatureToFeatureConnects(featuresToFeatures, find.TuplesByName); + this.ResolveFeatureToFeatureConnects(featuresToFeatures, find.SymbolsByName); // Create the section to hold the linked content. var resolvedSection = new IntermediateSection(find.EntrySection.Id, find.EntrySection.Type, find.EntrySection.Codepage); @@ -225,17 +225,17 @@ namespace WixToolset.Core sectionId = "wix.section." + sectionCount.ToString(CultureInfo.InvariantCulture); } - foreach (var tuple in section.Tuples) + foreach (var symbol in section.Symbols) { - var copyTuple = true; // by default, copy tuples. + var copySymbol = true; // by default, copy symbols. // handle special tables - switch (tuple.Definition.Type) + switch (symbol.Definition.Type) { - case TupleDefinitionType.Class: + case SymbolDefinitionType.Class: if (SectionType.Product == resolvedSection.Type) { - this.ResolveFeatures(tuple, (int)ClassTupleFields.ComponentRef, (int)ClassTupleFields.FeatureRef, componentsToFeatures, multipleFeatureComponents); + this.ResolveFeatures(symbol, (int)ClassSymbolFields.ComponentRef, (int)ClassSymbolFields.FeatureRef, componentsToFeatures, multipleFeatureComponents); } break; @@ -287,48 +287,48 @@ namespace WixToolset.Core } break; #endif - case TupleDefinitionType.Extension: + case SymbolDefinitionType.Extension: if (SectionType.Product == resolvedSection.Type) { - this.ResolveFeatures(tuple, (int)ExtensionTupleFields.ComponentRef, (int)ExtensionTupleFields.FeatureRef, componentsToFeatures, multipleFeatureComponents); + this.ResolveFeatures(symbol, (int)ExtensionSymbolFields.ComponentRef, (int)ExtensionSymbolFields.FeatureRef, componentsToFeatures, multipleFeatureComponents); } break; #if MOVE_TO_BACKEND - case TupleDefinitionType.ModuleSubstitution: + case SymbolDefinitionType.ModuleSubstitution: containsModuleSubstitution = true; break; - case TupleDefinitionType.ModuleConfiguration: + case SymbolDefinitionType.ModuleConfiguration: containsModuleConfiguration = true; break; #endif - case TupleDefinitionType.Assembly: + case SymbolDefinitionType.Assembly: if (SectionType.Product == resolvedSection.Type) { - this.ResolveFeatures(tuple, (int)AssemblyTupleFields.ComponentRef, (int)AssemblyTupleFields.FeatureRef, componentsToFeatures, multipleFeatureComponents); + this.ResolveFeatures(symbol, (int)AssemblySymbolFields.ComponentRef, (int)AssemblySymbolFields.FeatureRef, componentsToFeatures, multipleFeatureComponents); } break; - case TupleDefinitionType.PublishComponent: + case SymbolDefinitionType.PublishComponent: if (SectionType.Product == resolvedSection.Type) { - this.ResolveFeatures(tuple, (int)PublishComponentTupleFields.ComponentRef, (int)PublishComponentTupleFields.FeatureRef, componentsToFeatures, multipleFeatureComponents); + this.ResolveFeatures(symbol, (int)PublishComponentSymbolFields.ComponentRef, (int)PublishComponentSymbolFields.FeatureRef, componentsToFeatures, multipleFeatureComponents); } break; - case TupleDefinitionType.Shortcut: + case SymbolDefinitionType.Shortcut: if (SectionType.Product == resolvedSection.Type) { - this.ResolveFeatures(tuple, (int)ShortcutTupleFields.ComponentRef, (int)ShortcutTupleFields.Target, componentsToFeatures, multipleFeatureComponents); + this.ResolveFeatures(symbol, (int)ShortcutSymbolFields.ComponentRef, (int)ShortcutSymbolFields.Target, componentsToFeatures, multipleFeatureComponents); } break; - case TupleDefinitionType.TypeLib: + case SymbolDefinitionType.TypeLib: if (SectionType.Product == resolvedSection.Type) { - this.ResolveFeatures(tuple, (int)TypeLibTupleFields.ComponentRef, (int)TypeLibTupleFields.FeatureRef, componentsToFeatures, multipleFeatureComponents); + this.ResolveFeatures(symbol, (int)TypeLibSymbolFields.ComponentRef, (int)TypeLibSymbolFields.FeatureRef, componentsToFeatures, multipleFeatureComponents); } break; @@ -352,51 +352,51 @@ namespace WixToolset.Core break; #endif - case TupleDefinitionType.WixMerge: + case SymbolDefinitionType.WixMerge: if (SectionType.Product == resolvedSection.Type) { - this.ResolveFeatures(tuple, -1, (int)WixMergeTupleFields.FeatureRef, modulesToFeatures, null); + this.ResolveFeatures(symbol, -1, (int)WixMergeSymbolFields.FeatureRef, modulesToFeatures, null); } break; - case TupleDefinitionType.WixComplexReference: - copyTuple = false; + case SymbolDefinitionType.WixComplexReference: + copySymbol = false; break; - case TupleDefinitionType.WixSimpleReference: - copyTuple = false; + case SymbolDefinitionType.WixSimpleReference: + copySymbol = false; break; - case TupleDefinitionType.WixVariable: + case SymbolDefinitionType.WixVariable: // check for colliding values and collect the wix variable rows { - var wixVariableTuple = (WixVariableTuple)tuple; - var id = wixVariableTuple.Id.Id; + var wixVariableSymbol = (WixVariableSymbol)symbol; + var id = wixVariableSymbol.Id.Id; - if (wixVariables.TryGetValue(id, out var collidingTuple)) + if (wixVariables.TryGetValue(id, out var collidingSymbol)) { - if (collidingTuple.Overridable && !wixVariableTuple.Overridable) + if (collidingSymbol.Overridable && !wixVariableSymbol.Overridable) { - wixVariables[id] = wixVariableTuple; + wixVariables[id] = wixVariableSymbol; } - else if (!wixVariableTuple.Overridable || (collidingTuple.Overridable && wixVariableTuple.Overridable)) + else if (!wixVariableSymbol.Overridable || (collidingSymbol.Overridable && wixVariableSymbol.Overridable)) { - this.Messaging.Write(ErrorMessages.WixVariableCollision(wixVariableTuple.SourceLineNumbers, id)); + this.Messaging.Write(ErrorMessages.WixVariableCollision(wixVariableSymbol.SourceLineNumbers, id)); } } else { - wixVariables.Add(id, wixVariableTuple); + wixVariables.Add(id, wixVariableSymbol); } } - copyTuple = false; + copySymbol = false; break; } - if (copyTuple) + if (copySymbol) { - resolvedSection.AddTuple(tuple); + resolvedSection.AddSymbol(symbol); } } } @@ -406,7 +406,7 @@ namespace WixToolset.Core { foreach (var feature in connectToFeature.ConnectFeatures) { - resolvedSection.AddTuple(new WixFeatureModulesTuple + resolvedSection.AddSymbol(new WixFeatureModulesSymbol { FeatureRef = feature, WixMergeRef = connectToFeature.ChildId @@ -462,16 +462,16 @@ namespace WixToolset.Core { //var componentSectionIds = new Dictionary(); - //foreach (var componentTuple in entrySection.Tuples.OfType()) + //foreach (var componentSymbol in entrySection.Symbols.OfType()) //{ - // componentSectionIds.Add(componentTuple.Id.Id, componentTuple.SectionId); + // componentSectionIds.Add(componentSymbol.Id.Id, componentSymbol.SectionId); //} - //foreach (var featureComponentTuple in entrySection.Tuples.OfType()) + //foreach (var featureComponentSymbol in entrySection.Symbols.OfType()) //{ - // if (componentSectionIds.TryGetValue(featureComponentTuple.Component_, out var componentSectionId)) + // if (componentSectionIds.TryGetValue(featureComponentSymbol.Component_, out var componentSectionId)) // { - // featureComponentTuple.SectionId = componentSectionId; + // featureComponentSymbol.SectionId = componentSectionId; // } //} } @@ -544,9 +544,9 @@ namespace WixToolset.Core #endif // copy the wix variable rows to the output after all overriding has been accounted for. - foreach (var tuple in wixVariables.Values) + foreach (var symbol in wixVariables.Values) { - resolvedSection.AddTuple(tuple); + resolvedSection.AddSymbol(symbol); } // Bundles have groups of data that must be flattened in a way different from other types. @@ -734,17 +734,17 @@ namespace WixToolset.Core /// /// Load the standard action symbols. /// - /// Collection of symbols. - private void LoadStandardActions(IntermediateSection section, IDictionary tuplesByName) + /// Collection of symbols. + private void LoadStandardActions(IntermediateSection section, IDictionary symbolsByName) { - foreach (var actionTuple in WindowsInstallerStandard.StandardActions()) + foreach (var actionSymbol in WindowsInstallerStandard.StandardActions()) { - var tupleWithSection = new TupleWithSection(section, actionTuple); + var symbolWithSection = new SymbolWithSection(section, actionSymbol); - // If the action's tuple has not already been defined (i.e. overriden by the user), add it now. - if (!tuplesByName.ContainsKey(tupleWithSection.Name)) + // If the action's symbol has not already been defined (i.e. overriden by the user), add it now. + if (!symbolsByName.ContainsKey(symbolWithSection.Name)) { - tuplesByName.Add(tupleWithSection.Name, tupleWithSection); + symbolsByName.Add(symbolWithSection.Name, symbolWithSection); } } } @@ -752,7 +752,7 @@ namespace WixToolset.Core /// /// Process the complex references. /// - /// Active section to add tuples to. + /// Active section to add symbols to. /// Sections that are referenced during the link process. /// Collection of all components referenced by complex reference. /// Component to feature complex references. @@ -764,8 +764,8 @@ namespace WixToolset.Core foreach (var section in sections) { - // Need ToList since we might want to add tuples while processing. - foreach (var wixComplexReferenceRow in section.Tuples.OfType().ToList()) + // Need ToList since we might want to add symbols while processing. + foreach (var wixComplexReferenceRow in section.Symbols.OfType().ToList()) { ConnectToFeature connection; switch (wixComplexReferenceRow.ParentType) @@ -799,7 +799,7 @@ namespace WixToolset.Core } // add a row to the FeatureComponents table - section.AddTuple(new FeatureComponentsTuple + section.AddSymbol(new FeatureComponentsSymbol { FeatureRef = wixComplexReferenceRow.Parent, ComponentRef = wixComplexReferenceRow.Child, @@ -867,7 +867,7 @@ namespace WixToolset.Core componentsToModules.Add(wixComplexReferenceRow.Child, wixComplexReferenceRow); // should always be new // add a row to the ModuleComponents table - section.AddTuple(new ModuleComponentsTuple + section.AddSymbol(new ModuleComponentsSymbol { Component = wixComplexReferenceRow.Child, ModuleID = wixComplexReferenceRow.Parent, @@ -931,7 +931,7 @@ namespace WixToolset.Core /// Sections that are referenced during the link process. private void FlattenSectionsComplexReferences(IEnumerable sections) { - var parentGroups = new Dictionary>(); + var parentGroups = new Dictionary>(); var parentGroupsSections = new Dictionary(); var parentGroupsNeedingProcessing = new Dictionary(); @@ -945,12 +945,12 @@ namespace WixToolset.Core foreach (var section in sections) { // Count down because we'll sometimes remove items from the list. - for (var i = section.Tuples.Count - 1; i >= 0; --i) + for (var i = section.Symbols.Count - 1; i >= 0; --i) { // Only process the "grouping parents" such as FeatureGroup, ComponentGroup, Feature, // and Module. Non-grouping complex references are simple and // resolved during normal complex reference resolutions. - if (section.Tuples[i] is WixComplexReferenceTuple wixComplexReferenceRow && + if (section.Symbols[i] is WixComplexReferenceSymbol wixComplexReferenceRow && (ComplexReferenceParentType.FeatureGroup == wixComplexReferenceRow.ParentType || ComplexReferenceParentType.ComponentGroup == wixComplexReferenceRow.ParentType || ComplexReferenceParentType.Feature == wixComplexReferenceRow.ParentType || @@ -965,12 +965,12 @@ namespace WixToolset.Core // Step 2. if (!parentGroups.TryGetValue(parentTypeAndId, out var childrenComplexRefs)) { - childrenComplexRefs = new List(); + childrenComplexRefs = new List(); parentGroups.Add(parentTypeAndId, childrenComplexRefs); } childrenComplexRefs.Add(wixComplexReferenceRow); - section.Tuples.RemoveAt(i); + section.Symbols.RemoveAt(i); // Remember the mapping from set of complex references with a common // parent to their section. We'll need this to add them back to the @@ -1034,7 +1034,7 @@ namespace WixToolset.Core (ComplexReferenceParentType.ComponentGroup != wixComplexReferenceRow.ParentType) && (ComplexReferenceParentType.PatchFamilyGroup != wixComplexReferenceRow.ParentType)) { - section.AddTuple(wixComplexReferenceRow); + section.AddSymbol(wixComplexReferenceRow); } } } @@ -1059,12 +1059,12 @@ namespace WixToolset.Core /// Stack of groups processed thus far. Used to detect loops. /// Hash table of complex references grouped by parent id. /// Hash table of parent groups that still have nested groups that need to be flattened. - private void FlattenGroup(string parentTypeAndId, Stack loopDetector, Dictionary> parentGroups, Dictionary parentGroupsNeedingProcessing) + private void FlattenGroup(string parentTypeAndId, Stack loopDetector, Dictionary> parentGroups, Dictionary parentGroupsNeedingProcessing) { Debug.Assert(parentGroupsNeedingProcessing.ContainsKey(parentTypeAndId)); loopDetector.Push(parentTypeAndId); // push this complex reference parent identfier into the stack for loop verifying - var allNewChildComplexReferences = new List(); + var allNewChildComplexReferences = new List(); var referencesToParent = parentGroups[parentTypeAndId]; foreach (var wixComplexReferenceRow in referencesToParent) @@ -1158,7 +1158,7 @@ namespace WixToolset.Core } } - int ComplexReferenceComparision(WixComplexReferenceTuple x, WixComplexReferenceTuple y) + int ComplexReferenceComparision(WixComplexReferenceSymbol x, WixComplexReferenceSymbol y) { var comparison = x.ChildType - y.ChildType; if (0 == comparison) @@ -1242,11 +1242,11 @@ namespace WixToolset.Core /// /// Feature to feature complex references. /// All symbols loaded from the sections. - private void ResolveFeatureToFeatureConnects(ConnectToFeatureCollection featuresToFeatures, IDictionary allSymbols) + private void ResolveFeatureToFeatureConnects(ConnectToFeatureCollection featuresToFeatures, IDictionary allSymbols) { foreach (ConnectToFeature connection in featuresToFeatures) { - var wixSimpleReferenceRow = new WixSimpleReferenceTuple + var wixSimpleReferenceRow = new WixSimpleReferenceSymbol { Table = "Feature", PrimaryKeys = connection.ChildId @@ -1254,8 +1254,8 @@ namespace WixToolset.Core if (allSymbols.TryGetValue(wixSimpleReferenceRow.SymbolicName, out var symbol)) { - var featureTuple = (FeatureTuple)symbol.Tuple; - featureTuple.ParentFeatureRef = connection.PrimaryFeature; + var featureSymbol = (FeatureSymbol)symbol.Symbol; + featureSymbol.ParentFeatureRef = connection.PrimaryFeature; } } } @@ -1308,15 +1308,15 @@ namespace WixToolset.Core /// /// Resolve features for columns that have null guid placeholders. /// - /// Tuple to resolve. + /// Symbol to resolve. /// Number of the column containing the connection identifier. /// Number of the column containing the feature. /// Connect to feature complex references. /// Hashtable of known components under multiple features. - private void ResolveFeatures(IntermediateTuple tuple, int connectionColumn, int featureColumn, ConnectToFeatureCollection connectToFeatures, Hashtable multipleFeatureComponents) + private void ResolveFeatures(IntermediateSymbol symbol, int connectionColumn, int featureColumn, ConnectToFeatureCollection connectToFeatures, Hashtable multipleFeatureComponents) { - var connectionId = connectionColumn < 0 ? tuple.Id.Id : tuple.AsString(connectionColumn); - var featureId = tuple.AsString(featureColumn); + var connectionId = connectionColumn < 0 ? symbol.Id.Id : symbol.AsString(connectionColumn); + var featureId = symbol.AsString(featureColumn); if (EmptyGuid == featureId) { @@ -1327,11 +1327,11 @@ namespace WixToolset.Core // display an error for the component or merge module as appropriate if (null != multipleFeatureComponents) { - this.Messaging.Write(ErrorMessages.ComponentExpectedFeature(tuple.SourceLineNumbers, connectionId, tuple.Definition.Name, tuple.Id.Id)); + this.Messaging.Write(ErrorMessages.ComponentExpectedFeature(symbol.SourceLineNumbers, connectionId, symbol.Definition.Name, symbol.Id.Id)); } else { - this.Messaging.Write(ErrorMessages.MergeModuleExpectedFeature(tuple.SourceLineNumbers, connectionId)); + this.Messaging.Write(ErrorMessages.MergeModuleExpectedFeature(symbol.SourceLineNumbers, connectionId)); } } else @@ -1359,7 +1359,7 @@ namespace WixToolset.Core } // set the feature - tuple.Set(featureColumn, connection.PrimaryFeature); + symbol.Set(featureColumn, connection.PrimaryFeature); } } } diff --git a/src/WixToolset.Core/Resolver.cs b/src/WixToolset.Core/Resolver.cs index 1342444f..4f12ae76 100644 --- a/src/WixToolset.Core/Resolver.cs +++ b/src/WixToolset.Core/Resolver.cs @@ -7,7 +7,7 @@ namespace WixToolset.Core using System.Linq; using WixToolset.Core.Bind; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; @@ -132,72 +132,72 @@ namespace WixToolset.Core { foreach (var section in context.IntermediateRepresentation.Sections) { - foreach (var tuple in section.Tuples.OfType()) + foreach (var symbol in section.Symbols.OfType()) { - if (this.VariableResolver.TryGetLocalizedControl(tuple.Id.Id, null, out var localizedControl)) + if (this.VariableResolver.TryGetLocalizedControl(symbol.Id.Id, null, out var localizedControl)) { if (CompilerConstants.IntegerNotSet != localizedControl.X) { - tuple.HCentering = localizedControl.X; + symbol.HCentering = localizedControl.X; } if (CompilerConstants.IntegerNotSet != localizedControl.Y) { - tuple.VCentering = localizedControl.Y; + symbol.VCentering = localizedControl.Y; } if (CompilerConstants.IntegerNotSet != localizedControl.Width) { - tuple.Width = localizedControl.Width; + symbol.Width = localizedControl.Width; } if (CompilerConstants.IntegerNotSet != localizedControl.Height) { - tuple.Height = localizedControl.Height; + symbol.Height = localizedControl.Height; } - tuple.RightAligned |= localizedControl.RightAligned; - tuple.RightToLeft |= localizedControl.RightToLeft; - tuple.LeftScroll |= localizedControl.LeftScroll; + symbol.RightAligned |= localizedControl.RightAligned; + symbol.RightToLeft |= localizedControl.RightToLeft; + symbol.LeftScroll |= localizedControl.LeftScroll; if (!String.IsNullOrEmpty(localizedControl.Text)) { - tuple.Title = localizedControl.Text; + symbol.Title = localizedControl.Text; } } } - foreach (var tuple in section.Tuples.OfType()) + foreach (var symbol in section.Symbols.OfType()) { - if (this.VariableResolver.TryGetLocalizedControl(tuple.DialogRef, tuple.Control, out var localizedControl)) + if (this.VariableResolver.TryGetLocalizedControl(symbol.DialogRef, symbol.Control, out var localizedControl)) { if (CompilerConstants.IntegerNotSet != localizedControl.X) { - tuple.X = localizedControl.X; + symbol.X = localizedControl.X; } if (CompilerConstants.IntegerNotSet != localizedControl.Y) { - tuple.Y = localizedControl.Y; + symbol.Y = localizedControl.Y; } if (CompilerConstants.IntegerNotSet != localizedControl.Width) { - tuple.Width = localizedControl.Width; + symbol.Width = localizedControl.Width; } if (CompilerConstants.IntegerNotSet != localizedControl.Height) { - tuple.Height = localizedControl.Height; + symbol.Height = localizedControl.Height; } - tuple.RightAligned |= localizedControl.RightAligned; - tuple.RightToLeft |= localizedControl.RightToLeft; - tuple.LeftScroll |= localizedControl.LeftScroll; + symbol.RightAligned |= localizedControl.RightAligned; + symbol.RightToLeft |= localizedControl.RightToLeft; + symbol.LeftScroll |= localizedControl.LeftScroll; if (!String.IsNullOrEmpty(localizedControl.Text)) { - tuple.Text = localizedControl.Text; + symbol.Text = localizedControl.Text; } } } @@ -215,10 +215,10 @@ namespace WixToolset.Core } // Gather all the wix variables. - var wixVariableTuples = context.IntermediateRepresentation.Sections.SelectMany(s => s.Tuples).OfType(); - foreach (var tuple in wixVariableTuples) + var wixVariableSymbols = context.IntermediateRepresentation.Sections.SelectMany(s => s.Symbols).OfType(); + foreach (var symbol in wixVariableSymbols) { - this.VariableResolver.AddVariable(tuple.SourceLineNumbers, tuple.Id.Id, tuple.Value, tuple.Overridable); + this.VariableResolver.AddVariable(symbol.SourceLineNumbers, symbol.Id.Id, symbol.Value, symbol.Overridable); } return codepage; @@ -234,7 +234,7 @@ namespace WixToolset.Core AddFilteredLocalizations(result, filter, localizations); // Filter localizations provided by extensions with data. - var creator = context.ServiceProvider.GetService(); + var creator = context.ServiceProvider.GetService(); foreach (var data in context.ExtensionData) { diff --git a/src/WixToolset.Core/WixToolsetServiceProvider.cs b/src/WixToolset.Core/WixToolsetServiceProvider.cs index d7a6171a..646b21fa 100644 --- a/src/WixToolset.Core/WixToolsetServiceProvider.cs +++ b/src/WixToolset.Core/WixToolsetServiceProvider.cs @@ -20,7 +20,7 @@ namespace WixToolset.Core // Singletons. this.AddService((provider, singletons) => AddSingleton(singletons, new ExtensionManager(provider))); this.AddService((provider, singletons) => AddSingleton(singletons, new Messaging())); - this.AddService((provider, singletons) => AddSingleton(singletons, new TupleDefinitionCreator(provider))); + this.AddService((provider, singletons) => AddSingleton(singletons, new SymbolDefinitionCreator(provider))); this.AddService((provider, singletons) => AddSingleton(singletons, new ParseHelper(provider))); this.AddService((provider, singletons) => AddSingleton(singletons, new PreprocessHelper(provider))); this.AddService((provider, singletons) => AddSingleton(singletons, new BackendHelper(provider))); diff --git a/src/test/Example.Extension/ExampleCompilerExtension.cs b/src/test/Example.Extension/ExampleCompilerExtension.cs index 0005b1d5..5b8d4b3f 100644 --- a/src/test/Example.Extension/ExampleCompilerExtension.cs +++ b/src/test/Example.Extension/ExampleCompilerExtension.cs @@ -92,8 +92,8 @@ namespace Example.Extension if (!this.Messaging.EncounteredError) { - var tuple = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "Example", id); - tuple.Set(0, value); + var symbol = this.ParseHelper.CreateSymbol(section, sourceLineNumbers, "Example", id); + symbol.Set(0, value); } } @@ -152,12 +152,12 @@ namespace Example.Extension if (!this.Messaging.EncounteredError) { - this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, this.BundleExtensionId); + this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, this.BundleExtensionId); } if (!this.Messaging.EncounteredError) { - var tuple = section.AddTuple(new ExampleSearchTuple(sourceLineNumbers, id) + var symbol = section.AddSymbol(new ExampleSearchSymbol(sourceLineNumbers, id) { SearchFor = searchFor, }); @@ -176,7 +176,7 @@ namespace Example.Extension { case "Id": var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ExampleTupleDefinitions.ExampleSearch, refId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ExampleSymbolDefinitions.ExampleSearch, refId); break; default: this.ParseHelper.UnexpectedAttribute(element, attrib); diff --git a/src/test/Example.Extension/ExampleExtensionData.cs b/src/test/Example.Extension/ExampleExtensionData.cs index 2ba94397..91d60eb9 100644 --- a/src/test/Example.Extension/ExampleExtensionData.cs +++ b/src/test/Example.Extension/ExampleExtensionData.cs @@ -9,15 +9,15 @@ namespace Example.Extension { public string DefaultCulture => null; - public Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions) + public Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) { - return Intermediate.Load(typeof(ExampleExtensionData).Assembly, "Example.Extension.Example.wixlib", tupleDefinitions); + return Intermediate.Load(typeof(ExampleExtensionData).Assembly, "Example.Extension.Example.wixlib", symbolDefinitions); } - public bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) + public bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) { - tupleDefinition = ExampleTupleDefinitions.ByName(name); - return tupleDefinition != null; + symbolDefinition = ExampleSymbolDefinitions.ByName(name); + return symbolDefinition != null; } } } \ No newline at end of file diff --git a/src/test/Example.Extension/ExampleSearchTuple.cs b/src/test/Example.Extension/ExampleSearchTuple.cs index 353ef158..40a39292 100644 --- a/src/test/Example.Extension/ExampleSearchTuple.cs +++ b/src/test/Example.Extension/ExampleSearchTuple.cs @@ -4,27 +4,27 @@ namespace Example.Extension { using WixToolset.Data; - public enum ExampleSearchTupleFields + public enum ExampleSearchSymbolFields { SearchFor, } - public class ExampleSearchTuple : IntermediateTuple + public class ExampleSearchSymbol : IntermediateSymbol { - public ExampleSearchTuple() : base(ExampleTupleDefinitions.ExampleSearch, null, null) + public ExampleSearchSymbol() : base(ExampleSymbolDefinitions.ExampleSearch, null, null) { } - public ExampleSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleTupleDefinitions.ExampleSearch, sourceLineNumber, id) + public ExampleSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleSymbolDefinitions.ExampleSearch, sourceLineNumber, id) { } - public IntermediateField this[ExampleTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ExampleSymbolFields index] => this.Fields[(int)index]; public string SearchFor { - get => this.Fields[(int)ExampleSearchTupleFields.SearchFor]?.AsString(); - set => this.Set((int)ExampleSearchTupleFields.SearchFor, value); + get => this.Fields[(int)ExampleSearchSymbolFields.SearchFor]?.AsString(); + set => this.Set((int)ExampleSearchSymbolFields.SearchFor, value); } } } diff --git a/src/test/Example.Extension/ExampleTableDefinitions.cs b/src/test/Example.Extension/ExampleTableDefinitions.cs index 4901cc09..a2b81698 100644 --- a/src/test/Example.Extension/ExampleTableDefinitions.cs +++ b/src/test/Example.Extension/ExampleTableDefinitions.cs @@ -8,14 +8,14 @@ namespace Example.Extension { public static readonly TableDefinition ExampleTable = new TableDefinition( "Wix4Example", - ExampleTupleDefinitions.Example, + ExampleSymbolDefinitions.Example, new[] { new ColumnDefinition("Example", ColumnType.String, 72, true, false, ColumnCategory.Identifier), new ColumnDefinition("Value", ColumnType.String, 0, false, false, ColumnCategory.Formatted), }, strongRowType: typeof(ExampleRow), - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition NotInAll = new TableDefinition( @@ -26,7 +26,7 @@ namespace Example.Extension new ColumnDefinition("Example", ColumnType.String, 72, true, false, ColumnCategory.Identifier), new ColumnDefinition("Value", ColumnType.String, 0, false, false, ColumnCategory.Formatted), }, - tupleIdIsPrimaryKey: true + symbolIdIsPrimaryKey: true ); public static readonly TableDefinition[] All = new[] { ExampleTable }; diff --git a/src/test/Example.Extension/ExampleTuple.cs b/src/test/Example.Extension/ExampleTuple.cs index f2bcb925..314087e9 100644 --- a/src/test/Example.Extension/ExampleTuple.cs +++ b/src/test/Example.Extension/ExampleTuple.cs @@ -4,27 +4,27 @@ namespace Example.Extension { using WixToolset.Data; - public enum ExampleTupleFields + public enum ExampleSymbolFields { Value, } - public class ExampleTuple : IntermediateTuple + public class ExampleSymbol : IntermediateSymbol { - public ExampleTuple() : base(ExampleTupleDefinitions.Example, null, null) + public ExampleSymbol() : base(ExampleSymbolDefinitions.Example, null, null) { } - public ExampleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleTupleDefinitions.Example, sourceLineNumber, id) + public ExampleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleSymbolDefinitions.Example, sourceLineNumber, id) { } - public IntermediateField this[ExampleTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[ExampleSymbolFields index] => this.Fields[(int)index]; public string Value { - get => this.Fields[(int)ExampleTupleFields.Value]?.AsString(); - set => this.Set((int)ExampleTupleFields.Value, value); + get => this.Fields[(int)ExampleSymbolFields.Value]?.AsString(); + set => this.Set((int)ExampleSymbolFields.Value, value); } } } diff --git a/src/test/Example.Extension/ExampleTupleDefinitions.cs b/src/test/Example.Extension/ExampleTupleDefinitions.cs index 446c2c45..f13d716d 100644 --- a/src/test/Example.Extension/ExampleTupleDefinitions.cs +++ b/src/test/Example.Extension/ExampleTupleDefinitions.cs @@ -6,58 +6,58 @@ namespace Example.Extension using WixToolset.Data; using WixToolset.Data.Burn; - public enum ExampleTupleDefinitionType + public enum ExampleSymbolDefinitionType { Example, ExampleSearch, } - public static class ExampleTupleDefinitions + public static class ExampleSymbolDefinitions { - public static readonly IntermediateTupleDefinition Example = new IntermediateTupleDefinition( - ExampleTupleDefinitionType.Example.ToString(), + public static readonly IntermediateSymbolDefinition Example = new IntermediateSymbolDefinition( + ExampleSymbolDefinitionType.Example.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ExampleTupleFields.Value), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ExampleSymbolFields.Value), IntermediateFieldType.String), }, - typeof(ExampleTuple)); + typeof(ExampleSymbol)); - public static readonly IntermediateTupleDefinition ExampleSearch = new IntermediateTupleDefinition( - ExampleTupleDefinitionType.ExampleSearch.ToString(), + public static readonly IntermediateSymbolDefinition ExampleSearch = new IntermediateSymbolDefinition( + ExampleSymbolDefinitionType.ExampleSearch.ToString(), new[] { - new IntermediateFieldDefinition(nameof(ExampleSearchTupleFields.SearchFor), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(ExampleSearchSymbolFields.SearchFor), IntermediateFieldType.String), }, - typeof(ExampleSearchTuple)); + typeof(ExampleSearchSymbol)); - static ExampleTupleDefinitions() + static ExampleSymbolDefinitions() { - ExampleSearch.AddTag(BurnConstants.BundleExtensionSearchTupleDefinitionTag); + ExampleSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag); } - public static bool TryGetTupleType(string name, out ExampleTupleDefinitionType type) + public static bool TryGetSymbolType(string name, out ExampleSymbolDefinitionType type) { return Enum.TryParse(name, out type); } - public static IntermediateTupleDefinition ByName(string name) + public static IntermediateSymbolDefinition ByName(string name) { - if (!TryGetTupleType(name, out var type)) + if (!TryGetSymbolType(name, out var type)) { return null; } return ByType(type); } - public static IntermediateTupleDefinition ByType(ExampleTupleDefinitionType type) + public static IntermediateSymbolDefinition ByType(ExampleSymbolDefinitionType type) { switch (type) { - case ExampleTupleDefinitionType.Example: - return ExampleTupleDefinitions.Example; + case ExampleSymbolDefinitionType.Example: + return ExampleSymbolDefinitions.Example; - case ExampleTupleDefinitionType.ExampleSearch: - return ExampleTupleDefinitions.ExampleSearch; + case ExampleSymbolDefinitionType.ExampleSearch: + return ExampleSymbolDefinitions.ExampleSearch; default: throw new ArgumentOutOfRangeException(nameof(type)); diff --git a/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs b/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs index 4ce4635f..2c108d96 100644 --- a/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs +++ b/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs @@ -11,23 +11,23 @@ namespace Example.Extension { public override IEnumerable TableDefinitions => ExampleTableDefinitions.All; - public override bool TryAddTupleToOutput(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions) + public override bool TryAddSymbolToOutput(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinitionCollection tableDefinitions) { - if (ExampleTupleDefinitions.TryGetTupleType(tuple.Definition.Name, out var tupleType)) + if (ExampleSymbolDefinitions.TryGetSymbolType(symbol.Definition.Name, out var symbolType)) { - switch (tupleType) + switch (symbolType) { - case ExampleTupleDefinitionType.Example: + case ExampleSymbolDefinitionType.Example: { - var row = (ExampleRow)this.BackendHelper.CreateRow(section, tuple, output, ExampleTableDefinitions.ExampleTable); - row.Example = tuple.Id.Id; - row.Value = tuple[0].AsString(); + var row = (ExampleRow)this.BackendHelper.CreateRow(section, symbol, output, ExampleTableDefinitions.ExampleTable); + row.Example = symbol.Id.Id; + row.Value = symbol[0].AsString(); } return true; } } - return base.TryAddTupleToOutput(section, tuple, output, tableDefinitions); + return base.TryAddSymbolToOutput(section, symbol, output, tableDefinitions); } } } diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs index b86e67ff..cf57eae1 100644 --- a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs @@ -12,7 +12,7 @@ namespace WixToolsetTest.CoreIntegration using WixToolset.Core.TestPackage; using WixToolset.Data; using WixToolset.Data.Burn; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using Xunit; public class BundleFixture @@ -81,14 +81,14 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(wixOutput); var section = intermediate.Sections.Single(); - var bundleTuple = section.Tuples.OfType().Single(); - Assert.Equal("1.0.0.0", bundleTuple.Version); + var bundleSymbol = section.Symbols.OfType().Single(); + Assert.Equal("1.0.0.0", bundleSymbol.Version); - var previousVersion = bundleTuple.Fields[(int)WixBundleTupleFields.Version].PreviousValue; + var previousVersion = bundleSymbol.Fields[(int)WixBundleSymbolFields.Version].PreviousValue; Assert.Equal("!(bind.packageVersion.test.msi)", previousVersion.AsString()); - var msiTuple = section.Tuples.OfType().Single(); - Assert.Equal("test.msi", msiTuple.Id.Id); + var msiSymbol = section.Symbols.OfType().Single(); + Assert.Equal("test.msi", msiSymbol.Id.Id); var extractResult = BundleExtractor.ExtractBAContainer(null, exePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); @@ -111,7 +111,7 @@ namespace WixToolsetTest.CoreIntegration var registrationElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Registration"); var registrationElement = (XmlNode)Assert.Single(registrationElements); - Assert.Equal($"" + + Assert.Equal($"" + "" + "", registrationElement.GetTestXml()); } diff --git a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs index bad7f3ef..ff0c3258 100644 --- a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs @@ -9,7 +9,7 @@ namespace WixToolsetTest.CoreIntegration using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using Xunit; public class ExtensionFixture @@ -58,11 +58,11 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wixpdb")); var section = intermediate.Sections.Single(); - var fileTuple = section.Tuples.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); - Assert.Equal(@"example.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); + var fileSymbol = section.Symbols.OfType().Single(); + Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + Assert.Equal(@"example.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); - var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single(); + var example = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).Single(); Assert.Equal("Foo", example.Id?.Id); Assert.Equal("Bar", example[0].AsString()); } @@ -96,7 +96,7 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wixpdb")); var section = intermediate.Sections.Single(); - var property = section.Tuples.OfType().Where(p => p.Id.Id == "ExampleProperty").Single(); + var property = section.Symbols.OfType().Where(p => p.Id.Id == "ExampleProperty").Single(); Assert.Equal("ExampleProperty", property.Id.Id); Assert.Equal("test", property.Value); } @@ -111,7 +111,7 @@ namespace WixToolsetTest.CoreIntegration { var intermediateFolder = fs.GetFolder(); - var exception = Assert.Throws(() => + var exception = Assert.Throws(() => WixRunner.Execute(new[] { "build", diff --git a/src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs b/src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs index 97e6bde9..5e08ca58 100644 --- a/src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs @@ -9,7 +9,7 @@ namespace WixToolsetTest.CoreIntegration using WixToolset.Core; using WixToolset.Core.TestPackage; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; using Xunit; @@ -27,12 +27,12 @@ namespace WixToolsetTest.CoreIntegration var messaging = serviceProvider.GetService(); messaging.SetListener(listener); - var creator = serviceProvider.GetService(); + var creator = serviceProvider.GetService(); var context = serviceProvider.GetService(); context.Extensions = Enumerable.Empty(); context.ExtensionData = Enumerable.Empty(); context.Intermediates = new[] { intermediate1, intermediate2 }; - context.TupleDefinitionCreator = creator; + context.SymbolDefinitionCreator = creator; var linker = serviceProvider.GetService(); linker.Link(context); @@ -72,10 +72,10 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); var section = intermediate.Sections.Single(); - var actions = section.Tuples.OfType().Where(wat => wat.Action.StartsWith("Set")).ToList(); + var actions = section.Symbols.OfType().Where(wat => wat.Action.StartsWith("Set")).ToList(); Assert.Equal(2, actions.Count); - //Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path); - //Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); + //Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileSymbolFields.Source].AsPath().Path); + //Assert.Equal(@"test.txt", wixFile[WixFileSymbolFields.Source].PreviousValue.AsPath().Path); } } } diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs index fbfebc5b..740d58c7 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs @@ -9,7 +9,7 @@ namespace WixToolsetTest.CoreIntegration using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using Xunit; @@ -51,9 +51,9 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); - var fileTuple = section.Tuples.OfType().First(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); + var fileSymbol = section.Symbols.OfType().First(); + Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); } } @@ -86,9 +86,9 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); var section = intermediate.Sections.Single(); - var fileTuple = section.Tuples.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); + var fileSymbol = section.Symbols.OfType().Single(); + Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); } } @@ -244,14 +244,14 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); var section = intermediate.Sections.Single(); - var errors = section.Tuples.OfType().ToDictionary(t => t.Id.Id); + var errors = section.Symbols.OfType().ToDictionary(t => t.Id.Id); Assert.Equal("Category 55 Emergency Doomsday Crisis", errors["1234"].Message.Trim()); Assert.Equal(" ", errors["5678"].Message); - var customAction1 = section.Tuples.OfType().Where(t => t.Id.Id == "CanWeReferenceAnError_YesWeCan").Single(); + var customAction1 = section.Symbols.OfType().Where(t => t.Id.Id == "CanWeReferenceAnError_YesWeCan").Single(); Assert.Equal("1234", customAction1.Target); - var customAction2 = section.Tuples.OfType().Where(t => t.Id.Id == "TextErrorsWorkOKToo").Single(); + var customAction2 = section.Symbols.OfType().Where(t => t.Id.Id == "TextErrorsWorkOKToo").Single(); Assert.Equal("If you see this, something went wrong.", customAction2.Target); } } @@ -353,10 +353,10 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); var section = intermediate.Sections.Single(); - var fileTuple = section.Tuples.OfType().Single(); - Assert.Equal("filyIq8rqcxxf903Hsn5K9L0SWV73g", fileTuple.Id.Id); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); + var fileSymbol = section.Symbols.OfType().Single(); + Assert.Equal("filyIq8rqcxxf903Hsn5K9L0SWV73g", fileSymbol.Id.Id); + Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); var data = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); var fileRows = data.Tables["File"].Rows; @@ -405,15 +405,15 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(pdbPath); var section = intermediate.Sections.Single(); - var upgradeTuple = section.Tuples.OfType().Single(); - Assert.False(upgradeTuple.ExcludeLanguages); - Assert.True(upgradeTuple.IgnoreRemoveFailures); - Assert.False(upgradeTuple.VersionMaxInclusive); - Assert.True(upgradeTuple.VersionMinInclusive); - Assert.Equal("13.0.0", upgradeTuple.VersionMax); - Assert.Equal("12.0.0", upgradeTuple.VersionMin); - Assert.False(upgradeTuple.OnlyDetect); - Assert.Equal("BLAHBLAHBLAH", upgradeTuple.ActionProperty); + var upgradeSymbol = section.Symbols.OfType().Single(); + Assert.False(upgradeSymbol.ExcludeLanguages); + Assert.True(upgradeSymbol.IgnoreRemoveFailures); + Assert.False(upgradeSymbol.VersionMaxInclusive); + Assert.True(upgradeSymbol.VersionMinInclusive); + Assert.Equal("13.0.0", upgradeSymbol.VersionMax); + Assert.Equal("12.0.0", upgradeSymbol.VersionMin); + Assert.False(upgradeSymbol.OnlyDetect); + Assert.Equal("BLAHBLAHBLAH", upgradeSymbol.ActionProperty); var pdb = WindowsInstallerData.Load(pdbPath, suppressVersionCheck: false); var secureProperties = pdb.Tables["Property"].Rows.Where(row => row.GetKey() == "SecureCustomProperties").Single(); @@ -581,9 +581,9 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); var section = intermediate.Sections.Single(); - var fileTuple = section.Tuples.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); + var fileSymbol = section.Symbols.OfType().Single(); + Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); } } @@ -617,11 +617,11 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); var section = intermediate.Sections.Single(); - var fileTuple = section.Tuples.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\candle.exe"), fileTuple[FileTupleFields.Source].AsPath().Path); - Assert.Equal(@"candle.exe", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); + var fileSymbol = section.Symbols.OfType().Single(); + Assert.Equal(Path.Combine(folder, @"data\candle.exe"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + Assert.Equal(@"candle.exe", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); - var msiAssemblyNameTuples = section.Tuples.OfType(); + var msiAssemblyNameSymbols = section.Symbols.OfType(); Assert.Equal(new[] { "culture", @@ -630,7 +630,7 @@ namespace WixToolsetTest.CoreIntegration "processorArchitecture", "publicKeyToken", "version" - }, msiAssemblyNameTuples.OrderBy(a => a.Name).Select(a => a.Name).ToArray()); + }, msiAssemblyNameSymbols.OrderBy(a => a.Name).Select(a => a.Name).ToArray()); Assert.Equal(new[] { @@ -640,7 +640,7 @@ namespace WixToolsetTest.CoreIntegration "x86", "256B3414DFA97718", "3.0.0.0" - }, msiAssemblyNameTuples.OrderBy(a => a.Name).Select(a => a.Value).ToArray()); + }, msiAssemblyNameSymbols.OrderBy(a => a.Name).Select(a => a.Value).ToArray()); } } @@ -671,7 +671,7 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); var section = intermediate.Sections.Single(); - var platformSummary = section.Tuples.OfType().Single(s => s.PropertyId == SummaryInformationType.PlatformAndLanguage); + var platformSummary = section.Symbols.OfType().Single(s => s.PropertyId == SummaryInformationType.PlatformAndLanguage); Assert.Equal("x64;1033", platformSummary.Value); } } @@ -704,12 +704,12 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); // Only one component is shared. - var sharedComponentTuples = section.Tuples.OfType(); - Assert.Equal(1, sharedComponentTuples.Sum(t => t.Shared ? 1 : 0)); + var sharedComponentSymbols = section.Symbols.OfType(); + Assert.Equal(1, sharedComponentSymbols.Sum(t => t.Shared ? 1 : 0)); // And it is this one. - var sharedComponentTuple = sharedComponentTuples.Single(t => t.Id.Id == "Shared.dll"); - Assert.True(sharedComponentTuple.Shared); + var sharedComponentSymbol = sharedComponentSymbols.Single(t => t.Id.Id == "Shared.dll"); + Assert.True(sharedComponentSymbol.Shared); } } @@ -775,7 +775,7 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); var section = intermediate.Sections.Single(); - var progids = section.Tuples.OfType().OrderBy(tuple => tuple.ProgId).ToList(); + var progids = section.Symbols.OfType().OrderBy(symbol => symbol.ProgId).ToList(); Assert.Equal(new[] { "Foo.File.hol", diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs index c78b0c29..078a33d5 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs @@ -9,7 +9,7 @@ namespace WixToolsetTest.CoreIntegration using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using Xunit; @@ -1074,7 +1074,7 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); var section = intermediate.Sections.Single(); - Assert.Empty(section.Tuples.OfType()); + Assert.Empty(section.Symbols.OfType()); var data = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); Assert.Null(data.Tables["File"]); diff --git a/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs index afb93041..83f74a47 100644 --- a/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs @@ -5,7 +5,7 @@ namespace WixToolsetTest.CoreIntegration using System.Linq; using WixToolset.Core; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; using Xunit; @@ -25,7 +25,7 @@ namespace WixToolsetTest.CoreIntegration parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.ARM); parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.X64); - var simpleReferences = section.Tuples.OfType(); + var simpleReferences = section.Symbols.OfType(); Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomAction32_X86").FirstOrDefault()); Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomArmAction_X86").FirstOrDefault()); Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomArmAction_A64").FirstOrDefault()); diff --git a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs index 25067830..942f253f 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs @@ -8,7 +8,7 @@ namespace WixToolsetTest.CoreIntegration using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using Example.Extension; using Xunit; @@ -62,9 +62,9 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); - var fileTuple = section.Tuples.OfType().First(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); + var fileSymbol = section.Symbols.OfType().First(); + Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); } } @@ -132,14 +132,14 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); { - var fileTuple = section.Tuples.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); + var fileSymbol = section.Symbols.OfType().Single(); + Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); } { - var binary = section.Tuples.OfType().Single(); - var path = binary[BinaryTupleFields.Data].AsPath().Path; + var binary = section.Symbols.OfType().Single(); + var path = binary[BinarySymbolFields.Data].AsPath().Path; Assert.StartsWith(Path.Combine(baseFolder, @"obj\Example.Extension"), path); Assert.EndsWith(@"wix-ir\example.txt", path); Assert.Equal(@"BinFromWir", binary.Id.Id); @@ -187,14 +187,14 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); { - var fileTuple = section.Tuples.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); + var fileSymbol = section.Symbols.OfType().Single(); + Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); } { - var binary = section.Tuples.OfType().Single(); - var path = binary[BinaryTupleFields.Data].AsPath().Path; + var binary = section.Symbols.OfType().Single(); + var path = binary[BinarySymbolFields.Data].AsPath().Path; Assert.StartsWith(Path.Combine(baseFolder, @"obj\test"), path); Assert.EndsWith(@"wix-ir\example.txt", path); Assert.Equal(@"BinFromWir", binary.Id.Id); diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs index 63771248..6ae2c0b8 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs @@ -9,7 +9,7 @@ namespace WixToolsetTest.CoreIntegration using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using Xunit; public class WixlibFixture @@ -80,11 +80,11 @@ namespace WixToolsetTest.CoreIntegration result.AssertSuccess(); var wixlib = Intermediate.Load(wixlibPath); - var binaryTuples = wixlib.Sections.SelectMany(s => s.Tuples).OfType().ToList(); - Assert.Equal(3, binaryTuples.Count); - Assert.Single(binaryTuples.Where(t => t.Data.Path == "wix-ir/foo.dll")); - Assert.Single(binaryTuples.Where(t => t.Data.Path == "wix-ir/foo.dll-1")); - Assert.Single(binaryTuples.Where(t => t.Data.Path == "wix-ir/foo.dll-2")); + var binarySymbols = wixlib.Sections.SelectMany(s => s.Symbols).OfType().ToList(); + Assert.Equal(3, binarySymbols.Count); + Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll")); + Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll-1")); + Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll-2")); } } @@ -138,9 +138,9 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); - var wixFile = section.Tuples.OfType().First(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[FileTupleFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", wixFile[FileTupleFields.Source].PreviousValue.AsPath().Path); + var wixFile = section.Symbols.OfType().First(); + Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[FileSymbolFields.Source].AsPath().Path); + Assert.Equal(@"test.txt", wixFile[FileSymbolFields.Source].PreviousValue.AsPath().Path); } } @@ -183,11 +183,11 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); var section = intermediate.Sections.Single(); - var fileTuple = section.Tuples.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); - Assert.Equal(@"example.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); + var fileSymbol = section.Symbols.OfType().Single(); + Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + Assert.Equal(@"example.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); - var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single(); + var example = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).Single(); Assert.Equal("Foo", example.Id?.Id); Assert.Equal("Bar", example[0].AsString()); } @@ -244,13 +244,13 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb")); var section = intermediate.Sections.Single(); - var fileTuples = section.Tuples.OfType().OrderBy(t => Path.GetFileName(t.Source.Path)).ToArray(); - Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileTuples[0][FileTupleFields.Source].AsPath().Path); - Assert.Equal(@"example.txt", fileTuples[0][FileTupleFields.Source].PreviousValue.AsPath().Path); - Assert.Equal(Path.Combine(folder, @"data\other.txt"), fileTuples[1][FileTupleFields.Source].AsPath().Path); - Assert.Equal(@"other.txt", fileTuples[1][FileTupleFields.Source].PreviousValue.AsPath().Path); + var fileSymbols = section.Symbols.OfType().OrderBy(t => Path.GetFileName(t.Source.Path)).ToArray(); + Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbols[0][FileSymbolFields.Source].AsPath().Path); + Assert.Equal(@"example.txt", fileSymbols[0][FileSymbolFields.Source].PreviousValue.AsPath().Path); + Assert.Equal(Path.Combine(folder, @"data\other.txt"), fileSymbols[1][FileSymbolFields.Source].AsPath().Path); + Assert.Equal(@"other.txt", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath().Path); - var examples = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).ToArray(); + var examples = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).ToArray(); Assert.Equal(new string[] { "Foo", "Other" }, examples.Select(t => t.Id?.Id).ToArray()); Assert.Equal(new[] { "Bar", "Value" }, examples.Select(t => t[0].AsString()).ToArray()); } diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs index 7f9b9686..57351b27 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs @@ -7,7 +7,7 @@ namespace WixToolsetTest.CoreIntegration using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using Xunit; public class WixlibQueryFixture @@ -34,9 +34,9 @@ namespace WixToolsetTest.CoreIntegration result.AssertSuccess(); var intermediate = Intermediate.Load(wixlibPath); - var allTuples = intermediate.Sections.SelectMany(s => s.Tuples); - var wixSimpleRefTuples = allTuples.OfType(); - var repRef = wixSimpleRefTuples.Where(t => t.Table == "WixAction" && + var allSymbols = intermediate.Sections.SelectMany(s => s.Symbols); + var wixSimpleRefSymbols = allSymbols.OfType(); + var repRef = wixSimpleRefSymbols.Where(t => t.Table == "WixAction" && t.PrimaryKeys == "InstallExecuteSequence/RemoveExistingProducts") .SingleOrDefault(); Assert.NotNull(repRef); @@ -65,12 +65,12 @@ namespace WixToolsetTest.CoreIntegration result.AssertSuccess(); var intermediate = Intermediate.Load(wixlibPath); - var allTuples = intermediate.Sections.SelectMany(s => s.Tuples); - var typeLibTuple = allTuples.OfType() + var allSymbols = intermediate.Sections.SelectMany(s => s.Symbols); + var typeLibSymbol = allSymbols.OfType() .SingleOrDefault(); - Assert.NotNull(typeLibTuple); + Assert.NotNull(typeLibSymbol); - var fields = typeLibTuple.Fields.Select(field => field?.Type == IntermediateFieldType.Bool + var fields = typeLibSymbol.Fields.Select(field => field?.Type == IntermediateFieldType.Bool ? field.AsNullableNumber()?.ToString() : field?.AsString()) .ToList(); -- cgit v1.2.3-55-g6feb