diff options
Diffstat (limited to 'src/WixToolset.Core/Compiler_Bundle.cs')
-rw-r--r-- | src/WixToolset.Core/Compiler_Bundle.cs | 28 |
1 files changed, 14 insertions, 14 deletions
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 | |||
19 | /// </summary> | 19 | /// </summary> |
20 | internal partial class Compiler : ICompiler | 20 | internal partial class Compiler : ICompiler |
21 | { | 21 | { |
22 | private static readonly Identifier BurnUXContainerId = new Identifier(AccessModifier.Private, BurnConstants.BurnUXContainerName); | 22 | private static readonly Identifier BurnUXContainerId = new Identifier(AccessModifier.Section, BurnConstants.BurnUXContainerName); |
23 | private static readonly Identifier BurnDefaultAttachedContainerId = new Identifier(AccessModifier.Private, BurnConstants.BurnDefaultAttachedContainerName); | 23 | private static readonly Identifier BurnDefaultAttachedContainerId = new Identifier(AccessModifier.Section, BurnConstants.BurnDefaultAttachedContainerName); |
24 | private static readonly Identifier BundleLayoutOnlyPayloads = new Identifier(AccessModifier.Private, BurnConstants.BundleLayoutOnlyPayloadsName); | 24 | private static readonly Identifier BundleLayoutOnlyPayloads = new Identifier(AccessModifier.Section, BurnConstants.BundleLayoutOnlyPayloadsName); |
25 | 25 | ||
26 | /// <summary> | 26 | /// <summary> |
27 | /// Parses an ApprovedExeForElevation element. | 27 | /// Parses an ApprovedExeForElevation element. |
@@ -427,25 +427,25 @@ namespace WixToolset.Core | |||
427 | }); | 427 | }); |
428 | 428 | ||
429 | // Ensure that the bundle stores the well-known persisted values. | 429 | // Ensure that the bundle stores the well-known persisted values. |
430 | this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_NAME)) | 430 | this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, BurnConstants.BURN_BUNDLE_NAME)) |
431 | { | 431 | { |
432 | Hidden = false, | 432 | Hidden = false, |
433 | Persisted = true, | 433 | Persisted = true, |
434 | }); | 434 | }); |
435 | 435 | ||
436 | this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_ORIGINAL_SOURCE)) | 436 | this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, BurnConstants.BURN_BUNDLE_ORIGINAL_SOURCE)) |
437 | { | 437 | { |
438 | Hidden = false, | 438 | Hidden = false, |
439 | Persisted = true, | 439 | Persisted = true, |
440 | }); | 440 | }); |
441 | 441 | ||
442 | this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_ORIGINAL_SOURCE_FOLDER)) | 442 | this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, BurnConstants.BURN_BUNDLE_ORIGINAL_SOURCE_FOLDER)) |
443 | { | 443 | { |
444 | Hidden = false, | 444 | Hidden = false, |
445 | Persisted = true, | 445 | Persisted = true, |
446 | }); | 446 | }); |
447 | 447 | ||
448 | this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, BurnConstants.BURN_BUNDLE_LAST_USED_SOURCE)) | 448 | this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, BurnConstants.BURN_BUNDLE_LAST_USED_SOURCE)) |
449 | { | 449 | { |
450 | Hidden = false, | 450 | Hidden = false, |
451 | Persisted = true, | 451 | Persisted = true, |
@@ -946,7 +946,7 @@ namespace WixToolset.Core | |||
946 | { | 946 | { |
947 | var attributeNames = String.Join(new string(WixBundleCustomDataSymbol.AttributeNamesSeparator, 1), attributeDefinitions.Select(c => c.Name)); | 947 | var attributeNames = String.Join(new string(WixBundleCustomDataSymbol.AttributeNamesSeparator, 1), attributeDefinitions.Select(c => c.Name)); |
948 | 948 | ||
949 | this.Core.AddSymbol(new WixBundleCustomDataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, customDataId)) | 949 | this.Core.AddSymbol(new WixBundleCustomDataSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, customDataId)) |
950 | { | 950 | { |
951 | AttributeNames = attributeNames, | 951 | AttributeNames = attributeNames, |
952 | Type = customDataType.Value, | 952 | Type = customDataType.Value, |
@@ -1052,7 +1052,7 @@ namespace WixToolset.Core | |||
1052 | return null; | 1052 | return null; |
1053 | } | 1053 | } |
1054 | 1054 | ||
1055 | var customDataAttribute = this.Core.AddSymbol(new WixBundleCustomDataAttributeSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, customDataId, attributeName)) | 1055 | var customDataAttribute = this.Core.AddSymbol(new WixBundleCustomDataAttributeSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, customDataId, attributeName)) |
1056 | { | 1056 | { |
1057 | CustomDataRef = customDataId, | 1057 | CustomDataRef = customDataId, |
1058 | Name = attributeName, | 1058 | Name = attributeName, |
@@ -1106,7 +1106,7 @@ namespace WixToolset.Core | |||
1106 | 1106 | ||
1107 | if (!this.Core.EncounteredError) | 1107 | if (!this.Core.EncounteredError) |
1108 | { | 1108 | { |
1109 | this.Core.AddSymbol(new WixBundleCustomDataCellSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Private, customDataId, elementId, attributeName)) | 1109 | this.Core.AddSymbol(new WixBundleCustomDataCellSymbol(childSourceLineNumbers, new Identifier(AccessModifier.Section, customDataId, elementId, attributeName)) |
1110 | { | 1110 | { |
1111 | ElementId = elementId, | 1111 | ElementId = elementId, |
1112 | AttributeRef = attributeName, | 1112 | AttributeRef = attributeName, |
@@ -1822,7 +1822,7 @@ namespace WixToolset.Core | |||
1822 | } | 1822 | } |
1823 | 1823 | ||
1824 | // Ensure there is always a rollback boundary at the beginning of the chain. | 1824 | // Ensure there is always a rollback boundary at the beginning of the chain. |
1825 | this.CreateRollbackBoundary(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixDefaultBoundary"), YesNoType.Yes, YesNoType.No, ComplexReferenceParentType.PackageGroup, "WixChain", ComplexReferenceChildType.Unknown, null); | 1825 | this.CreateRollbackBoundary(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixDefaultBoundary"), YesNoType.Yes, YesNoType.No, ComplexReferenceParentType.PackageGroup, "WixChain", ComplexReferenceChildType.Unknown, null); |
1826 | 1826 | ||
1827 | var previousId = "WixDefaultBoundary"; | 1827 | var previousId = "WixDefaultBoundary"; |
1828 | var previousType = ComplexReferenceChildType.Package; | 1828 | var previousType = ComplexReferenceChildType.Package; |
@@ -2856,7 +2856,7 @@ namespace WixToolset.Core | |||
2856 | 2856 | ||
2857 | if (!this.Core.EncounteredError) | 2857 | if (!this.Core.EncounteredError) |
2858 | { | 2858 | { |
2859 | var symbol = this.Core.AddSymbol(new WixBundleMsiPropertySymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, packageId, name)) | 2859 | var symbol = this.Core.AddSymbol(new WixBundleMsiPropertySymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, packageId, name)) |
2860 | { | 2860 | { |
2861 | PackageRef = packageId, | 2861 | PackageRef = packageId, |
2862 | Name = name, | 2862 | Name = name, |
@@ -2910,7 +2910,7 @@ namespace WixToolset.Core | |||
2910 | 2910 | ||
2911 | if (!this.Core.EncounteredError) | 2911 | if (!this.Core.EncounteredError) |
2912 | { | 2912 | { |
2913 | this.Core.AddSymbol(new WixBundleSlipstreamMspSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, packageId, id)) | 2913 | this.Core.AddSymbol(new WixBundleSlipstreamMspSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, packageId, id)) |
2914 | { | 2914 | { |
2915 | TargetPackageRef = packageId, | 2915 | TargetPackageRef = packageId, |
2916 | MspPackageRef = id | 2916 | MspPackageRef = id |
@@ -3179,7 +3179,7 @@ namespace WixToolset.Core | |||
3179 | 3179 | ||
3180 | if (!this.Core.EncounteredError) | 3180 | if (!this.Core.EncounteredError) |
3181 | { | 3181 | { |
3182 | this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, name)) | 3182 | this.Core.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, name)) |
3183 | { | 3183 | { |
3184 | Value = value, | 3184 | Value = value, |
3185 | Type = type, | 3185 | Type = type, |