diff options
-rw-r--r-- | src/wixext/BalBurnBackendExtension.cs (renamed from src/wixext/BalWindowsInstallerBackendBinderExtension.cs) | 18 | ||||
-rw-r--r-- | src/wixext/BalExtensionFactory.cs | 2 | ||||
-rw-r--r-- | src/wixext/WixToolset.Bal.wixext.csproj | 1 | ||||
-rw-r--r-- | src/wixext/tables.xml | 41 |
4 files changed, 2 insertions, 60 deletions
diff --git a/src/wixext/BalWindowsInstallerBackendBinderExtension.cs b/src/wixext/BalBurnBackendExtension.cs index 3c116329..20609964 100644 --- a/src/wixext/BalWindowsInstallerBackendBinderExtension.cs +++ b/src/wixext/BalBurnBackendExtension.cs | |||
@@ -3,9 +3,7 @@ | |||
3 | namespace WixToolset.Bal | 3 | namespace WixToolset.Bal |
4 | { | 4 | { |
5 | using System; | 5 | using System; |
6 | using System.Collections.Generic; | ||
7 | using System.Linq; | 6 | using System.Linq; |
8 | using System.Xml; | ||
9 | using WixToolset.Data; | 7 | using WixToolset.Data; |
10 | using WixToolset.Data.Burn; | 8 | using WixToolset.Data.Burn; |
11 | using WixToolset.Data.WindowsInstaller; | 9 | using WixToolset.Data.WindowsInstaller; |
@@ -13,22 +11,8 @@ namespace WixToolset.Bal | |||
13 | using WixToolset.Extensibility; | 11 | using WixToolset.Extensibility; |
14 | using WixToolset.Extensibility.Data; | 12 | using WixToolset.Extensibility.Data; |
15 | 13 | ||
16 | public class BalWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension | 14 | public class BalBurnBackendExtension : BaseBurnBackendExtension |
17 | { | 15 | { |
18 | private static readonly TableDefinition[] Tables = LoadTables(); | ||
19 | |||
20 | public override IEnumerable<TableDefinition> TableDefinitions => Tables; | ||
21 | |||
22 | private static TableDefinition[] LoadTables() | ||
23 | { | ||
24 | using (var resourceStream = typeof(BalWindowsInstallerBackendBinderExtension).Assembly.GetManifestResourceStream("WixToolset.Bal.tables.xml")) | ||
25 | using (var reader = XmlReader.Create(resourceStream)) | ||
26 | { | ||
27 | var tables = TableDefinitionCollection.Load(reader); | ||
28 | return tables.ToArray(); | ||
29 | } | ||
30 | } | ||
31 | |||
32 | public override void PostBackendBind(IBindResult result) | 16 | public override void PostBackendBind(IBindResult result) |
33 | { | 17 | { |
34 | base.PostBackendBind(result); | 18 | base.PostBackendBind(result); |
diff --git a/src/wixext/BalExtensionFactory.cs b/src/wixext/BalExtensionFactory.cs index 936686a6..30ec88c3 100644 --- a/src/wixext/BalExtensionFactory.cs +++ b/src/wixext/BalExtensionFactory.cs | |||
@@ -12,7 +12,7 @@ namespace WixToolset.Bal | |||
12 | { | 12 | { |
13 | typeof(BalCompiler), | 13 | typeof(BalCompiler), |
14 | typeof(BalExtensionData), | 14 | typeof(BalExtensionData), |
15 | typeof(BalWindowsInstallerBackendBinderExtension), | 15 | typeof(BalBurnBackendExtension), |
16 | }; | 16 | }; |
17 | } | 17 | } |
18 | } | 18 | } |
diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj index 49f891d3..aef4c4d9 100644 --- a/src/wixext/WixToolset.Bal.wixext.csproj +++ b/src/wixext/WixToolset.Bal.wixext.csproj | |||
@@ -13,7 +13,6 @@ | |||
13 | <ItemGroup> | 13 | <ItemGroup> |
14 | <Content Include="$(MSBuildThisFileName).targets" /> | 14 | <Content Include="$(MSBuildThisFileName).targets" /> |
15 | <Content Include="bal.xsd" PackagePath="tools" /> | 15 | <Content Include="bal.xsd" PackagePath="tools" /> |
16 | <EmbeddedResource Include="tables.xml" /> | ||
17 | <EmbeddedResource Include="$(OutputPath)..\bal.wixlib" /> | 16 | <EmbeddedResource Include="$(OutputPath)..\bal.wixlib" /> |
18 | </ItemGroup> | 17 | </ItemGroup> |
19 | <ItemGroup> | 18 | <ItemGroup> |
diff --git a/src/wixext/tables.xml b/src/wixext/tables.xml deleted file mode 100644 index 18abf1d7..00000000 --- a/src/wixext/tables.xml +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <!-- 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. --> | ||
3 | |||
4 | |||
5 | <tableDefinitions xmlns="http://wixtoolset.org/schemas/v4/wi/tables"> | ||
6 | <tableDefinition name="WixBalBAFunctions" bootstrapperApplicationData="yes"> | ||
7 | <columnDefinition name="PayloadId" type="string" length="0" nullable="yes" category="identifier" primaryKey="yes" | ||
8 | keyTable="WixPayloadProperties" keyColumn="1" description="Reference to a payload entry in the WixPayloadProperties table." /> | ||
9 | </tableDefinition> | ||
10 | <tableDefinition name="WixBalCondition" bootstrapperApplicationData="yes"> | ||
11 | <columnDefinition name="Condition" type="string" length="255" primaryKey="yes" localizable="yes" | ||
12 | category="condition" description="Expression which must evaluate to TRUE in order for install to commence." /> | ||
13 | <columnDefinition name="Message" type="localized" length="255" escapeIdtCharacters="yes" | ||
14 | category="formatted" description="Localizable text to display when condition fails and install must abort." /> | ||
15 | </tableDefinition> | ||
16 | |||
17 | <tableDefinition name="WixMbaPrereqInformation" bootstrapperApplicationData="yes"> | ||
18 | <columnDefinition name="PackageId" type="string" length="72" primaryKey="yes" | ||
19 | category="identifier" description="PackageId for the Prereq BA to conditionally install." /> | ||
20 | <columnDefinition name="LicenseFile" type="string" length="0" category="formatted" /> | ||
21 | <columnDefinition name="LicenseUrl" type="string" length="0" category="formatted" /> | ||
22 | </tableDefinition> | ||
23 | |||
24 | <tableDefinition name="WixStdbaOptions" bootstrapperApplicationData="yes"> | ||
25 | <columnDefinition name="SuppressOptionsUI" type="number" length="2" nullable="yes" | ||
26 | maxValue="1" description="If 1, don't show Options button during install." /> | ||
27 | <columnDefinition name="SuppressDowngradeFailure" type="number" length="2" nullable="yes" | ||
28 | maxValue="1" description="If 1, attempts to downgrade are treated as a successful no-op." /> | ||
29 | <columnDefinition name="SuppressRepair" type="number" length="2" nullable="yes" | ||
30 | maxValue="1" description="If 1, don't show Repair button during maintenance." /> | ||
31 | <columnDefinition name="ShowVersion" type="number" length="2" nullable="yes" | ||
32 | maxValue="1" description="If 1, show the version number on the UI." /> | ||
33 | <columnDefinition name="SupportCacheOnly" type="number" length="2" nullable="yes" | ||
34 | maxValue="1" description="If 1, the bundle can be pre-cached using the /cache command line argument."/> | ||
35 | </tableDefinition> | ||
36 | |||
37 | <tableDefinition name="WixStdbaOverridableVariable" bootstrapperApplicationData="yes"> | ||
38 | <columnDefinition name="Name" type="string" length="255" primaryKey="yes" | ||
39 | category="identifier" description="Variable name user can override." /> | ||
40 | </tableDefinition> | ||
41 | </tableDefinitions> | ||