aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@joyofsetup.com>2018-11-29 14:02:44 -0500
committerBob Arnson <bob@firegiant.com>2018-11-29 14:06:48 -0500
commit6ed8d107e6edf16956c778bda3573f8d7a7690fc (patch)
treee13f493aa4f446b842790d25cf8f3318f358bd7d
parent8904e039333cf3121ead1c203b5ab86522dfba50 (diff)
downloadwix-6ed8d107e6edf16956c778bda3573f8d7a7690fc.tar.gz
wix-6ed8d107e6edf16956c778bda3573f8d7a7690fc.tar.bz2
wix-6ed8d107e6edf16956c778bda3573f8d7a7690fc.zip
Update extension for latest changes in WixToolset.Extensibility.
-rw-r--r--src/wixext/UtilExtensionFactory.cs2
-rw-r--r--src/wixext/UtilWindowsInstallerBackendExtension.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/wixext/UtilExtensionFactory.cs b/src/wixext/UtilExtensionFactory.cs
index 07bfae85..0f87a1ff 100644
--- a/src/wixext/UtilExtensionFactory.cs
+++ b/src/wixext/UtilExtensionFactory.cs
@@ -12,7 +12,7 @@ namespace WixToolset.Util
12 { 12 {
13 typeof(UtilCompiler), 13 typeof(UtilCompiler),
14 typeof(UtilExtensionData), 14 typeof(UtilExtensionData),
15 typeof(UtilWindowsInstallerBackendExtension), 15 typeof(UtilWindowsInstallerBackendBinderExtension),
16 }; 16 };
17 } 17 }
18} 18}
diff --git a/src/wixext/UtilWindowsInstallerBackendExtension.cs b/src/wixext/UtilWindowsInstallerBackendExtension.cs
index 00ac8d34..0cb09678 100644
--- a/src/wixext/UtilWindowsInstallerBackendExtension.cs
+++ b/src/wixext/UtilWindowsInstallerBackendExtension.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Util
7 using WixToolset.Data.WindowsInstaller; 7 using WixToolset.Data.WindowsInstaller;
8 using WixToolset.Extensibility; 8 using WixToolset.Extensibility;
9 9
10 public class UtilWindowsInstallerBackendExtension : BaseWindowsInstallerBackendExtension 10 public class UtilWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension
11 { 11 {
12 private static readonly TableDefinition[] Tables = LoadTables(); 12 private static readonly TableDefinition[] Tables = LoadTables();
13 13
@@ -15,7 +15,7 @@ namespace WixToolset.Util
15 15
16 private static TableDefinition[] LoadTables() 16 private static TableDefinition[] LoadTables()
17 { 17 {
18 using (var resourceStream = typeof(UtilWindowsInstallerBackendExtension).Assembly.GetManifestResourceStream("WixToolset.Util.tables.xml")) 18 using (var resourceStream = typeof(UtilWindowsInstallerBackendBinderExtension).Assembly.GetManifestResourceStream("WixToolset.Util.tables.xml"))
19 using (var reader = XmlReader.Create(resourceStream)) 19 using (var reader = XmlReader.Create(resourceStream))
20 { 20 {
21 var tables = TableDefinitionCollection.Load(reader); 21 var tables = TableDefinitionCollection.Load(reader);