aboutsummaryrefslogtreecommitdiff
path: root/src/test/burn/ForTestingUseOnlyExtension
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2024-12-29 18:01:20 -0800
committerRob Mensching <rob@firegiant.com>2024-12-30 06:45:49 -0800
commit523c66a62a619e6aa9f30070173ea33edfb5e328 (patch)
tree04fa3146250b7eeaa6864b0f71e37905a2d77be1 /src/test/burn/ForTestingUseOnlyExtension
parent6edc5d1e2a289eac50c6d59a29e195353bb023cb (diff)
downloadwix-523c66a62a619e6aa9f30070173ea33edfb5e328.tar.gz
wix-523c66a62a619e6aa9f30070173ea33edfb5e328.tar.bz2
wix-523c66a62a619e6aa9f30070173ea33edfb5e328.zip
Rename "bundle id" concept to "bundle code"
The "bundle id" always had more in common with the PackageCode from the Windows Installer. With the introduction of an actual Id attribute on the Bundle element, there is potential for confusion, so there is finally real motivation to rename "bundle id" to "bundle code".
Diffstat (limited to 'src/test/burn/ForTestingUseOnlyExtension')
-rw-r--r--src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs2
-rw-r--r--src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs10
-rw-r--r--src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs10
3 files changed, 11 insertions, 11 deletions
diff --git a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs
index fff23274..cb97984f 100644
--- a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs
+++ b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs
@@ -37,7 +37,7 @@ namespace ForTestingUseOnly
37 } 37 }
38 38
39 var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single(); 39 var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single();
40 bundleSymbol.ProviderKey = bundleSymbol.BundleId = forTestingUseOnlyBundleSymbol.BundleId; 40 bundleSymbol.ProviderKey = bundleSymbol.BundleCode = forTestingUseOnlyBundleSymbol.BundleCode;
41 } 41 }
42 } 42 }
43} 43}
diff --git a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs
index 4963c941..f6ff7f87 100644
--- a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs
+++ b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs
@@ -32,7 +32,7 @@ namespace ForTestingUseOnly
32 private void ParseForTestingUseOnlyBundleElement(Intermediate intermediate, IntermediateSection section, XElement element) 32 private void ParseForTestingUseOnlyBundleElement(Intermediate intermediate, IntermediateSection section, XElement element)
33 { 33 {
34 var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); 34 var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
35 string bundleId = null; 35 string bundleCode = null;
36 36
37 foreach (var attrib in element.Attributes()) 37 foreach (var attrib in element.Attributes())
38 { 38 {
@@ -41,7 +41,7 @@ namespace ForTestingUseOnly
41 switch (attrib.Name.LocalName) 41 switch (attrib.Name.LocalName)
42 { 42 {
43 case "Id": 43 case "Id":
44 bundleId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); 44 bundleCode = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
45 break; 45 break;
46 default: 46 default:
47 this.ParseHelper.UnexpectedAttribute(element, attrib); 47 this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -54,13 +54,13 @@ namespace ForTestingUseOnly
54 } 54 }
55 } 55 }
56 56
57 if (null == bundleId) 57 if (null == bundleCode)
58 { 58 {
59 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); 59 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id"));
60 } 60 }
61 else 61 else
62 { 62 {
63 bundleId = Guid.Parse(bundleId).ToString("B").ToUpperInvariant(); 63 bundleCode = Guid.Parse(bundleCode).ToString("B").ToUpperInvariant();
64 } 64 }
65 65
66 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); 66 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
@@ -69,7 +69,7 @@ namespace ForTestingUseOnly
69 { 69 {
70 section.AddSymbol(new ForTestingUseOnlyBundleSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "ForTestingUseOnlyBundle")) 70 section.AddSymbol(new ForTestingUseOnlyBundleSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "ForTestingUseOnlyBundle"))
71 { 71 {
72 BundleId = bundleId, 72 BundleCode = bundleCode,
73 }); 73 });
74 } 74 }
75 } 75 }
diff --git a/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs b/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs
index a17dfe31..6cf9dabb 100644
--- a/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs
+++ b/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs
@@ -11,7 +11,7 @@ namespace ForTestingUseOnly
11 ForTestingUseOnlySymbolDefinitionType.ForTestingUseOnlyBundle.ToString(), 11 ForTestingUseOnlySymbolDefinitionType.ForTestingUseOnlyBundle.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(ForTestingUseOnlyBundleSymbolFields.BundleId), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(ForTestingUseOnlyBundleSymbolFields.BundleCode), IntermediateFieldType.String),
15 }, 15 },
16 typeof(ForTestingUseOnlyBundleSymbol)); 16 typeof(ForTestingUseOnlyBundleSymbol));
17 } 17 }
@@ -23,7 +23,7 @@ namespace ForTestingUseOnly.Symbols
23 23
24 public enum ForTestingUseOnlyBundleSymbolFields 24 public enum ForTestingUseOnlyBundleSymbolFields
25 { 25 {
26 BundleId, 26 BundleCode,
27 } 27 }
28 28
29 public class ForTestingUseOnlyBundleSymbol : IntermediateSymbol 29 public class ForTestingUseOnlyBundleSymbol : IntermediateSymbol
@@ -38,10 +38,10 @@ namespace ForTestingUseOnly.Symbols
38 38
39 public IntermediateField this[ForTestingUseOnlyBundleSymbolFields index] => this.Fields[(int)index]; 39 public IntermediateField this[ForTestingUseOnlyBundleSymbolFields index] => this.Fields[(int)index];
40 40
41 public string BundleId 41 public string BundleCode
42 { 42 {
43 get => this.Fields[(int)ForTestingUseOnlyBundleSymbolFields.BundleId].AsString(); 43 get => this.Fields[(int)ForTestingUseOnlyBundleSymbolFields.BundleCode].AsString();
44 set => this.Set((int)ForTestingUseOnlyBundleSymbolFields.BundleId, value); 44 set => this.Set((int)ForTestingUseOnlyBundleSymbolFields.BundleCode, value);
45 } 45 }
46 } 46 }
47} 47}