Support the new names for AccessModifiers

6 files changed, 13 insertions, 13 deletions

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<MediaSymbol>().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
         /// <returns></returns>
         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);