From 166186a5831bd515939544a8f662938d5ae755e3 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 1 Mar 2021 23:44:34 -0800 Subject: Support the new names for AccessModifiers --- .../AutomaticallySlipstreamPatchesCommand.cs | 2 +- ...CreateBootstrapperApplicationManifestCommand.cs | 2 +- .../CreateBundleExtensionManifestCommand.cs | 2 +- .../Bundles/ProcessMsiPackageCommand.cs | 8 +-- .../Bind/AssignMediaCommand.cs | 4 +- .../Bind/CreateSpecialPropertiesCommand.cs | 6 +-- .../Bind/ExtractMergeModuleFilesCommand.cs | 2 +- .../Bind/ProcessDependencyReferencesCommand.cs | 8 +-- .../Bind/UpdateFileFacadesCommand.cs | 2 +- .../Decompile/Decompiler.cs | 4 +- src/WixToolset.Core/Bind/FileFacade.cs | 2 +- src/WixToolset.Core/Compiler.cs | 58 +++++++++++----------- src/WixToolset.Core/Compiler_Bundle.cs | 28 +++++------ src/WixToolset.Core/Compiler_Module.cs | 4 +- src/WixToolset.Core/Compiler_Package.cs | 32 ++++++------ src/WixToolset.Core/Compiler_Patch.cs | 4 +- src/WixToolset.Core/Compiler_PatchCreation.cs | 2 +- src/WixToolset.Core/Compiler_Tag.cs | 2 +- .../ExtensibilityServices/ParseHelper.cs | 18 ++++--- .../Link/FindEntrySectionAndLoadSymbolsCommand.cs | 2 +- .../Link/ResolveReferencesCommand.cs | 8 +-- 21 files changed, 101 insertions(+), 99 deletions(-) diff --git a/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs b/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs index 30edf7de..75c60e56 100644 --- a/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs @@ -98,7 +98,7 @@ namespace WixToolset.Core.Burn.Bundles private bool TryAddSlipstreamSymbol(HashSet slipstreamMspIds, WixBundleMsiPackageSymbol msiPackage, WixBundlePatchTargetCodeSymbol patchTargetCode) { - var id = new Identifier(AccessModifier.Private, msiPackage.Id.Id, patchTargetCode.PackageRef); + var id = new Identifier(AccessModifier.Section, msiPackage.Id.Id, patchTargetCode.PackageRef); if (slipstreamMspIds.Add(id.Id)) { diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs index b4648d18..f85a5b62 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs @@ -247,7 +247,7 @@ namespace WixToolset.Core.Burn.Bundles { var generatedId = Common.GenerateIdentifier("ux", BurnCommon.BADataFileName); - var symbol = this.Section.AddSymbol(new WixBundlePayloadSymbol(this.BundleSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId)) + var symbol = this.Section.AddSymbol(new WixBundlePayloadSymbol(this.BundleSymbol.SourceLineNumbers, new Identifier(AccessModifier.Section, generatedId)) { Name = BurnCommon.BADataFileName, SourceFile = new IntermediateFieldPathValue { Path = baManifestPath }, diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs index 74ccd895..9e1f85bc 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs @@ -68,7 +68,7 @@ namespace WixToolset.Core.Burn.Bundles { var generatedId = Common.GenerateIdentifier("ux", BurnCommon.BundleExtensionDataFileName); - var symbol = this.Section.AddSymbol(new WixBundlePayloadSymbol(this.BundleSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId)) + var symbol = this.Section.AddSymbol(new WixBundlePayloadSymbol(this.BundleSymbol.SourceLineNumbers, new Identifier(AccessModifier.Section, generatedId)) { Name = BurnCommon.BundleExtensionDataFileName, SourceFile = new IntermediateFieldPathValue { Path = bextManifestPath }, diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs index 017f29bc..b598af96 100644 --- a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs @@ -358,7 +358,7 @@ namespace WixToolset.Core.Burn.Bundles } } - this.Section.AddSymbol(new WixBundleMsiFeatureSymbol(this.Facade.PackageSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, this.Facade.PackageId, featureName)) + this.Section.AddSymbol(new WixBundleMsiFeatureSymbol(this.Facade.PackageSymbol.SourceLineNumbers, new Identifier(AccessModifier.Section, this.Facade.PackageId, featureName)) { PackageRef = this.Facade.PackageId, Name = featureName, @@ -397,7 +397,7 @@ namespace WixToolset.Core.Burn.Bundles var generatedId = Common.GenerateIdentifier("cab", packagePayload.Id.Id, cabinet); var payloadSourceFile = this.ResolveRelatedFile(packagePayload.SourceFile.Path, packagePayload.UnresolvedSourceFile, cabinet, "Cabinet", this.Facade.PackageSymbol.SourceLineNumbers); - this.Section.AddSymbol(new WixBundlePayloadSymbol(this.Facade.PackageSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId)) + this.Section.AddSymbol(new WixBundlePayloadSymbol(this.Facade.PackageSymbol.SourceLineNumbers, new Identifier(AccessModifier.Section, generatedId)) { Name = cabinetName, SourceFile = new IntermediateFieldPathValue { Path = payloadSourceFile }, @@ -474,7 +474,7 @@ namespace WixToolset.Core.Burn.Bundles var generatedId = Common.GenerateIdentifier("f", packagePayload.Id.Id, record.GetString(2)); var payloadSourceFile = this.ResolveRelatedFile(packagePayload.SourceFile.Path, packagePayload.UnresolvedSourceFile, fileSourcePath, "File", this.Facade.PackageSymbol.SourceLineNumbers); - this.Section.AddSymbol(new WixBundlePayloadSymbol(this.Facade.PackageSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId)) + this.Section.AddSymbol(new WixBundlePayloadSymbol(this.Facade.PackageSymbol.SourceLineNumbers, new Identifier(AccessModifier.Section, generatedId)) { Name = name, SourceFile = new IntermediateFieldPathValue { Path = payloadSourceFile }, @@ -500,7 +500,7 @@ namespace WixToolset.Core.Burn.Bundles private void AddMsiProperty(WixBundleMsiPackageSymbol msiPackage, string name, string value) { - this.Section.AddSymbol(new WixBundleMsiPropertySymbol(msiPackage.SourceLineNumbers, new Identifier(AccessModifier.Private, msiPackage.Id.Id, name)) + this.Section.AddSymbol(new WixBundleMsiPropertySymbol(msiPackage.SourceLineNumbers, new Identifier(AccessModifier.Section, msiPackage.Id.Id, name)) { PackageRef = msiPackage.Id.Id, Name = name, diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs index 301c3246..f6c61866 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs @@ -220,7 +220,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // If there are uncompressed files and no MediaRow, create a default one. if (uncompressedFiles.Count > 0 && !this.Section.Symbols.OfType().Any()) { - var defaultMediaRow = this.Section.AddSymbol(new MediaSymbol(null, new Identifier(AccessModifier.Private, 1)) + var defaultMediaRow = this.Section.AddSymbol(new MediaSymbol(null, new Identifier(AccessModifier.Section, 1)) { DiskId = 1, }); @@ -299,7 +299,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// private MediaSymbol AddMediaSymbol(WixMediaTemplateSymbol mediaTemplateSymbol, int cabIndex) { - return this.Section.AddSymbol(new MediaSymbol(mediaTemplateSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, cabIndex)) + return this.Section.AddSymbol(new MediaSymbol(mediaTemplateSymbol.SourceLineNumbers, new Identifier(AccessModifier.Section, cabIndex)) { DiskId = cabIndex, Cabinet = String.Format(CultureInfo.InvariantCulture, this.CabinetNameTemplate, cabIndex), diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs index 0a042f48..ba7c03a0 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs @@ -57,7 +57,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (0 < adminProperties.Count) { - this.Section.AddSymbol(new PropertySymbol(null, new Identifier(AccessModifier.Private, "AdminProperties")) + this.Section.AddSymbol(new PropertySymbol(null, new Identifier(AccessModifier.Section, "AdminProperties")) { Value = String.Join(";", adminProperties), }); @@ -65,7 +65,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (0 < secureProperties.Count) { - this.Section.AddSymbol(new PropertySymbol(null, new Identifier(AccessModifier.Private, "SecureCustomProperties")) + this.Section.AddSymbol(new PropertySymbol(null, new Identifier(AccessModifier.Section, "SecureCustomProperties")) { Value = String.Join(";", secureProperties), }); @@ -73,7 +73,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (0 < hiddenProperties.Count) { - this.Section.AddSymbol(new PropertySymbol(null, new Identifier(AccessModifier.Private, "MsiHiddenProperties")) + this.Section.AddSymbol(new PropertySymbol(null, new Identifier(AccessModifier.Section, "MsiHiddenProperties")) { Value = String.Join(";", hiddenProperties) }); diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs index 37bda235..e33b38b1 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs @@ -96,7 +96,7 @@ 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 fileSymbol = new FileSymbol(wixMergeRow.SourceLineNumbers, new Identifier(AccessModifier.Private, record[1])); + var fileSymbol = new FileSymbol(wixMergeRow.SourceLineNumbers, new Identifier(AccessModifier.Section, record[1])); fileSymbol.Attributes = wixMergeRow.FileAttributes; fileSymbol.DirectoryRef = record[2]; fileSymbol.DiskId = wixMergeRow.DiskId; diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessDependencyReferencesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessDependencyReferencesCommand.cs index 899d06e1..0ae7ca73 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessDependencyReferencesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessDependencyReferencesCommand.cs @@ -58,7 +58,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind var componentId = wixDependencyProviderRow.ComponentRef; var id = Common.GenerateIdentifier("reg", providesId, requiresId, "(Default)"); - this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Private, id)) + this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Section, id)) { ComponentRef = componentId, Root = RegistryRootType.MachineUser, @@ -69,7 +69,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (!String.IsNullOrEmpty(wixDependencyRow.MinVersion)) { id = Common.GenerateIdentifier("reg", providesId, requiresId, "MinVersion"); - this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Private, id)) + this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Section, id)) { ComponentRef = componentId, Root = RegistryRootType.MachineUser, @@ -83,7 +83,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (!String.IsNullOrEmpty(wixDependencyRow.MaxVersion)) { id = Common.GenerateIdentifier("reg", providesId, requiresId, "MaxVersion"); - this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Private, id)) + this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Section, id)) { ComponentRef = componentId, Root = RegistryRootType.MachineUser, @@ -96,7 +96,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (wixDependencyRow.Attributes != WixDependencySymbolAttributes.None) { id = Common.GenerateIdentifier("reg", providesId, requiresId, "Attributes"); - this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Private, id)) + this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Section, id)) { ComponentRef = componentId, Root = RegistryRootType.MachineUser, diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs index d5bdc797..f8819a0e 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs @@ -335,7 +335,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind var lookup = String.Concat(facade.ComponentRef, "/", name); if (!assemblyNameSymbols.TryGetValue(lookup, out var assemblyNameSymbol)) { - assemblyNameSymbol = this.Section.AddSymbol(new MsiAssemblyNameSymbol(facade.SourceLineNumber, new Identifier(AccessModifier.Private, facade.ComponentRef, name)) + assemblyNameSymbol = this.Section.AddSymbol(new MsiAssemblyNameSymbol(facade.SourceLineNumber, new Identifier(AccessModifier.Section, facade.ComponentRef, name)) { ComponentRef = facade.ComponentRef, Name = name, diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs index c62e8153..2cc61666 100644 --- a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs +++ b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs @@ -1999,7 +1999,7 @@ namespace WixToolset.Core.WindowsInstaller foreach (var row in table.Rows) { var action = row.FieldAsString(0); - var actionSymbol = new WixActionSymbol(null, new Identifier(AccessModifier.Public, sequenceTable, action)); + var actionSymbol = new WixActionSymbol(null, new Identifier(AccessModifier.Global, sequenceTable, action)); actionSymbol.Action = action; @@ -2133,7 +2133,7 @@ namespace WixToolset.Core.WindowsInstaller { foreach (var row in table.Rows) { - var actionRow = new WixActionSymbol(null, new Identifier(AccessModifier.Public, sequenceTable, row.FieldAsString(0))); + var actionRow = new WixActionSymbol(null, new Identifier(AccessModifier.Global, sequenceTable, row.FieldAsString(0))); actionRow.Action = row.FieldAsString(0); diff --git a/src/WixToolset.Core/Bind/FileFacade.cs b/src/WixToolset.Core/Bind/FileFacade.cs index 9705cd01..d1e5ae60 100644 --- a/src/WixToolset.Core/Bind/FileFacade.cs +++ b/src/WixToolset.Core/Bind/FileFacade.cs @@ -35,7 +35,7 @@ namespace WixToolset.Core.Bind this.FromTransform = true; this.FileRow = row; - this.Identifier = new Identifier(AccessModifier.Private, row.File); + this.Identifier = new Identifier(AccessModifier.Section, row.File); this.ComponentRef = row.Component; } diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 7113c3b5..8aa82d47 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs @@ -554,7 +554,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new AppIdSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, appId)) + this.Core.AddSymbol(new AppIdSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, appId)) { AppId = appId, RemoteServerName = remoteServerName, @@ -652,7 +652,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new MsiAssemblyNameSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, componentId, id)) + this.Core.AddSymbol(new MsiAssemblyNameSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, componentId, id)) { ComponentRef = componentId, Name = id, @@ -1844,7 +1844,7 @@ namespace WixToolset.Core } oneChild = true; signature = this.ParseFileSearchElement(child, id.Id, false, CompilerConstants.IntegerNotSet); - id = new Identifier(AccessModifier.Private, signature); // FileSearch signatures override parent signatures + id = new Identifier(AccessModifier.Section, signature); // FileSearch signatures override parent signatures break; case "FileSearchRef": if (oneChild) @@ -1853,7 +1853,7 @@ namespace WixToolset.Core } oneChild = true; var newId = this.ParseSimpleRefElement(child, SymbolDefinitions.Signature); // FileSearch signatures override parent signatures - id = new Identifier(AccessModifier.Private, newId); + id = new Identifier(AccessModifier.Section, newId); signature = null; break; default: @@ -2087,7 +2087,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new CCPSearchSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, signature))); + this.Core.AddSymbol(new CCPSearchSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, signature))); } } @@ -2272,7 +2272,7 @@ namespace WixToolset.Core { // Placeholder id for defaulting Component/@Id to keypath id. componentIdPlaceholder = String.Concat(Compiler.ComponentIdPlaceholderStart, this.componentIdPlaceholders.Count, Compiler.ComponentIdPlaceholderEnd); - id = new Identifier(AccessModifier.Private, componentIdPlaceholder); + id = new Identifier(AccessModifier.Section, componentIdPlaceholder); } if (null == directoryId) @@ -2506,7 +2506,7 @@ namespace WixToolset.Core { this.componentIdPlaceholders.Add(componentIdPlaceholder, keyPath); - id = new Identifier(AccessModifier.Private, keyPath); + id = new Identifier(AccessModifier.Section, keyPath); } else { @@ -2545,7 +2545,7 @@ namespace WixToolset.Core if (0 < symbols.Count) { - this.Core.AddSymbol(new WixDeltaPatchSymbolPathsSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, SymbolPathType.Component, id.Id)) + this.Core.AddSymbol(new WixDeltaPatchSymbolPathsSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, SymbolPathType.Component, id.Id)) { SymbolType = SymbolPathType.Component, SymbolId = id.Id, @@ -2851,7 +2851,7 @@ namespace WixToolset.Core } oneChild = true; signature = this.ParseFileSearchElement(child, id.Id, false, CompilerConstants.IntegerNotSet); - id = new Identifier(AccessModifier.Private, signature); // FileSearch signatures override parent signatures + id = new Identifier(AccessModifier.Section, signature); // FileSearch signatures override parent signatures break; case "FileSearchRef": if (oneChild) @@ -2860,7 +2860,7 @@ namespace WixToolset.Core } oneChild = true; var newId = this.ParseSimpleRefElement(child, SymbolDefinitions.Signature); // FileSearch signatures override parent signatures - id = new Identifier(AccessModifier.Private, newId); + id = new Identifier(AccessModifier.Section, newId); signature = null; break; default: @@ -3734,7 +3734,7 @@ namespace WixToolset.Core { var columnNames = String.Join(new string(WixCustomTableSymbol.ColumnNamesSeparator, 1), columns.Select(c => c.Name)); - this.Core.AddSymbol(new WixCustomTableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, tableId)) + this.Core.AddSymbol(new WixCustomTableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, tableId)) { ColumnNames = columnNames, Unreal = unreal, @@ -4067,7 +4067,7 @@ namespace WixToolset.Core attributes |= nullable ? WixCustomTableColumnSymbolAttributes.Nullable : WixCustomTableColumnSymbolAttributes.None; attributes |= columnUnreal ? WixCustomTableColumnSymbolAttributes.Unreal : WixCustomTableColumnSymbolAttributes.None; - var column = this.Core.AddSymbol(new WixCustomTableColumnSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Private, tableId, columnName)) + var column = this.Core.AddSymbol(new WixCustomTableColumnSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Section, tableId, columnName)) { TableRef = tableId, Name = columnName, @@ -4134,7 +4134,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new WixCustomTableCellSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Private, tableId, rowId, columnName)) + this.Core.AddSymbol(new WixCustomTableCellSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Section, tableId, rowId, columnName)) { RowId = rowId, ColumnRef = columnName, @@ -4584,7 +4584,7 @@ namespace WixToolset.Core // and the row created here is for the file search. if (assignToProperty) { - access = AccessModifier.Private; + access = AccessModifier.Section; rowId = signature; // The property should be set to the directory search Id. @@ -5377,7 +5377,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new ErrorSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, id)) + this.Core.AddSymbol(new ErrorSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, id)) { Message = message }); @@ -5466,7 +5466,7 @@ namespace WixToolset.Core { if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new ExtensionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, extension, componentId)) + this.Core.AddSymbol(new ExtensionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, extension, componentId)) { Extension = extension, ComponentRef = componentId, @@ -6044,7 +6044,7 @@ namespace WixToolset.Core } else // reuse parent signature in the Signature table { - id = new Identifier(AccessModifier.Private, parentSignature); + id = new Identifier(AccessModifier.Section, parentSignature); } } @@ -6108,7 +6108,7 @@ namespace WixToolset.Core { // Creates the DrLocator row for the directory search while // the parent DirectorySearch creates the file locator row. - this.Core.AddSymbol(new DrLocatorSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, parentSignature, id.Id, String.Empty)) + this.Core.AddSymbol(new DrLocatorSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, parentSignature, id.Id, String.Empty)) { SignatureRef = parentSignature, Parent = id.Id @@ -6116,7 +6116,7 @@ namespace WixToolset.Core } else { - this.Core.AddSymbol(new DrLocatorSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, id.Id, parentSignature, String.Empty)) + this.Core.AddSymbol(new DrLocatorSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, id.Id, parentSignature, String.Empty)) { SignatureRef = id.Id, Parent = parentSignature @@ -6663,7 +6663,7 @@ namespace WixToolset.Core } oneChild = true; signature = this.ParseFileSearchElement(child, id.Id, false, CompilerConstants.IntegerNotSet); - id = new Identifier(AccessModifier.Private, signature); // FileSearch signatures override parent signatures + id = new Identifier(AccessModifier.Section, signature); // FileSearch signatures override parent signatures break; case "FileSearchRef": if (oneChild) @@ -6672,7 +6672,7 @@ namespace WixToolset.Core } oneChild = true; var newId = this.ParseSimpleRefElement(child, SymbolDefinitions.Signature); // FileSearch signatures override parent signatures - id = new Identifier(AccessModifier.Private, newId); + id = new Identifier(AccessModifier.Section, newId); signature = null; break; default: @@ -6945,7 +6945,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new MsiDigitalSignatureSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "Media", diskId)) + this.Core.AddSymbol(new MsiDigitalSignatureSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "Media", diskId)) { Table = "Media", SignObject = diskId, @@ -7141,7 +7141,7 @@ namespace WixToolset.Core break; } - this.Core.ScheduleActionSymbol(sourceLineNumbers, AccessModifier.Public, SequenceTable.InstallExecuteSequence, "RemoveExistingProducts", afterAction: after); + this.Core.ScheduleActionSymbol(sourceLineNumbers, AccessModifier.Global, SequenceTable.InstallExecuteSequence, "RemoveExistingProducts", afterAction: after); } } @@ -7310,7 +7310,7 @@ namespace WixToolset.Core // add the row to the section if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new MediaSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, id)) + this.Core.AddSymbol(new MediaSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, id)) { DiskId = id, DiskPrompt = diskPrompt, @@ -7323,7 +7323,7 @@ namespace WixToolset.Core if (null != symbols) { - this.Core.AddSymbol(new WixDeltaPatchSymbolPathsSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, SymbolPathType.Media, id)) + this.Core.AddSymbol(new WixDeltaPatchSymbolPathsSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, SymbolPathType.Media, id)) { SymbolType = SymbolPathType.Media, SymbolId = id.ToString(CultureInfo.InvariantCulture), @@ -7419,7 +7419,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new MediaSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, 1)) + this.Core.AddSymbol(new MediaSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, 1)) { DiskId = 1 }); @@ -7794,7 +7794,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new MIMESymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, contentType)) + this.Core.AddSymbol(new MIMESymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, contentType)) { ContentType = contentType, ExtensionRef = extension, @@ -7873,7 +7873,7 @@ namespace WixToolset.Core if (patch) { // /Patch/PatchProperty goes directly into MsiPatchMetadata table - this.Core.AddSymbol(new MsiPatchMetadataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, company, name)) + this.Core.AddSymbol(new MsiPatchMetadataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, company, name)) { Company = company, Property = name, @@ -7900,7 +7900,7 @@ namespace WixToolset.Core { if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new PropertySymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, name)) + this.Core.AddSymbol(new PropertySymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, name)) { Value = value }); diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs index b8c7b7b1..c790d721 100644 --- a/src/WixToolset.Core/Compiler_Bundle.cs +++ b/src/WixToolset.Core/Compiler_Bundle.cs @@ -19,9 +19,9 @@ namespace WixToolset.Core /// internal partial class Compiler : ICompiler { - private static readonly Identifier BurnUXContainerId = new Identifier(AccessModifier.Private, BurnConstants.BurnUXContainerName); - private static readonly Identifier BurnDefaultAttachedContainerId = new Identifier(AccessModifier.Private, BurnConstants.BurnDefaultAttachedContainerName); - private static readonly Identifier BundleLayoutOnlyPayloads = new Identifier(AccessModifier.Private, BurnConstants.BundleLayoutOnlyPayloadsName); + private static readonly Identifier BurnUXContainerId = new Identifier(AccessModifier.Section, BurnConstants.BurnUXContainerName); + private static readonly Identifier BurnDefaultAttachedContainerId = new Identifier(AccessModifier.Section, BurnConstants.BurnDefaultAttachedContainerName); + private static readonly Identifier BundleLayoutOnlyPayloads = new Identifier(AccessModifier.Section, BurnConstants.BundleLayoutOnlyPayloadsName); /// /// Parses an ApprovedExeForElevation element. @@ -427,25 +427,25 @@ namespace WixToolset.Core }); // Ensure that the bundle stores the well-known persisted values. - this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_NAME)) + this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, BurnConstants.BURN_BUNDLE_NAME)) { Hidden = false, Persisted = true, }); - this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_ORIGINAL_SOURCE)) + this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, BurnConstants.BURN_BUNDLE_ORIGINAL_SOURCE)) { Hidden = false, Persisted = true, }); - this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_ORIGINAL_SOURCE_FOLDER)) + this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, BurnConstants.BURN_BUNDLE_ORIGINAL_SOURCE_FOLDER)) { Hidden = false, Persisted = true, }); - this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_LAST_USED_SOURCE)) + this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, BurnConstants.BURN_BUNDLE_LAST_USED_SOURCE)) { Hidden = false, Persisted = true, @@ -946,7 +946,7 @@ namespace WixToolset.Core { var attributeNames = String.Join(new string(WixBundleCustomDataSymbol.AttributeNamesSeparator, 1), attributeDefinitions.Select(c => c.Name)); - this.Core.AddSymbol(new WixBundleCustomDataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, customDataId)) + this.Core.AddSymbol(new WixBundleCustomDataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, customDataId)) { AttributeNames = attributeNames, Type = customDataType.Value, @@ -1052,7 +1052,7 @@ namespace WixToolset.Core return null; } - var customDataAttribute = this.Core.AddSymbol(new WixBundleCustomDataAttributeSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, customDataId, attributeName)) + var customDataAttribute = this.Core.AddSymbol(new WixBundleCustomDataAttributeSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, customDataId, attributeName)) { CustomDataRef = customDataId, Name = attributeName, @@ -1106,7 +1106,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new WixBundleCustomDataCellSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Private, customDataId, elementId, attributeName)) + this.Core.AddSymbol(new WixBundleCustomDataCellSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Section, customDataId, elementId, attributeName)) { ElementId = elementId, AttributeRef = attributeName, @@ -1822,7 +1822,7 @@ namespace WixToolset.Core } // Ensure there is always a rollback boundary at the beginning of the chain. - this.CreateRollbackBoundary(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixDefaultBoundary"), YesNoType.Yes, YesNoType.No, ComplexReferenceParentType.PackageGroup, "WixChain", ComplexReferenceChildType.Unknown, null); + this.CreateRollbackBoundary(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixDefaultBoundary"), YesNoType.Yes, YesNoType.No, ComplexReferenceParentType.PackageGroup, "WixChain", ComplexReferenceChildType.Unknown, null); var previousId = "WixDefaultBoundary"; var previousType = ComplexReferenceChildType.Package; @@ -2856,7 +2856,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var symbol = this.Core.AddSymbol(new WixBundleMsiPropertySymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, packageId, name)) + var symbol = this.Core.AddSymbol(new WixBundleMsiPropertySymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, packageId, name)) { PackageRef = packageId, Name = name, @@ -2910,7 +2910,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new WixBundleSlipstreamMspSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, packageId, id)) + this.Core.AddSymbol(new WixBundleSlipstreamMspSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, packageId, id)) { TargetPackageRef = packageId, MspPackageRef = id @@ -3179,7 +3179,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, name)) + this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, name)) { Value = value, Type = type, diff --git a/src/WixToolset.Core/Compiler_Module.cs b/src/WixToolset.Core/Compiler_Module.cs index 6953467f..9c81ba5c 100644 --- a/src/WixToolset.Core/Compiler_Module.cs +++ b/src/WixToolset.Core/Compiler_Module.cs @@ -259,7 +259,7 @@ namespace WixToolset.Core }); } - var symbol = this.Core.AddSymbol(new ModuleSignatureSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, this.activeName, this.activeLanguage)) + var symbol = this.Core.AddSymbol(new ModuleSignatureSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, this.activeName, this.activeLanguage)) { ModuleID = this.activeName, Version = version @@ -662,7 +662,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new ModuleIgnoreTableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, id))); + this.Core.AddSymbol(new ModuleIgnoreTableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, id))); } } } diff --git a/src/WixToolset.Core/Compiler_Package.cs b/src/WixToolset.Core/Compiler_Package.cs index 7a842ef0..2cc77a60 100644 --- a/src/WixToolset.Core/Compiler_Package.cs +++ b/src/WixToolset.Core/Compiler_Package.cs @@ -173,19 +173,19 @@ namespace WixToolset.Core this.compilingProduct = true; this.Core.CreateActiveSection(productCode, SectionType.Product, codepage, this.Context.CompilationId); - this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Public, "Manufacturer"), manufacturer, false, false, false, true); - this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Public, "ProductCode"), productCode, false, false, false, true); - this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Public, "ProductLanguage"), this.activeLanguage, false, false, false, true); - this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Public, "ProductName"), this.activeName, false, false, false, true); - this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Public, "ProductVersion"), version, false, false, false, true); + this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "Manufacturer"), manufacturer, false, false, false, true); + this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductCode"), productCode, false, false, false, true); + this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductLanguage"), this.activeLanguage, false, false, false, true); + this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductName"), this.activeName, false, false, false, true); + this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductVersion"), version, false, false, false, true); if (null != upgradeCode) { - this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Public, "UpgradeCode"), upgradeCode, false, false, false, true); + this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "UpgradeCode"), upgradeCode, false, false, false, true); } if (isPerMachine) { - this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Public, "ALLUSERS"), "1", false, false, false, false); + this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ALLUSERS"), "1", false, false, false, false); } this.ValidateAndAddCommonSummaryInformationSymbols(sourceLineNumbers, msiVersion, platform); @@ -642,7 +642,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var identifier = new Identifier(AccessModifier.Private, parentId, id); + var identifier = new Identifier(AccessModifier.Section, parentId, id); switch (symbolDefinitionType) { case SymbolDefinitionType.ODBCAttribute: @@ -1305,7 +1305,7 @@ namespace WixToolset.Core { if (!this.Core.EncounteredError) { - var symbol = this.Core.AddSymbol(new ProgIdSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, progId)) + var symbol = this.Core.AddSymbol(new ProgIdSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, progId)) { ProgId = progId, ParentProgIdRef = parent, @@ -1486,7 +1486,7 @@ namespace WixToolset.Core { if (complianceCheck && !this.Core.EncounteredError) { - this.Core.AddSymbol(new CCPSearchSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, sig))); + this.Core.AddSymbol(new CCPSearchSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, sig))); } this.AddAppSearch(sourceLineNumbers, id, sig); @@ -2612,7 +2612,7 @@ namespace WixToolset.Core { if (suppress) { - this.Core.AddSymbol(new WixSuppressActionSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Public, sequenceTable, actionName)) + this.Core.AddSymbol(new WixSuppressActionSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Global, sequenceTable, actionName)) { SequenceTable = sequenceTable, Action = actionName @@ -2620,7 +2620,7 @@ namespace WixToolset.Core } else { - var symbol = this.Core.AddSymbol(new WixActionSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Public, sequenceTable, actionName)) + var symbol = this.Core.AddSymbol(new WixActionSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Global, sequenceTable, actionName)) { SequenceTable = sequenceTable, Action = actionName, @@ -3735,7 +3735,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new CustomActionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName)) + this.Core.AddSymbol(new CustomActionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, actionName)) { ExecutionType = executionType, SourceType = CustomActionSourceType.Directory, @@ -3746,7 +3746,7 @@ namespace WixToolset.Core foreach (var sequence in sequences) { - this.Core.ScheduleActionSymbol(sourceLineNumbers, AccessModifier.Public, sequence, actionName, condition, afterAction: "CostInitialize"); + this.Core.ScheduleActionSymbol(sourceLineNumbers, AccessModifier.Global, sequence, actionName, condition, afterAction: "CostInitialize"); } } } @@ -3864,7 +3864,7 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.ActionScheduledRelativeToItself(sourceLineNumbers, node.Name.LocalName, "After", afterAction)); } - this.Core.AddSymbol(new CustomActionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName)) + this.Core.AddSymbol(new CustomActionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, actionName)) { ExecutionType = executionType, SourceType = CustomActionSourceType.Property, @@ -3875,7 +3875,7 @@ namespace WixToolset.Core foreach (var sequence in sequences) { - this.Core.ScheduleActionSymbol(sourceLineNumbers, AccessModifier.Public, sequence, actionName, condition, beforeAction, afterAction); + this.Core.ScheduleActionSymbol(sourceLineNumbers, AccessModifier.Global, sequence, actionName, condition, beforeAction, afterAction); } } } diff --git a/src/WixToolset.Core/Compiler_Patch.cs b/src/WixToolset.Core/Compiler_Patch.cs index 83737c43..998894d8 100644 --- a/src/WixToolset.Core/Compiler_Patch.cs +++ b/src/WixToolset.Core/Compiler_Patch.cs @@ -197,7 +197,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new WixPatchIdSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, patchId)) + this.Core.AddSymbol(new WixPatchIdSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, patchId)) { ClientPatchId = clientPatchId, OptimizePatchSizeForLargeFiles = optimizePatchSizeForLargeFiles, @@ -645,7 +645,7 @@ namespace WixToolset.Core private void AddMsiPatchMetadata(SourceLineNumber sourceLineNumbers, string company, string property, string value) { - this.Core.AddSymbol(new MsiPatchMetadataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, company, property)) + this.Core.AddSymbol(new MsiPatchMetadataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, company, property)) { Company = company, Property = property, diff --git a/src/WixToolset.Core/Compiler_PatchCreation.cs b/src/WixToolset.Core/Compiler_PatchCreation.cs index c1c593c2..7675a5c0 100644 --- a/src/WixToolset.Core/Compiler_PatchCreation.cs +++ b/src/WixToolset.Core/Compiler_PatchCreation.cs @@ -1254,7 +1254,7 @@ namespace WixToolset.Core private void AddPatchMetadata(SourceLineNumber sourceLineNumbers, string company, string property, string value) { - this.Core.AddSymbol(new PatchMetadataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, company, property)) + this.Core.AddSymbol(new PatchMetadataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, company, property)) { Company = company, Property = property, diff --git a/src/WixToolset.Core/Compiler_Tag.cs b/src/WixToolset.Core/Compiler_Tag.cs index 2b3523c8..cf55c448 100644 --- a/src/WixToolset.Core/Compiler_Tag.cs +++ b/src/WixToolset.Core/Compiler_Tag.cs @@ -236,7 +236,7 @@ namespace WixToolset.Core else { feature = "WixSwidTag"; - this.Core.AddSymbol(new FeatureSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, feature)) + this.Core.AddSymbol(new FeatureSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, feature)) { Title = "ISO/IEC 19770-2", Level = 1, diff --git a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs index ad2427e4..7894ce8e 100644 --- a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs +++ b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs @@ -111,13 +111,13 @@ namespace WixToolset.Core.ExtensibilityServices public Identifier CreateIdentifier(string prefix, params string[] args) { var id = Common.GenerateIdentifier(prefix, args); - return new Identifier(AccessModifier.Private, id); + return new Identifier(AccessModifier.Section, id); } public Identifier CreateIdentifierFromFilename(string filename) { var id = Common.GetIdentifierFromName(filename); - return new Identifier(AccessModifier.Private, id); + return new Identifier(AccessModifier.Section, id); } public string CreateIdentifierValueFromPlatform(string name, Platform currentPlatform, BurnPlatforms supportedPlatforms) @@ -425,7 +425,7 @@ namespace WixToolset.Core.ExtensibilityServices public Identifier GetAttributeIdentifier(SourceLineNumber sourceLineNumbers, XAttribute attribute) { - var access = AccessModifier.Public; + var access = AccessModifier.Global; var value = Common.GetAttributeValue(this.Messaging, sourceLineNumbers, attribute, EmptyRule.CanBeEmpty); var separator = value.IndexOf(' '); @@ -434,24 +434,26 @@ namespace WixToolset.Core.ExtensibilityServices var prefix = value.Substring(0, separator); switch (prefix) { + case "global": case "public": case "package": - access = AccessModifier.Public; + access = AccessModifier.Global; break; case "internal": case "library": - access = AccessModifier.Internal; + access = AccessModifier.Library; break; - case "protected": case "file": - access = AccessModifier.Protected; + case "protected": + access = AccessModifier.File; break; case "private": case "fragment": - access = AccessModifier.Private; + case "section": + access = AccessModifier.Section; break; default: diff --git a/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs b/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs index a52d0d63..5d6cc831 100644 --- a/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs +++ b/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs @@ -92,7 +92,7 @@ namespace WixToolset.Core.Link // If the duplicate symbols are both private directories, there is a chance that they // point to identical symbols. Identical directory symbols are redundant and will not cause // conflicts. - if (AccessModifier.Private == existingSymbol.Access && AccessModifier.Private == symbolWithSection.Access && + if (AccessModifier.Section == existingSymbol.Access && AccessModifier.Section == symbolWithSection.Access && SymbolDefinitionType.Directory == existingSymbol.Symbol.Definition.Type && existingSymbol.Symbol.IsIdentical(symbolWithSection.Symbol)) { // Ensure identical symbol's symbol is marked redundant to ensure (should the symbol be diff --git a/src/WixToolset.Core/Link/ResolveReferencesCommand.cs b/src/WixToolset.Core/Link/ResolveReferencesCommand.cs index 2bdd5646..efb90bb8 100644 --- a/src/WixToolset.Core/Link/ResolveReferencesCommand.cs +++ b/src/WixToolset.Core/Link/ResolveReferencesCommand.cs @@ -167,13 +167,13 @@ namespace WixToolset.Core.Link { switch (symbolWithSection.Access) { - case AccessModifier.Public: + case AccessModifier.Global: return true; - case AccessModifier.Internal: + case AccessModifier.Library: return symbolWithSection.Section.CompilationId == referencingSection.CompilationId || (null != symbolWithSection.Section.LibraryId && symbolWithSection.Section.LibraryId == referencingSection.LibraryId); - case AccessModifier.Protected: + case AccessModifier.File: return symbolWithSection.Section.CompilationId == referencingSection.CompilationId; - case AccessModifier.Private: + case AccessModifier.Section: return referencingSection == symbolWithSection.Section; default: throw new ArgumentOutOfRangeException(nameof(symbolWithSection.Access)); -- cgit v1.2.3-55-g6feb