diff options
author | Bob Arnson <bob@joyofsetup.com> | 2019-10-28 20:39:01 -0400 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2019-10-28 20:41:41 -0400 |
commit | d86b61727a51cde11c44a0c54d1d1bc132808d64 (patch) | |
tree | 856d978b5453ba5838492591eacc9ccfe904102a /src/wixext | |
parent | 014bc7918c05f01f819c07fac6e502e0f542a222 (diff) | |
download | wix-d86b61727a51cde11c44a0c54d1d1bc132808d64.tar.gz wix-d86b61727a51cde11c44a0c54d1d1bc132808d64.tar.bz2 wix-d86b61727a51cde11c44a0c54d1d1bc132808d64.zip |
Update to latest Tools and Util.wixext.
Diffstat (limited to 'src/wixext')
-rw-r--r-- | src/wixext/NetFxCompiler.cs | 10 | ||||
-rw-r--r-- | src/wixext/NetfxWindowsInstallerBackendExtension.cs | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/wixext/NetFxCompiler.cs b/src/wixext/NetFxCompiler.cs index 8a5d02f5..06d48fe7 100644 --- a/src/wixext/NetFxCompiler.cs +++ b/src/wixext/NetFxCompiler.cs | |||
@@ -150,11 +150,11 @@ namespace WixToolset.Netfx | |||
150 | { | 150 | { |
151 | section.Tuples.Add(new NetFxNativeImageTuple(sourceLineNumbers, id) | 151 | section.Tuples.Add(new NetFxNativeImageTuple(sourceLineNumbers, id) |
152 | { | 152 | { |
153 | FileRef=fileId, | 153 | FileRef = fileId, |
154 | Priority=priority, | 154 | Priority = priority, |
155 | Attributes=attributes, | 155 | Attributes = attributes, |
156 | ApplicationFileRef=assemblyApplication, | 156 | ApplicationFileRef = assemblyApplication, |
157 | ApplicationBaseDirectoryRef=appBaseDirectory, | 157 | ApplicationBaseDirectoryRef = appBaseDirectory, |
158 | }); | 158 | }); |
159 | } | 159 | } |
160 | } | 160 | } |
diff --git a/src/wixext/NetfxWindowsInstallerBackendExtension.cs b/src/wixext/NetfxWindowsInstallerBackendExtension.cs index 5ca554b8..4672b670 100644 --- a/src/wixext/NetfxWindowsInstallerBackendExtension.cs +++ b/src/wixext/NetfxWindowsInstallerBackendExtension.cs | |||
@@ -1,7 +1,8 @@ | |||
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 | namespace WixToolset.Netfx | 3 | namespace WixToolset.Netfx |
4 | { | 4 | { |
5 | using WixToolset.Data; | ||
5 | using WixToolset.Data.WindowsInstaller; | 6 | using WixToolset.Data.WindowsInstaller; |
6 | using WixToolset.Extensibility; | 7 | using WixToolset.Extensibility; |
7 | 8 | ||
@@ -23,5 +24,7 @@ namespace WixToolset.Netfx | |||
23 | }; | 24 | }; |
24 | 25 | ||
25 | protected override TableDefinition[] TableDefinitionsForTuples => Tables; | 26 | protected override TableDefinition[] TableDefinitionsForTuples => Tables; |
27 | |||
28 | public override bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output) => this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitionsForTuples, true); | ||
26 | } | 29 | } |
27 | } | 30 | } |