diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-03-01 23:44:34 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-03-02 02:21:22 -0800 |
| commit | 166186a5831bd515939544a8f662938d5ae755e3 (patch) | |
| tree | 35b3c4b3d0ef0bb7ea128197ffa22955a1d49590 /src/WixToolset.Core.WindowsInstaller/Bind/ProcessDependencyReferencesCommand.cs | |
| parent | 85e611c40c3c8bf3ff3b06b52d53d046bc8ff392 (diff) | |
| download | wix-166186a5831bd515939544a8f662938d5ae755e3.tar.gz wix-166186a5831bd515939544a8f662938d5ae755e3.tar.bz2 wix-166186a5831bd515939544a8f662938d5ae755e3.zip | |
Support the new names for AccessModifiers
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/ProcessDependencyReferencesCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/ProcessDependencyReferencesCommand.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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 | |||
| 58 | var componentId = wixDependencyProviderRow.ComponentRef; | 58 | var componentId = wixDependencyProviderRow.ComponentRef; |
| 59 | 59 | ||
| 60 | var id = Common.GenerateIdentifier("reg", providesId, requiresId, "(Default)"); | 60 | var id = Common.GenerateIdentifier("reg", providesId, requiresId, "(Default)"); |
| 61 | this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Private, id)) | 61 | this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Section, id)) |
| 62 | { | 62 | { |
| 63 | ComponentRef = componentId, | 63 | ComponentRef = componentId, |
| 64 | Root = RegistryRootType.MachineUser, | 64 | Root = RegistryRootType.MachineUser, |
| @@ -69,7 +69,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 69 | if (!String.IsNullOrEmpty(wixDependencyRow.MinVersion)) | 69 | if (!String.IsNullOrEmpty(wixDependencyRow.MinVersion)) |
| 70 | { | 70 | { |
| 71 | id = Common.GenerateIdentifier("reg", providesId, requiresId, "MinVersion"); | 71 | id = Common.GenerateIdentifier("reg", providesId, requiresId, "MinVersion"); |
| 72 | this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Private, id)) | 72 | this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Section, id)) |
| 73 | { | 73 | { |
| 74 | ComponentRef = componentId, | 74 | ComponentRef = componentId, |
| 75 | Root = RegistryRootType.MachineUser, | 75 | Root = RegistryRootType.MachineUser, |
| @@ -83,7 +83,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 83 | if (!String.IsNullOrEmpty(wixDependencyRow.MaxVersion)) | 83 | if (!String.IsNullOrEmpty(wixDependencyRow.MaxVersion)) |
| 84 | { | 84 | { |
| 85 | id = Common.GenerateIdentifier("reg", providesId, requiresId, "MaxVersion"); | 85 | id = Common.GenerateIdentifier("reg", providesId, requiresId, "MaxVersion"); |
| 86 | this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Private, id)) | 86 | this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Section, id)) |
| 87 | { | 87 | { |
| 88 | ComponentRef = componentId, | 88 | ComponentRef = componentId, |
| 89 | Root = RegistryRootType.MachineUser, | 89 | Root = RegistryRootType.MachineUser, |
| @@ -96,7 +96,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 96 | if (wixDependencyRow.Attributes != WixDependencySymbolAttributes.None) | 96 | if (wixDependencyRow.Attributes != WixDependencySymbolAttributes.None) |
| 97 | { | 97 | { |
| 98 | id = Common.GenerateIdentifier("reg", providesId, requiresId, "Attributes"); | 98 | id = Common.GenerateIdentifier("reg", providesId, requiresId, "Attributes"); |
| 99 | this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Private, id)) | 99 | this.Section.AddSymbol(new RegistrySymbol(wixDependencyRefRow.SourceLineNumbers, new Identifier(AccessModifier.Section, id)) |
| 100 | { | 100 | { |
| 101 | ComponentRef = componentId, | 101 | ComponentRef = componentId, |
| 102 | Root = RegistryRootType.MachineUser, | 102 | Root = RegistryRootType.MachineUser, |