From 7be5d94529c8419b4bd5da4dcd838795622643cb Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 6 Dec 2023 15:30:16 -0800
Subject: Link localizations from WixExtensions the same as sections

---
 src/ext/Bal/wixext/BalExtensionData.cs               | 6 ------
 src/ext/ComPlus/wixext/ComPlusExtensionData.cs       | 6 ------
 src/ext/ComPlus/wixlib/en-us.wxl                     | 2 +-
 src/ext/Dependency/wixext/DependencyExtensionData.cs | 6 ------
 src/ext/Dependency/wixlib/en-us.wxl                  | 2 +-
 src/ext/DirectX/wixext/DirectXExtensionData.cs       | 6 ------
 src/ext/Firewall/wixext/FirewallExtensionData.cs     | 2 --
 src/ext/Firewall/wixlib/en-us.wxl                    | 2 +-
 src/ext/Http/wixext/HttpExtensionData.cs             | 6 ------
 src/ext/Http/wixlib/en-us.wxl                        | 2 +-
 src/ext/Iis/wixext/IIsExtensionData.cs               | 6 ------
 src/ext/Iis/wixlib/en-us.wxl                         | 2 +-
 src/ext/Msmq/wixext/MsmqExtensionData.cs             | 6 ------
 src/ext/Msmq/wixlib/en-us.wxl                        | 2 +-
 src/ext/NetFx/wixext/NetFxExtensionData.cs           | 2 --
 src/ext/PowerShell/wixext/PSExtensionData.cs         | 6 ------
 src/ext/Sql/wixext/SqlExtensionData.cs               | 6 ------
 src/ext/Sql/wixlib/en-us.wxl                         | 2 +-
 src/ext/UI/wixext/UIExtensionData.cs                 | 2 --
 src/ext/UI/wixlib/WixUI_en-us.wxl                    | 2 +-
 src/ext/Util/wixext/UtilExtensionData.cs             | 2 --
 src/ext/Util/wixlib/en-us.wxl                        | 2 +-
 src/ext/VisualStudio/wixext/VSExtensionData.cs       | 6 ------
 23 files changed, 9 insertions(+), 77 deletions(-)

(limited to 'src/ext')

