BalWindowsInstallerBackendBinderExtension is supposed to be a BurnBackendExtension.
Sean Hall committed
Apr 6, 2020 at 12:27 UTC
9969392ff7024d2f1e257c2f6c5ce31fa0e839d3
4 files changed
+2
-60
src/wixext/BalBurnBackendExtension.cs
renamed
+1
-17
@@ -3,9 +3,7 @@
3
namespace WixToolset.Bal
4
{
5
using System;
6
- using System.Collections.Generic;
6
using System.Linq;
8
- using System.Xml;
7
using WixToolset.Data;
8
using WixToolset.Data.Burn;
9
using WixToolset.Data.WindowsInstaller;
@@ -13,22 +11,8 @@ namespace WixToolset.Bal
11
using WixToolset.Extensibility;
12
using WixToolset.Extensibility.Data;
13
16
- public class BalWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension
14
+ public class BalBurnBackendExtension : BaseBurnBackendExtension
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
-
16
public override void PostBackendBind(IBindResult result)
17
{
18
base.PostBackendBind(result);
src/wixext/BalExtensionFactory.cs
+1
-1
@@ -12,7 +12,7 @@ namespace WixToolset.Bal
12
{
13
typeof(BalCompiler),
14
typeof(BalExtensionData),
15
- typeof(BalWindowsInstallerBackendBinderExtension),
15
+ typeof(BalBurnBackendExtension),
16
};
17
}
18
}
src/wixext/WixToolset.Bal.wixext.csproj
-1
@@ -13,7 +13,6 @@
13
<ItemGroup>
14
<Content Include="$(MSBuildThisFileName).targets" />
15
<Content Include="bal.xsd" PackagePath="tools" />
16
- <EmbeddedResource Include="tables.xml" />
16
<EmbeddedResource Include="$(OutputPath)..\bal.wixlib" />
17
</ItemGroup>
18
<ItemGroup>
src/wixext/tables.xml
deleted
-41
@@ -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>