diff options
author | Bob Arnson <bob@firegiant.com> | 2019-12-11 19:05:57 -0500 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2019-12-11 19:31:58 -0500 |
commit | 427e1a8c65c038e63674503f4f56e53fe00ac7f0 (patch) | |
tree | f508ba128f761c43e478422a6c514e95f3febf9a /src | |
parent | 3add0e56ddc57ddcfeb92c3b4cbb7ad0eee7674f (diff) | |
download | wix-427e1a8c65c038e63674503f4f56e53fe00ac7f0.tar.gz wix-427e1a8c65c038e63674503f4f56e53fe00ac7f0.tar.bz2 wix-427e1a8c65c038e63674503f4f56e53fe00ac7f0.zip |
Correctly report files unbound from cabinets.
Diffstat (limited to 'src')
-rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs index 86eaa945..6840b2d4 100644 --- a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs | |||
@@ -7,6 +7,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind | |||
7 | using System.Collections.Generic; | 7 | using System.Collections.Generic; |
8 | using System.Globalization; | 8 | using System.Globalization; |
9 | using System.IO; | 9 | using System.IO; |
10 | using System.Linq; | ||
10 | using WixToolset.Core.Native; | 11 | using WixToolset.Core.Native; |
11 | using WixToolset.Core.WindowsInstaller.Msi; | 12 | using WixToolset.Core.WindowsInstaller.Msi; |
12 | using WixToolset.Data; | 13 | using WixToolset.Data; |
@@ -129,15 +130,13 @@ namespace WixToolset.Core.WindowsInstaller.Unbind | |||
129 | try | 130 | try |
130 | { | 131 | { |
131 | var cabinet = new Cabinet(cabinetFile); | 132 | var cabinet = new Cabinet(cabinetFile); |
132 | cabinet.Extract(this.ExportBasePath); | 133 | this.ExtractedFiles = cabinet.Extract(this.ExportBasePath).ToArray(); |
133 | } | 134 | } |
134 | catch (FileNotFoundException) | 135 | catch (FileNotFoundException) |
135 | { | 136 | { |
136 | throw new WixException(ErrorMessages.FileNotFound(new SourceLineNumber(this.InputFilePath), cabinetFile)); | 137 | throw new WixException(ErrorMessages.FileNotFound(new SourceLineNumber(this.InputFilePath), cabinetFile)); |
137 | } | 138 | } |
138 | } | 139 | } |
139 | |||
140 | this.ExtractedFiles = Directory.GetFiles(this.ExportBasePath); | ||
141 | } | 140 | } |
142 | else | 141 | else |
143 | { | 142 | { |