diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-03-02 08:42:40 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-02 08:42:40 -0600 |
commit | 2b0b668cf38f06bf1a577f218f217e8edf6494c1 (patch) | |
tree | 52331017d573e7843f3328c073e11fb2bcb6c0c7 | |
parent | da29ddd42cf1e15de1f6332a7d17c598cd5a00d1 (diff) | |
parent | 9bc873da577fa06e2383e5b44d2b83593e4e8a2e (diff) | |
download | wix-2b0b668cf38f06bf1a577f218f217e8edf6494c1.tar.gz wix-2b0b668cf38f06bf1a577f218f217e8edf6494c1.tar.bz2 wix-2b0b668cf38f06bf1a577f218f217e8edf6494c1.zip |
Merge pull request #40 from drolevar/fix_revert_to_postbackendbind
Revert to using BaseBurnBackendBinderExtension::PostBackendBind
-rw-r--r-- | global.json | 2 | ||||
-rw-r--r-- | src/wixext/BalBurnBackendExtension.cs | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/global.json b/global.json index 9492f867..34e8e7e6 100644 --- a/global.json +++ b/global.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "msbuild-sdks": { | 2 | "msbuild-sdks": { |
3 | "WixToolset.Sdk": "4.0.0-build-0190" | 3 | "WixToolset.Sdk": "4.0.0-build-0192" |
4 | }, | 4 | }, |
5 | "sdk": { | 5 | "sdk": { |
6 | "allowPrerelease": false | 6 | "allowPrerelease": false |
diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs index bf96e388..5e647b1c 100644 --- a/src/wixext/BalBurnBackendExtension.cs +++ b/src/wixext/BalBurnBackendExtension.cs | |||
@@ -11,7 +11,7 @@ namespace WixToolset.Bal | |||
11 | using WixToolset.Data.Symbols; | 11 | using WixToolset.Data.Symbols; |
12 | using WixToolset.Extensibility; | 12 | using WixToolset.Extensibility; |
13 | 13 | ||
14 | public class BalBurnBackendExtension : BaseBurnBackendExtension | 14 | public class BalBurnBackendExtension : BaseBurnBackendBinderExtension |
15 | { | 15 | { |
16 | private static readonly IntermediateSymbolDefinition[] BurnSymbolDefinitions = | 16 | private static readonly IntermediateSymbolDefinition[] BurnSymbolDefinitions = |
17 | { | 17 | { |
@@ -27,12 +27,9 @@ namespace WixToolset.Bal | |||
27 | 27 | ||
28 | protected override IEnumerable<IntermediateSymbolDefinition> SymbolDefinitions => BurnSymbolDefinitions; | 28 | protected override IEnumerable<IntermediateSymbolDefinition> SymbolDefinitions => BurnSymbolDefinitions; |
29 | 29 | ||
30 | public override void BundleFinalize() | 30 | public override void SymbolsFinalized(IntermediateSection section) |
31 | { | 31 | { |
32 | base.BundleFinalize(); | 32 | base.SymbolsFinalized(section); |
33 | |||
34 | var intermediate = this.Context.IntermediateRepresentation; | ||
35 | var section = intermediate.Sections.Single(); | ||
36 | 33 | ||
37 | var baSymbol = section.Symbols.OfType<WixBootstrapperApplicationDllSymbol>().SingleOrDefault(); | 34 | var baSymbol = section.Symbols.OfType<WixBootstrapperApplicationDllSymbol>().SingleOrDefault(); |
38 | var baId = baSymbol?.Id?.Id; | 35 | var baId = baSymbol?.Id?.Id; |