diff options
author | Rob Mensching <rob@firegiant.com> | 2023-12-06 15:30:16 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2023-12-16 14:32:21 -0800 |
commit | 7be5d94529c8419b4bd5da4dcd838795622643cb (patch) | |
tree | 671f4361b47e3f03a1cb71facb1c533a0119d5e1 /src/ext | |
parent | 1bdcbeb08dfdcbec0929db19569e0eaa13de9c0e (diff) | |
download | wix-7be5d94529c8419b4bd5da4dcd838795622643cb.tar.gz wix-7be5d94529c8419b4bd5da4dcd838795622643cb.tar.bz2 wix-7be5d94529c8419b4bd5da4dcd838795622643cb.zip |
Link localizations from WixExtensions the same as sections
Diffstat (limited to 'src/ext')
23 files changed, 9 insertions, 77 deletions
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 | |||
10 | /// </summary> | 10 | /// </summary> |
11 | public sealed class BalExtensionData : BaseExtensionData | 11 | public sealed class BalExtensionData : BaseExtensionData |
12 | { | 12 | { |
13 | /// <summary> | ||
14 | /// Gets the default culture. | ||
15 | /// </summary> | ||
16 | /// <value>The default culture.</value> | ||
17 | public override string DefaultCulture => "en-US"; | ||
18 | |||
19 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) | 13 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) |
20 | { | 14 | { |
21 | symbolDefinition = BalSymbolDefinitions.ByName(name); | 15 | 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 | |||
10 | /// </summary> | 10 | /// </summary> |
11 | public sealed class ComPlusExtensionData : BaseExtensionData | 11 | public sealed class ComPlusExtensionData : BaseExtensionData |
12 | { | 12 | { |
13 | /// <summary> | ||
14 | /// Gets the default culture. | ||
15 | /// </summary> | ||
16 | /// <value>The default culture.</value> | ||
17 | public override string DefaultCulture => "en-US"; | ||
18 | |||
19 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) | 13 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) |
20 | { | 14 | { |
21 | symbolDefinition = ComPlusSymbolDefinitions.ByName(name); | 15 | 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 @@ | |||
1 | <!-- 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. --> | 1 | <!-- 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. --> |
2 | 2 | ||
3 | 3 | ||
4 | <WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl"> | 4 | <WixLocalization Culture="en-us" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl"> |
5 | <String Id="msierrComPlusCannotConnect" Overridable="yes" Value="Cannot connect to the COM+ admin catalog. ([2] [3] [4] [5])" /> | 5 | <String Id="msierrComPlusCannotConnect" Overridable="yes" Value="Cannot connect to the COM+ admin catalog. ([2] [3] [4] [5])" /> |
6 | <String Id="msierrComPlusPartitionReadFailed" Overridable="yes" Value="Failed to read COM+ partitions. ([2] [3] [4] [5])" /> | 6 | <String Id="msierrComPlusPartitionReadFailed" Overridable="yes" Value="Failed to read COM+ partitions. ([2] [3] [4] [5])" /> |
7 | <String Id="msierrComPlusPartitionRoleReadFailed" Overridable="yes" Value="Failed to read COM+ partition roles. ([2] [3] [4] [5])" /> | 7 | <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 | |||
@@ -11,12 +11,6 @@ namespace WixToolset.Dependency | |||
11 | public sealed class DependencyExtensionData : BaseExtensionData | 11 | public sealed class DependencyExtensionData : BaseExtensionData |
12 | { | 12 | { |
13 | /// <summary> | 13 | /// <summary> |
14 | /// Gets the default culture. | ||
15 | /// </summary> | ||
16 | /// <value>The default culture.</value> | ||
17 | public override string DefaultCulture => "en-US"; | ||
18 | |||
19 | /// <summary> | ||
20 | /// Gets the contained .wixlib content. | 14 | /// Gets the contained .wixlib content. |
21 | /// </summary> | 15 | /// </summary> |
22 | /// <param name="symbolDefinitions">Strong typed symbold definitions.</param> | 16 | /// <param name="symbolDefinitions">Strong typed symbold definitions.</param> |
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 @@ | |||
1 | <!-- 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. --> | 1 | <!-- 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. --> |
2 | 2 | ||
3 | 3 | ||
4 | <WixLocalization Culture="en-US" xmlns="http://wixtoolset.org/schemas/v4/wxl"> | 4 | <WixLocalization Culture="en-US" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl"> |
5 | <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?" /> | 5 | <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?" /> |
6 | <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?" /> | 6 | <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?" /> |
7 | </WixLocalization> | 7 | </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 | |||
10 | /// </summary> | 10 | /// </summary> |
11 | public sealed class DirectXExtensionData : BaseExtensionData | 11 | public sealed class DirectXExtensionData : BaseExtensionData |
12 | { | 12 | { |
13 | /// <summary> | ||
14 | /// Gets the default culture. | ||
15 | /// </summary> | ||
16 | /// <value>The default culture.</value> | ||
17 | public override string DefaultCulture => "en-US"; | ||
18 | |||
19 | public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) | 13 | public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) |
20 | { | 14 | { |
21 | return Intermediate.Load(typeof(DirectXExtensionData).Assembly, "WixToolset.DirectX.directx.wixlib", symbolDefinitions); | 15 | 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 | |||
7 | 7 | ||
8 | public sealed class FirewallExtensionData : BaseExtensionData | 8 | public sealed class FirewallExtensionData : BaseExtensionData |
9 | { | 9 | { |
10 | public override string DefaultCulture => "en-US"; | ||
11 | |||
12 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) | 10 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) |
13 | { | 11 | { |
14 | symbolDefinition = FirewallSymbolDefinitions.ByName(name); | 12 | 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 @@ | |||
1 | <!-- 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. --> | 1 | <!-- 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. --> |
2 | 2 | ||
3 | 3 | ||
4 | <WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl"> | 4 | <WixLocalization Culture="en-us" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl"> |
5 | <String Id="msierrFirewallCannotConnect" Overridable="yes" Value="Cannot connect to Windows Firewall. ([2] [3] [4] [5])" /> | 5 | <String Id="msierrFirewallCannotConnect" Overridable="yes" Value="Cannot connect to Windows Firewall. ([2] [3] [4] [5])" /> |
6 | 6 | ||
7 | <String Id="WixSchedFirewallExceptionsInstall" Overridable="yes" Value="Configuring Windows Firewall" /> | 7 | <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 | |||
10 | /// </summary> | 10 | /// </summary> |
11 | public sealed class HttpExtensionData : BaseExtensionData | 11 | public sealed class HttpExtensionData : BaseExtensionData |
12 | { | 12 | { |
13 | /// <summary> | ||
14 | /// Gets the default culture. | ||
15 | /// </summary> | ||
16 | /// <value>The default culture.</value> | ||
17 | public override string DefaultCulture => "en-US"; | ||
18 | |||
19 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) | 13 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) |
20 | { | 14 | { |
21 | symbolDefinition = HttpSymbolDefinitions.ByName(name); | 15 | 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 @@ | |||
1 | <!-- 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. --> | 1 | <!-- 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. --> |
2 | 2 | ||
3 | <WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl"> | 3 | <WixLocalization Culture="en-us" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl"> |
4 | <String Id="WixSchedHttpUrlReservationsInstall" Overridable="yes" Value="Preparing to configure Windows HTTP Server" /> | 4 | <String Id="WixSchedHttpUrlReservationsInstall" Overridable="yes" Value="Preparing to configure Windows HTTP Server" /> |
5 | <String Id="WixSchedHttpUrlReservationsUninstall" Overridable="yes" Value="Preparing to configure Windows HTTP Server" /> | 5 | <String Id="WixSchedHttpUrlReservationsUninstall" Overridable="yes" Value="Preparing to configure Windows HTTP Server" /> |
6 | <String Id="WixRollbackHttpUrlReservationsInstall" Overridable="yes" Value="Rolling back Windows HTTP Server configuration" /> | 6 | <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 | |||
10 | /// </summary> | 10 | /// </summary> |
11 | public sealed class IIsExtensionData : BaseExtensionData | 11 | public sealed class IIsExtensionData : BaseExtensionData |
12 | { | 12 | { |
13 | /// <summary> | ||
14 | /// Gets the default culture. | ||
15 | /// </summary> | ||
16 | /// <value>The default culture.</value> | ||
17 | public override string DefaultCulture => "en-US"; | ||
18 | |||
19 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) | 13 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) |
20 | { | 14 | { |
21 | symbolDefinition = IisSymbolDefinitions.ByName(name); | 15 | 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 @@ | |||
1 | <!-- 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. --> | 1 | <!-- 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. --> |
2 | 2 | ||
3 | 3 | ||
4 | <WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl"> | 4 | <WixLocalization Culture="en-us" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl"> |
5 | <String Id="msierrIISCannotConnect" Overridable="yes" Value="Cannot connect to Internet Information Server. ([2] [3] [4] [5])" /> | 5 | <String Id="msierrIISCannotConnect" Overridable="yes" Value="Cannot connect to Internet Information Server. ([2] [3] [4] [5])" /> |
6 | <String Id="msierrIISFailedReadWebSite" Overridable="yes" Value="Failed while processing WebSites. ([2] [3] [4] [5])" /> | 6 | <String Id="msierrIISFailedReadWebSite" Overridable="yes" Value="Failed while processing WebSites. ([2] [3] [4] [5])" /> |
7 | <String Id="msierrIISFailedReadWebDirs" Overridable="yes" Value="Failed while processing WebDirs. ([2] [3] [4] [5])" /> | 7 | <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 | |||
10 | /// </summary> | 10 | /// </summary> |
11 | public sealed class MsmqExtensionData : BaseExtensionData | 11 | public sealed class MsmqExtensionData : BaseExtensionData |
12 | { | 12 | { |
13 | /// <summary> | ||
14 | /// Gets the default culture. | ||
15 | /// </summary> | ||
16 | /// <value>The default culture.</value> | ||
17 | public override string DefaultCulture => "en-US"; | ||
18 | |||
19 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) | 13 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) |
20 | { | 14 | { |
21 | symbolDefinition = MsmqSymbolDefinitions.ByName(name); | 15 | 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 @@ | |||
1 | <!-- 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. --> | 1 | <!-- 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. --> |
2 | 2 | ||
3 | 3 | ||
4 | <WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl"> | 4 | <WixLocalization Culture="en-us" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl"> |
5 | <String Id="MessageQueuingExecuteInstall" Overridable="yes" Value="Configuring message queues" /> | 5 | <String Id="MessageQueuingExecuteInstall" Overridable="yes" Value="Configuring message queues" /> |
6 | <String Id="MessageQueuingExecuteInstallTemplate" Overridable="yes" Value="Queue: [1]" /> | 6 | <String Id="MessageQueuingExecuteInstallTemplate" Overridable="yes" Value="Queue: [1]" /> |
7 | <String Id="MessageQueuingExecuteUninstall" Overridable="yes" Value="Configuring message queues" /> | 7 | <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 | |||
10 | /// </summary> | 10 | /// </summary> |
11 | public sealed class NetfxExtensionData : BaseExtensionData | 11 | public sealed class NetfxExtensionData : BaseExtensionData |
12 | { | 12 | { |
13 | public override string DefaultCulture => "en-US"; | ||
14 | |||
15 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) | 13 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) |
16 | { | 14 | { |
17 | symbolDefinition = NetfxSymbolDefinitions.ByName(name); | 15 | 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 | |||
10 | /// </summary> | 10 | /// </summary> |
11 | public sealed class PSExtensionData : BaseExtensionData | 11 | public sealed class PSExtensionData : BaseExtensionData |
12 | { | 12 | { |
13 | /// <summary> | ||
14 | /// Gets the default culture. | ||
15 | /// </summary> | ||
16 | /// <value>The default culture.</value> | ||
17 | public override string DefaultCulture => "en-US"; | ||
18 | |||
19 | public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) | 13 | public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) |
20 | { | 14 | { |
21 | return Intermediate.Load(typeof(PSExtensionData).Assembly, "WixToolset.PowerShell.powershell.wixlib", symbolDefinitions); | 15 | 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 | |||
10 | /// </summary> | 10 | /// </summary> |
11 | public sealed class SqlExtensionData : BaseExtensionData | 11 | public sealed class SqlExtensionData : BaseExtensionData |
12 | { | 12 | { |
13 | /// <summary> | ||
14 | /// Gets the default culture. | ||
15 | /// </summary> | ||
16 | /// <value>The default culture.</value> | ||
17 | public override string DefaultCulture => "en-US"; | ||
18 | |||
19 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) | 13 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) |
20 | { | 14 | { |
21 | symbolDefinition = SqlSymbolDefinitions.ByName(name); | 15 | 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 @@ | |||
1 | <!-- 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. --> | 1 | <!-- 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. --> |
2 | 2 | ||
3 | 3 | ||
4 | <WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl"> | 4 | <WixLocalization Culture="en-us" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl"> |
5 | <String Id="msierrSQLFailedCreateDatabase" Overridable="yes" Value="Error [2]: failed to create SQL database: [3], error detail: [4]." /> | 5 | <String Id="msierrSQLFailedCreateDatabase" Overridable="yes" Value="Error [2]: failed to create SQL database: [3], error detail: [4]." /> |
6 | <String Id="msierrSQLFailedDropDatabase" Overridable="yes" Value="Error [2]: failed to drop SQL database: [3], error detail: [4]." /> | 6 | <String Id="msierrSQLFailedDropDatabase" Overridable="yes" Value="Error [2]: failed to drop SQL database: [3], error detail: [4]." /> |
7 | <String Id="msierrSQLFailedConnectDatabase" Overridable="yes" Value="Failed to connect to SQL database. ([2] [3] [4] [5])" /> | 7 | <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 | |||
7 | 7 | ||
8 | public sealed class UIExtensionData : BaseExtensionData | 8 | public sealed class UIExtensionData : BaseExtensionData |
9 | { | 9 | { |
10 | public override string DefaultCulture => "en-US"; | ||
11 | |||
12 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) | 10 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) |
13 | { | 11 | { |
14 | symbolDefinition = null; | 12 | 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 @@ | |||
1 | <!-- 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. --> | 1 | <!-- 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. --> |
2 | 2 | ||
3 | 3 | ||
4 | <WixLocalization Culture="en-US" Codepage="1252" xmlns="http://wixtoolset.org/schemas/v4/wxl"> | 4 | <WixLocalization Culture="en-US" ExtensionDefaultCulture="yes" Codepage="1252" xmlns="http://wixtoolset.org/schemas/v4/wxl"> |
5 | <!-- _locID@Culture="en-US" _locComment="American English" --> | 5 | <!-- _locID@Culture="en-US" _locComment="American English" --> |
6 | <!-- _locID@Codepage="1252" _locComment="Windows-1252" --> | 6 | <!-- _locID@Codepage="1252" _locComment="Windows-1252" --> |
7 | 7 | ||
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 | |||
7 | 7 | ||
8 | public sealed class UtilExtensionData : BaseExtensionData | 8 | public sealed class UtilExtensionData : BaseExtensionData |
9 | { | 9 | { |
10 | public override string DefaultCulture => "en-US"; | ||
11 | |||
12 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) | 10 | public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) |
13 | { | 11 | { |
14 | symbolDefinition = UtilSymbolDefinitions.ByName(name); | 12 | 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 @@ | |||
1 | <!-- 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. --> | 1 | <!-- 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. --> |
2 | 2 | ||
3 | 3 | ||
4 | <WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl"> | 4 | <WixLocalization Culture="en-us" ExtensionDefaultCulture="yes" xmlns="http://wixtoolset.org/schemas/v4/wxl"> |
5 | <String Id="msierrUSRFailedUserCreate" Overridable="yes" Value="Failed to create user. ([2] [3] [4] [5])" /> | 5 | <String Id="msierrUSRFailedUserCreate" Overridable="yes" Value="Failed to create user. ([2] [3] [4] [5])" /> |
6 | <String Id="msierrUSRFailedUserCreatePswd" Overridable="yes" Value="Failed to create user due to invalid password. ([2] [3] [4] [5])" /> | 6 | <String Id="msierrUSRFailedUserCreatePswd" Overridable="yes" Value="Failed to create user due to invalid password. ([2] [3] [4] [5])" /> |
7 | <String Id="msierrUSRFailedUserGroupAdd" Overridable="yes" Value="Failed to add user to group. ([2] [3] [4] [5])" /> | 7 | <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 | |||
7 | 7 | ||
8 | public sealed class VSExtensionData : BaseExtensionData | 8 | public sealed class VSExtensionData : BaseExtensionData |
9 | { | 9 | { |
10 | /// <summary> | ||
11 | /// Gets the default culture. | ||
12 | /// </summary> | ||
13 | /// <value>The default culture.</value> | ||
14 | public override string DefaultCulture => "en-US"; | ||
15 | |||
16 | public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) | 10 | public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) |
17 | { | 11 | { |
18 | return Intermediate.Load(typeof(VSExtensionData).Assembly, "WixToolset.VisualStudio.vs.wixlib", symbolDefinitions); | 12 | return Intermediate.Load(typeof(VSExtensionData).Assembly, "WixToolset.VisualStudio.vs.wixlib", symbolDefinitions); |