From 71c52d5af2293d3eb79882ce36b0411f81185c11 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 29 Nov 2017 22:03:26 -0800 Subject: Fix source path and cabinet processing --- .../Unbind/ExtractCabinetsCommand.cs | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs') diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs index 229e75b4..7985c120 100644 --- a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs @@ -7,7 +7,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind using System.Collections.Specialized; using System.Globalization; using System.IO; - using WixToolset.Core.Cab; + using WixToolset.Core.Native; using WixToolset.Data; using WixToolset.Data.Rows; using WixToolset.Msi; @@ -88,9 +88,9 @@ namespace WixToolset.Core.WindowsInstaller.Unbind string cabinetFile = Path.Combine(this.IntermediateFolder, String.Concat("Media", Path.DirectorySeparatorChar, diskId.ToString(CultureInfo.InvariantCulture), ".cab")); // ensure the parent directory exists - System.IO.Directory.CreateDirectory(Path.GetDirectoryName(cabinetFile)); + Directory.CreateDirectory(Path.GetDirectoryName(cabinetFile)); - using (FileStream fs = System.IO.File.Create(cabinetFile)) + using (FileStream fs = File.Create(cabinetFile)) { int bytesRead; byte[] buffer = new byte[512]; @@ -128,16 +128,14 @@ namespace WixToolset.Core.WindowsInstaller.Unbind foreach (string cabinetFile in cabinetFiles) { - using (var extractCab = new WixExtractCab()) + try { - try - { - extractCab.Extract(cabinetFile, fileDirectory); - } - catch (FileNotFoundException) - { - throw new WixException(WixErrors.FileNotFound(new SourceLineNumber(this.InputFilePath), cabinetFile)); - } + var cabinet = new Cabinet(cabinetFile); + cabinet.Extract(fileDirectory); + } + catch (FileNotFoundException) + { + throw new WixException(WixErrors.FileNotFound(new SourceLineNumber(this.InputFilePath), cabinetFile)); } } } -- cgit v1.2.3-55-g6feb