aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Util/wixext
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2024-03-07 09:41:29 -0800
committerRob Mensching <rob@firegiant.com>2024-03-07 10:55:57 -0800
commit5baa1dfe8ba2a3bd4728bca118fe1de225f848d4 (patch)
tree4f1c216075173e0e4d0863ada195f21d7ec976e0 /src/ext/Util/wixext
parentdea25ba9bcfd65200b60339c2e4bc060cdf20723 (diff)
downloadwix-5baa1dfe8ba2a3bd4728bca118fe1de225f848d4.tar.gz
wix-5baa1dfe8ba2a3bd4728bca118fe1de225f848d4.tar.bz2
wix-5baa1dfe8ba2a3bd4728bca118fe1de225f848d4.zip
Rename "bundle extension" to "bootstrapper extension" for more consistency
Also renames WixToolet.BextUtil nupkg to WixToolset.BootstrapperExtensionApi.
Diffstat (limited to 'src/ext/Util/wixext')
-rw-r--r--src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs4
-rw-r--r--src/ext/Util/wixext/UtilCompiler.cs6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs b/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs
index 3b357a96..8152868f 100644
--- a/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs
+++ b/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs
@@ -94,7 +94,7 @@ namespace WixToolset.Util
94 94
95 case UtilSymbolDefinitionType.WixRemoveRegistryKeyEx: 95 case UtilSymbolDefinitionType.WixRemoveRegistryKeyEx:
96 return UtilSymbolDefinitions.WixRemoveRegistryKeyEx; 96 return UtilSymbolDefinitions.WixRemoveRegistryKeyEx;
97 97
98 case UtilSymbolDefinitionType.WixRestartResource: 98 case UtilSymbolDefinitionType.WixRestartResource:
99 return UtilSymbolDefinitions.WixRestartResource; 99 return UtilSymbolDefinitions.WixRestartResource;
100 100
@@ -117,7 +117,7 @@ namespace WixToolset.Util
117 117
118 static UtilSymbolDefinitions() 118 static UtilSymbolDefinitions()
119 { 119 {
120 WixWindowsFeatureSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag); 120 WixWindowsFeatureSearch.AddTag(BurnConstants.BootstrapperExtensionSearchSymbolDefinitionTag);
121 } 121 }
122 } 122 }
123} 123}
diff --git a/src/ext/Util/wixext/UtilCompiler.cs b/src/ext/Util/wixext/UtilCompiler.cs
index 6221c052..3bcd2c0b 100644
--- a/src/ext/Util/wixext/UtilCompiler.cs
+++ b/src/ext/Util/wixext/UtilCompiler.cs
@@ -611,15 +611,15 @@ namespace WixToolset.Util
611 611
612 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); 612 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
613 613
614 var bundleExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4UtilBundleExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64); 614 var bootstrapperExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4UtilBootstrapperExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64);
615 if (bundleExtensionId == null) 615 if (bootstrapperExtensionId == null)
616 { 616 {
617 this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName)); 617 this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName));
618 } 618 }
619 619
620 if (!this.Messaging.EncounteredError) 620 if (!this.Messaging.EncounteredError)
621 { 621 {
622 this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bundleExtensionId); 622 this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bootstrapperExtensionId);
623 623
624 section.AddSymbol(new WixWindowsFeatureSearchSymbol(sourceLineNumbers, id) 624 section.AddSymbol(new WixWindowsFeatureSearchSymbol(sourceLineNumbers, id)
625 { 625 {