diff --git a/src/ext/Bal/wixext/BalExtensionData.cs b/src/ext/Bal/wixext/BalExtensionData.cs
index 55daf005..9dc99705 100644
--- a/src/ext/Bal/wixext/BalExtensionData.cs
+++ b/src/ext/Bal/wixext/BalExtensionData.cs
@@ -10,12 +10,6 @@ namespace WixToolset.Bal
     /// </summary>
     public sealed class BalExtensionData : BaseExtensionData
     {
-        /// <summary>
-        /// Gets the default culture.
-        /// </summary>
-        /// <value>The default culture.</value>
-        public override string DefaultCulture => "en-US";
-
         public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
         {
             symbolDefinition = BalSymbolDefinitions.ByName(name);
diff --git a/src/ext/ComPlus/wixext/ComPlusExtensionData.cs b/src/ext/ComPlus/wixext/ComPlusExtensionData.cs
index 9cd5341e..5e9d225d 100644
--- a/src/ext/ComPlus/wixext/ComPlusExtensionData.cs
+++ b/src/ext/ComPlus/wixext/ComPlusExtensionData.cs
@@ -10,12 +10,6 @@ namespace WixToolset.ComPlus
     /// </summary>
     public sealed class ComPlusExtensionData : BaseExtensionData
     {
-        /// <summary>
-        /// Gets the default culture.
-        /// </summary>
-        /// <value>The default culture.</value>
-        public override string DefaultCulture => "en-US";
-
         public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
         {
             symbolDefinition = ComPlusSymbolDefinitions.ByName(name);
diff --git a/src/ext/ComPlus/wixlib/en-us.wxl b/src/ext/ComPlus/wixlib/en-us.wxl
index 0ec0f55c..592cc641 100644
--- a/src/ext/ComPlus/wixlib/en-us.wxl
+++ b/src/ext/ComPlus/wixlib/en-us.wxl
@@ -1,7 +1,7 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
-<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+<WixLocalization Culture="en-us" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl">
   <String Id="msierrComPlusCannotConnect" Overridable="yes" Value="Cannot connect to the COM+ admin catalog.  ([2]   [3]   [4]   [5])" />
   <String Id="msierrComPlusPartitionReadFailed" Overridable="yes" Value="Failed to read COM+ partitions.  ([2]   [3]   [4]   [5])" />
   <String Id="msierrComPlusPartitionRoleReadFailed" Overridable="yes" Value="Failed to read COM+ partition roles.  ([2]   [3]   [4]   [5])" />
diff --git a/src/ext/Dependency/wixext/DependencyExtensionData.cs b/src/ext/Dependency/wixext/DependencyExtensionData.cs
index 2f30c2bf..c3c8fc03 100644
--- a/src/ext/Dependency/wixext/DependencyExtensionData.cs
+++ b/src/ext/Dependency/wixext/DependencyExtensionData.cs
@@ -10,12 +10,6 @@ namespace WixToolset.Dependency
     /// </summary>
     public sealed class DependencyExtensionData : BaseExtensionData
     {
-        /// <summary>
-        /// Gets the default culture.
-        /// </summary>
-        /// <value>The default culture.</value>
-        public override string DefaultCulture => "en-US";
-
         /// <summary>
         /// Gets the contained .wixlib content.
         /// </summary>
diff --git a/src/ext/Dependency/wixlib/en-us.wxl b/src/ext/Dependency/wixlib/en-us.wxl
index ca0a3ea6..9d6cc63a 100644
--- a/src/ext/Dependency/wixlib/en-us.wxl
+++ b/src/ext/Dependency/wixlib/en-us.wxl
@@ -1,7 +1,7 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
-<WixLocalization Culture="en-US" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+<WixLocalization Culture="en-US" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl">
     <String Id="msierrDependencyMissingDependencies" Overridable="yes" Value="If you continue with this install, the product may not work properly because [2] or more dependencies are missing. Do you want to continue with this install anyway?" />
     <String Id="msierrDependencyHasDependents" Overridable="yes" Value="If you continue with this uninstall, [2] or more products may stop working properly. Do you want to continue with this uninstall anyway?" />
 </WixLocalization>
diff --git a/src/ext/DirectX/wixext/DirectXExtensionData.cs b/src/ext/DirectX/wixext/DirectXExtensionData.cs
index d61af23f..e0d81979 100644
--- a/src/ext/DirectX/wixext/DirectXExtensionData.cs
+++ b/src/ext/DirectX/wixext/DirectXExtensionData.cs
@@ -10,12 +10,6 @@ namespace WixToolset.DirectX
     /// </summary>
     public sealed class DirectXExtensionData : BaseExtensionData
     {
-        /// <summary>
-        /// Gets the default culture.
-        /// </summary>
-        /// <value>The default culture.</value>
-        public override string DefaultCulture => "en-US";
-
         public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
         {
             return Intermediate.Load(typeof(DirectXExtensionData).Assembly, "WixToolset.DirectX.directx.wixlib", symbolDefinitions);
diff --git a/src/ext/Firewall/wixext/FirewallExtensionData.cs b/src/ext/Firewall/wixext/FirewallExtensionData.cs
index 7481d993..55a7b999 100644
--- a/src/ext/Firewall/wixext/FirewallExtensionData.cs
+++ b/src/ext/Firewall/wixext/FirewallExtensionData.cs
@@ -7,8 +7,6 @@ namespace WixToolset.Firewall
 
     public sealed class FirewallExtensionData : BaseExtensionData
     {
-        public override string DefaultCulture => "en-US";
-
         public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
         {
             symbolDefinition = FirewallSymbolDefinitions.ByName(name);
diff --git a/src/ext/Firewall/wixlib/en-us.wxl b/src/ext/Firewall/wixlib/en-us.wxl
index 52dbab55..64c5a1ac 100644
--- a/src/ext/Firewall/wixlib/en-us.wxl
+++ b/src/ext/Firewall/wixlib/en-us.wxl
@@ -1,7 +1,7 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
-<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+<WixLocalization Culture="en-us" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl">
     <String Id="msierrFirewallCannotConnect" Overridable="yes" Value="Cannot connect to Windows Firewall.  ([2]   [3]   [4]   [5])" />
     
     <String Id="WixSchedFirewallExceptionsInstall" Overridable="yes" Value="Configuring Windows Firewall" />
diff --git a/src/ext/Http/wixext/HttpExtensionData.cs b/src/ext/Http/wixext/HttpExtensionData.cs
index 04e3dcee..ff6934bd 100644
--- a/src/ext/Http/wixext/HttpExtensionData.cs
+++ b/src/ext/Http/wixext/HttpExtensionData.cs
@@ -10,12 +10,6 @@ namespace WixToolset.Http
     /// </summary>
     public sealed class HttpExtensionData : BaseExtensionData
     {
-        /// <summary>
-        /// Gets the default culture.
-        /// </summary>
-        /// <value>The default culture.</value>
-        public override string DefaultCulture => "en-US";
-
         public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
         {
             symbolDefinition = HttpSymbolDefinitions.ByName(name);
diff --git a/src/ext/Http/wixlib/en-us.wxl b/src/ext/Http/wixlib/en-us.wxl
index de3e93cd..44731a5f 100644
--- a/src/ext/Http/wixlib/en-us.wxl
+++ b/src/ext/Http/wixlib/en-us.wxl
@@ -1,6 +1,6 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+<WixLocalization Culture="en-us" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl">
     <String Id="WixSchedHttpUrlReservationsInstall" Overridable="yes" Value="Preparing to configure Windows HTTP Server" />
     <String Id="WixSchedHttpUrlReservationsUninstall" Overridable="yes" Value="Preparing to configure Windows HTTP Server" />
     <String Id="WixRollbackHttpUrlReservationsInstall" Overridable="yes" Value="Rolling back Windows HTTP Server configuration" />
diff --git a/src/ext/Iis/wixext/IIsExtensionData.cs b/src/ext/Iis/wixext/IIsExtensionData.cs
index 6a0e1f09..ccbe362d 100644
--- a/src/ext/Iis/wixext/IIsExtensionData.cs
+++ b/src/ext/Iis/wixext/IIsExtensionData.cs
@@ -10,12 +10,6 @@ namespace WixToolset.Iis
     /// </summary>
     public sealed class IIsExtensionData : BaseExtensionData
     {
-        /// <summary>
-        /// Gets the default culture.
-        /// </summary>
-        /// <value>The default culture.</value>
-        public override string DefaultCulture => "en-US";
-
         public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
         {
             symbolDefinition = IisSymbolDefinitions.ByName(name);
diff --git a/src/ext/Iis/wixlib/en-us.wxl b/src/ext/Iis/wixlib/en-us.wxl
index 1b6096fb..65bc1435 100644
--- a/src/ext/Iis/wixlib/en-us.wxl
+++ b/src/ext/Iis/wixlib/en-us.wxl
@@ -1,7 +1,7 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
-<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+<WixLocalization Culture="en-us" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl">
     <String Id="msierrIISCannotConnect" Overridable="yes" Value="Cannot connect to Internet Information Server.  ([2]   [3]   [4]   [5])" />
     <String Id="msierrIISFailedReadWebSite" Overridable="yes" Value="Failed while processing WebSites.   ([2]   [3]   [4]   [5])" />
     <String Id="msierrIISFailedReadWebDirs" Overridable="yes" Value="Failed while processing WebDirs.  ([2]   [3]   [4]   [5])" />
diff --git a/src/ext/Msmq/wixext/MsmqExtensionData.cs b/src/ext/Msmq/wixext/MsmqExtensionData.cs
index 91485724..f434001f 100644
--- a/src/ext/Msmq/wixext/MsmqExtensionData.cs
+++ b/src/ext/Msmq/wixext/MsmqExtensionData.cs
@@ -10,12 +10,6 @@ namespace WixToolset.Msmq
     /// </summary>
     public sealed class MsmqExtensionData : BaseExtensionData
     {
-        /// <summary>
-        /// Gets the default culture.
-        /// </summary>
-        /// <value>The default culture.</value>
-        public override string DefaultCulture => "en-US";
-
         public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
         {
             symbolDefinition = MsmqSymbolDefinitions.ByName(name);
diff --git a/src/ext/Msmq/wixlib/en-us.wxl b/src/ext/Msmq/wixlib/en-us.wxl
index 3252fc17..9965ca51 100644
--- a/src/ext/Msmq/wixlib/en-us.wxl
+++ b/src/ext/Msmq/wixlib/en-us.wxl
@@ -1,7 +1,7 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
-<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+<WixLocalization Culture="en-us" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl">
   <String Id="MessageQueuingExecuteInstall" Overridable="yes" Value="Configuring message queues" />
   <String Id="MessageQueuingExecuteInstallTemplate" Overridable="yes" Value="Queue: [1]" />
   <String Id="MessageQueuingExecuteUninstall" Overridable="yes" Value="Configuring message queues" />
diff --git a/src/ext/NetFx/wixext/NetFxExtensionData.cs b/src/ext/NetFx/wixext/NetFxExtensionData.cs
index 8dd9e003..61d618cf 100644
--- a/src/ext/NetFx/wixext/NetFxExtensionData.cs
+++ b/src/ext/NetFx/wixext/NetFxExtensionData.cs
@@ -10,8 +10,6 @@ namespace WixToolset.Netfx
     /// </summary>
     public sealed class NetfxExtensionData : BaseExtensionData
     {
-        public override string DefaultCulture => "en-US";
-        
         public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
         {
             symbolDefinition = NetfxSymbolDefinitions.ByName(name);
diff --git a/src/ext/PowerShell/wixext/PSExtensionData.cs b/src/ext/PowerShell/wixext/PSExtensionData.cs
index 66627942..8ba83498 100644
--- a/src/ext/PowerShell/wixext/PSExtensionData.cs
+++ b/src/ext/PowerShell/wixext/PSExtensionData.cs
@@ -10,12 +10,6 @@ namespace WixToolset.PowerShell
     /// </summary>
     public sealed class PSExtensionData : BaseExtensionData
     {
-        /// <summary>
-        /// Gets the default culture.
-        /// </summary>
-        /// <value>The default culture.</value>
-        public override string DefaultCulture => "en-US";
-
         public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
         {
             return Intermediate.Load(typeof(PSExtensionData).Assembly, "WixToolset.PowerShell.powershell.wixlib", symbolDefinitions);
diff --git a/src/ext/Sql/wixext/SqlExtensionData.cs b/src/ext/Sql/wixext/SqlExtensionData.cs
index 60de94fe..77a86bde 100644
--- a/src/ext/Sql/wixext/SqlExtensionData.cs
+++ b/src/ext/Sql/wixext/SqlExtensionData.cs
@@ -10,12 +10,6 @@ namespace WixToolset.Sql
     /// </summary>
     public sealed class SqlExtensionData : BaseExtensionData
     {
-        /// <summary>
-        /// Gets the default culture.
-        /// </summary>
-        /// <value>The default culture.</value>
-        public override string DefaultCulture => "en-US";
-
         public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
         {
             symbolDefinition = SqlSymbolDefinitions.ByName(name);
diff --git a/src/ext/Sql/wixlib/en-us.wxl b/src/ext/Sql/wixlib/en-us.wxl
index 9e6e8765..654970a8 100644
--- a/src/ext/Sql/wixlib/en-us.wxl
+++ b/src/ext/Sql/wixlib/en-us.wxl
@@ -1,7 +1,7 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
-<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+<WixLocalization Culture="en-us" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl">
     <String Id="msierrSQLFailedCreateDatabase" Overridable="yes" Value="Error [2]: failed to create SQL database: [3], error detail: [4]." />
     <String Id="msierrSQLFailedDropDatabase" Overridable="yes" Value="Error [2]: failed to drop SQL database: [3], error detail: [4]." />
     <String Id="msierrSQLFailedConnectDatabase" Overridable="yes" Value="Failed to connect to SQL database.  ([2]   [3]   [4]   [5])" />
diff --git a/src/ext/UI/wixext/UIExtensionData.cs b/src/ext/UI/wixext/UIExtensionData.cs
index 32557029..349a5912 100644
--- a/src/ext/UI/wixext/UIExtensionData.cs
+++ b/src/ext/UI/wixext/UIExtensionData.cs
@@ -7,8 +7,6 @@ namespace WixToolset.UI
 
     public sealed class UIExtensionData : BaseExtensionData
     {
-        public override string DefaultCulture => "en-US";
-
         public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
         {
             symbolDefinition = null;
diff --git a/src/ext/UI/wixlib/WixUI_en-us.wxl b/src/ext/UI/wixlib/WixUI_en-us.wxl
index c9904b61..a06f8b17 100644
--- a/src/ext/UI/wixlib/WixUI_en-us.wxl
+++ b/src/ext/UI/wixlib/WixUI_en-us.wxl
@@ -1,7 +1,7 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
-<WixLocalization Culture="en-US" Codepage="1252" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+<WixLocalization Culture="en-US" ExtensionDefaultCulture="yes" Codepage="1252" xmlns="http://wixtoolset.org/schemas/v4/wxl">
     <!-- _locID@Culture="en-US" _locComment="American English" -->
     <!-- _locID@Codepage="1252" _locComment="Windows-1252" -->
 
diff --git a/src/ext/Util/wixext/UtilExtensionData.cs b/src/ext/Util/wixext/UtilExtensionData.cs
index d3ca3358..c9de2876 100644
--- a/src/ext/Util/wixext/UtilExtensionData.cs
+++ b/src/ext/Util/wixext/UtilExtensionData.cs
@@ -7,8 +7,6 @@ namespace WixToolset.Util
 
     public sealed class UtilExtensionData : BaseExtensionData
     {
-        public override string DefaultCulture => "en-US";
-
         public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
         {
             symbolDefinition = UtilSymbolDefinitions.ByName(name);
diff --git a/src/ext/Util/wixlib/en-us.wxl b/src/ext/Util/wixlib/en-us.wxl
index fc2db184..b144989e 100644
--- a/src/ext/Util/wixlib/en-us.wxl
+++ b/src/ext/Util/wixlib/en-us.wxl
@@ -1,7 +1,7 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
-<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+<WixLocalization Culture="en-us" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl">
     <String Id="msierrUSRFailedUserCreate" Overridable="yes" Value="Failed to create user.  ([2]   [3]   [4]   [5])" />
     <String Id="msierrUSRFailedUserCreatePswd" Overridable="yes" Value="Failed to create user due to invalid password.  ([2]   [3]   [4]   [5])" />
     <String Id="msierrUSRFailedUserGroupAdd" Overridable="yes" Value="Failed to add user to group.  ([2]   [3]   [4]   [5])" />
diff --git a/src/ext/VisualStudio/wixext/VSExtensionData.cs b/src/ext/VisualStudio/wixext/VSExtensionData.cs
index 82c5b118..9477ce67 100644
--- a/src/ext/VisualStudio/wixext/VSExtensionData.cs
+++ b/src/ext/VisualStudio/wixext/VSExtensionData.cs
@@ -7,12 +7,6 @@ namespace WixToolset.VisualStudio
 
     public sealed class VSExtensionData : BaseExtensionData
     {
-        /// <summary>
-        /// Gets the default culture.
-        /// </summary>
-        /// <value>The default culture.</value>
-        public override string DefaultCulture => "en-US";
-
         public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
         {
             return Intermediate.Load(typeof(VSExtensionData).Assembly, "WixToolset.VisualStudio.vs.wixlib", symbolDefinitions);
-- 
cgit v1.2.3-55-g6feb