diff options
| author | Rob Mensching <rob@firegiant.com> | 2024-03-07 09:41:29 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2024-03-07 10:55:57 -0800 |
| commit | 5baa1dfe8ba2a3bd4728bca118fe1de225f848d4 (patch) | |
| tree | 4f1c216075173e0e4d0863ada195f21d7ec976e0 /src/ext/NetFx/wixext | |
| parent | dea25ba9bcfd65200b60339c2e4bc060cdf20723 (diff) | |
| download | wix-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/NetFx/wixext')
| -rw-r--r-- | src/ext/NetFx/wixext/NetFxCompiler.cs | 18 | ||||
| -rw-r--r-- | src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/ext/NetFx/wixext/NetFxCompiler.cs b/src/ext/NetFx/wixext/NetFxCompiler.cs index bfadbe07..70e83cc9 100644 --- a/src/ext/NetFx/wixext/NetFxCompiler.cs +++ b/src/ext/NetFx/wixext/NetFxCompiler.cs | |||
| @@ -225,15 +225,15 @@ namespace WixToolset.Netfx | |||
| 225 | 225 | ||
| 226 | this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); | 226 | this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); |
| 227 | 227 | ||
| 228 | var bundleExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4NetfxBundleExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64); | 228 | var bootstrapperExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4NetfxBootstrapperExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64); |
| 229 | if (bundleExtensionId == null) | 229 | if (bootstrapperExtensionId == null) |
| 230 | { | 230 | { |
| 231 | this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName)); | 231 | this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName)); |
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | if (!this.Messaging.EncounteredError) | 234 | if (!this.Messaging.EncounteredError) |
| 235 | { | 235 | { |
| 236 | this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bundleExtensionId); | 236 | this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bootstrapperExtensionId); |
| 237 | 237 | ||
| 238 | section.AddSymbol(new NetFxNetCoreSearchSymbol(sourceLineNumbers, id) | 238 | section.AddSymbol(new NetFxNetCoreSearchSymbol(sourceLineNumbers, id) |
| 239 | { | 239 | { |
| @@ -354,15 +354,15 @@ namespace WixToolset.Netfx | |||
| 354 | 354 | ||
| 355 | this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); | 355 | this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); |
| 356 | 356 | ||
| 357 | var bundleExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4NetfxBundleExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64); | 357 | var bootstrapperExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4NetfxBootstrapperExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64); |
| 358 | if (bundleExtensionId == null) | 358 | if (bootstrapperExtensionId == null) |
| 359 | { | 359 | { |
| 360 | this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName)); | 360 | this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName)); |
| 361 | } | 361 | } |
| 362 | 362 | ||
| 363 | if (!this.Messaging.EncounteredError) | 363 | if (!this.Messaging.EncounteredError) |
| 364 | { | 364 | { |
| 365 | this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bundleExtensionId); | 365 | this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bootstrapperExtensionId); |
| 366 | 366 | ||
| 367 | section.AddSymbol(new NetFxNetCoreSdkSearchSymbol(sourceLineNumbers, id) | 367 | section.AddSymbol(new NetFxNetCoreSdkSearchSymbol(sourceLineNumbers, id) |
| 368 | { | 368 | { |
| @@ -503,15 +503,15 @@ namespace WixToolset.Netfx | |||
| 503 | 503 | ||
| 504 | this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); | 504 | this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); |
| 505 | 505 | ||
| 506 | var bundleExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4NetfxBundleExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64); | 506 | var bootstrapperExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4NetfxBootstrapperExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64); |
| 507 | if (bundleExtensionId == null) | 507 | if (bootstrapperExtensionId == null) |
| 508 | { | 508 | { |
| 509 | this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName)); | 509 | this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName)); |
| 510 | } | 510 | } |
| 511 | 511 | ||
| 512 | if (!this.Messaging.EncounteredError) | 512 | if (!this.Messaging.EncounteredError) |
| 513 | { | 513 | { |
| 514 | this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bundleExtensionId); | 514 | this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bootstrapperExtensionId); |
| 515 | 515 | ||
| 516 | section.AddSymbol(new NetFxNetCoreSdkFeatureBandSearchSymbol(sourceLineNumbers, id) | 516 | section.AddSymbol(new NetFxNetCoreSdkFeatureBandSearchSymbol(sourceLineNumbers, id) |
| 517 | { | 517 | { |
diff --git a/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs b/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs index 6371a951..cc25a3eb 100644 --- a/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs +++ b/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs | |||
| @@ -53,9 +53,9 @@ namespace WixToolset.Netfx | |||
| 53 | 53 | ||
| 54 | static NetfxSymbolDefinitions() | 54 | static NetfxSymbolDefinitions() |
| 55 | { | 55 | { |
| 56 | NetFxNetCoreSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag); | 56 | NetFxNetCoreSearch.AddTag(BurnConstants.BootstrapperExtensionSearchSymbolDefinitionTag); |
| 57 | NetFxNetCoreSdkSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag); | 57 | NetFxNetCoreSdkSearch.AddTag(BurnConstants.BootstrapperExtensionSearchSymbolDefinitionTag); |
| 58 | NetFxNetCoreSdkFeatureBandSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag); | 58 | NetFxNetCoreSdkFeatureBandSearch.AddTag(BurnConstants.BootstrapperExtensionSearchSymbolDefinitionTag); |
| 59 | } | 59 | } |
| 60 | } | 60 | } |
| 61 | } | 61 | } |
