aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/Compiler_Package.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core/Compiler_Package.cs')
-rw-r--r--src/WixToolset.Core/Compiler_Package.cs32
1 files changed, 16 insertions, 16 deletions
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
173 this.compilingProduct = true; 173 this.compilingProduct = true;
174 this.Core.CreateActiveSection(productCode, SectionType.Product, codepage, this.Context.CompilationId); 174 this.Core.CreateActiveSection(productCode, SectionType.Product, codepage, this.Context.CompilationId);
175 175
176 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Public, "Manufacturer"), manufacturer, false, false, false, true); 176 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "Manufacturer"), manufacturer, false, false, false, true);
177 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Public, "ProductCode"), productCode, false, false, false, true); 177 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductCode"), productCode, false, false, false, true);
178 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Public, "ProductLanguage"), this.activeLanguage, false, false, false, true); 178 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductLanguage"), this.activeLanguage, false, false, false, true);
179 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Public, "ProductName"), this.activeName, false, false, false, true); 179 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductName"), this.activeName, false, false, false, true);
180 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Public, "ProductVersion"), version, false, false, false, true); 180 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductVersion"), version, false, false, false, true);
181 if (null != upgradeCode) 181 if (null != upgradeCode)
182 { 182 {
183 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Public, "UpgradeCode"), upgradeCode, false, false, false, true); 183 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "UpgradeCode"), upgradeCode, false, false, false, true);
184 } 184 }
185 185
186 if (isPerMachine) 186 if (isPerMachine)
187 { 187 {
188 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Public, "ALLUSERS"), "1", false, false, false, false); 188 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ALLUSERS"), "1", false, false, false, false);
189 } 189 }
190 190
191 this.ValidateAndAddCommonSummaryInformationSymbols(sourceLineNumbers, msiVersion, platform); 191 this.ValidateAndAddCommonSummaryInformationSymbols(sourceLineNumbers, msiVersion, platform);
@@ -642,7 +642,7 @@ namespace WixToolset.Core
642 642
643 if (!this.Core.EncounteredError) 643 if (!this.Core.EncounteredError)
644 { 644 {
645 var identifier = new Identifier(AccessModifier.Private, parentId, id); 645 var identifier = new Identifier(AccessModifier.Section, parentId, id);
646 switch (symbolDefinitionType) 646 switch (symbolDefinitionType)
647 { 647 {
648 case SymbolDefinitionType.ODBCAttribute: 648 case SymbolDefinitionType.ODBCAttribute:
@@ -1305,7 +1305,7 @@ namespace WixToolset.Core
1305 { 1305 {
1306 if (!this.Core.EncounteredError) 1306 if (!this.Core.EncounteredError)
1307 { 1307 {
1308 var symbol = this.Core.AddSymbol(new ProgIdSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, progId)) 1308 var symbol = this.Core.AddSymbol(new ProgIdSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, progId))
1309 { 1309 {
1310 ProgId = progId, 1310 ProgId = progId,
1311 ParentProgIdRef = parent, 1311 ParentProgIdRef = parent,
@@ -1486,7 +1486,7 @@ namespace WixToolset.Core
1486 { 1486 {
1487 if (complianceCheck && !this.Core.EncounteredError) 1487 if (complianceCheck && !this.Core.EncounteredError)
1488 { 1488 {
1489 this.Core.AddSymbol(new CCPSearchSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, sig))); 1489 this.Core.AddSymbol(new CCPSearchSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, sig)));
1490 } 1490 }
1491 1491
1492 this.AddAppSearch(sourceLineNumbers, id, sig); 1492 this.AddAppSearch(sourceLineNumbers, id, sig);
@@ -2612,7 +2612,7 @@ namespace WixToolset.Core
2612 { 2612 {
2613 if (suppress) 2613 if (suppress)
2614 { 2614 {
2615 this.Core.AddSymbol(new WixSuppressActionSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Public, sequenceTable, actionName)) 2615 this.Core.AddSymbol(new WixSuppressActionSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Global, sequenceTable, actionName))
2616 { 2616 {
2617 SequenceTable = sequenceTable, 2617 SequenceTable = sequenceTable,
2618 Action = actionName 2618 Action = actionName
@@ -2620,7 +2620,7 @@ namespace WixToolset.Core
2620 } 2620 }
2621 else 2621 else
2622 { 2622 {
2623 var symbol = this.Core.AddSymbol(new WixActionSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Public, sequenceTable, actionName)) 2623 var symbol = this.Core.AddSymbol(new WixActionSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Global, sequenceTable, actionName))
2624 { 2624 {
2625 SequenceTable = sequenceTable, 2625 SequenceTable = sequenceTable,
2626 Action = actionName, 2626 Action = actionName,
@@ -3735,7 +3735,7 @@ namespace WixToolset.Core
3735 3735
3736 if (!this.Core.EncounteredError) 3736 if (!this.Core.EncounteredError)
3737 { 3737 {
3738 this.Core.AddSymbol(new CustomActionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName)) 3738 this.Core.AddSymbol(new CustomActionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, actionName))
3739 { 3739 {
3740 ExecutionType = executionType, 3740 ExecutionType = executionType,
3741 SourceType = CustomActionSourceType.Directory, 3741 SourceType = CustomActionSourceType.Directory,
@@ -3746,7 +3746,7 @@ namespace WixToolset.Core
3746 3746
3747 foreach (var sequence in sequences) 3747 foreach (var sequence in sequences)
3748 { 3748 {
3749 this.Core.ScheduleActionSymbol(sourceLineNumbers, AccessModifier.Public, sequence, actionName, condition, afterAction: "CostInitialize"); 3749 this.Core.ScheduleActionSymbol(sourceLineNumbers, AccessModifier.Global, sequence, actionName, condition, afterAction: "CostInitialize");
3750 } 3750 }
3751 } 3751 }
3752 } 3752 }
@@ -3864,7 +3864,7 @@ namespace WixToolset.Core
3864 this.Core.Write(ErrorMessages.ActionScheduledRelativeToItself(sourceLineNumbers, node.Name.LocalName, "After", afterAction)); 3864 this.Core.Write(ErrorMessages.ActionScheduledRelativeToItself(sourceLineNumbers, node.Name.LocalName, "After", afterAction));
3865 } 3865 }
3866 3866
3867 this.Core.AddSymbol(new CustomActionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, actionName)) 3867 this.Core.AddSymbol(new CustomActionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, actionName))
3868 { 3868 {
3869 ExecutionType = executionType, 3869 ExecutionType = executionType,
3870 SourceType = CustomActionSourceType.Property, 3870 SourceType = CustomActionSourceType.Property,
@@ -3875,7 +3875,7 @@ namespace WixToolset.Core
3875 3875
3876 foreach (var sequence in sequences) 3876 foreach (var sequence in sequences)
3877 { 3877 {
3878 this.Core.ScheduleActionSymbol(sourceLineNumbers, AccessModifier.Public, sequence, actionName, condition, beforeAction, afterAction); 3878 this.Core.ScheduleActionSymbol(sourceLineNumbers, AccessModifier.Global, sequence, actionName, condition, beforeAction, afterAction);
3879 } 3879 }
3880 } 3880 }
3881 } 3881 }