fix: allow extracting to the root of a drive

fixes #133
activescott · Oct 11, 2020 · 0f38f8d · 0f38f8d
1 parent affc1c7
commit 0f38f8d
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 14 deletions.
diff --git a/src/.build/lessmsi.msbuild b/src/.build/lessmsi.msbuild
@@ -38,7 +38,7 @@
 		<DeployFiles Include="$(RootDir)\LessMsi.Gui\bin\Release\lessmsi-gui.exe.config"></DeployFiles>
 		<DeployFiles Include="$(RootDir)\packages\libmspack4n.0.9.10\lib\net40\libmspackn.dll"></DeployFiles>
 		<DeployFiles Include="$(RootDir)\packages\libmspack4n.0.9.10\build\x86\mspack.dll"></DeployFiles>
-		<DeployFiles Include="$(RootDir)\packages\LessIO.0.6.16\lib\net40\LessIO.dll"></DeployFiles>
+		<DeployFiles Include="$(RootDir)\packages\LessIO.1.0.34\lib\net40\LessIO.dll"></DeployFiles>
 		<DeployFiles Include="$(RootDir)\..\lib\wix.dll"></DeployFiles>
 		<DeployFiles Include="$(RootDir)\..\lib\wixcab.dll"></DeployFiles>
 	</ItemGroup>

diff --git a/src/LessMsi.Cli/LessMsi.Cli.csproj b/src/LessMsi.Cli/LessMsi.Cli.csproj
@@ -38,8 +38,8 @@
     <StartupObject>LessMsi.Cli.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LessIO, Version=0.6.16.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LessIO.0.6.16\lib\net40\LessIO.dll</HintPath>
+    <Reference Include="LessIO, Version=1.0.34.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LessIO.1.0.34\lib\net40\LessIO.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/src/LessMsi.Cli/packages.config b/src/LessMsi.Cli/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LessIO" version="0.6.16" targetFramework="net4" />
+  <package id="LessIO" version="1.0.34" targetFramework="net40" />
 </packages>
diff --git a/src/LessMsi.Core/LessMsi.Core.csproj b/src/LessMsi.Core/LessMsi.Core.csproj
@@ -37,8 +37,8 @@
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LessIO, Version=0.6.16.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LessIO.0.6.16\lib\net40\LessIO.dll</HintPath>
+    <Reference Include="LessIO, Version=1.0.34.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LessIO.1.0.34\lib\net40\LessIO.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="libmspackn, Version=0.9.10.0, Culture=neutral, processorArchitecture=x86">

diff --git a/src/LessMsi.Core/Msi/Wixtracts.cs b/src/LessMsi.Core/Msi/Wixtracts.cs
@@ -288,7 +288,10 @@ public static void ExtractFiles(Path msi, string outputDir, MsiFile[] filesToExt
 		        }
 
 		        progress.ReportProgress(ExtractionActivity.Initializing, "", filesExtractedSoFar);
-		        FileSystem.CreateDirectory(new Path(outputDir));
+                var outputDirPath = new Path(outputDir);
+                if (!FileSystem.Exists(outputDirPath)) {
+		            FileSystem.CreateDirectory(outputDirPath);
+				}
 
 		        //map short file names to the msi file entry
 		        var fileEntryMap = new Dictionary<string, MsiFile>(filesToExtract.Length, StringComparer.InvariantCulture);

diff --git a/src/LessMsi.Core/packages.config b/src/LessMsi.Core/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LessIO" version="0.6.16" targetFramework="net4" />
+  <package id="LessIO" version="1.0.34" targetFramework="net40" />
   <package id="libmspack4n" version="0.9.10" targetFramework="net4" />
   <package id="MSBuildTasks" version="1.4.0.128" targetFramework="net40" />
 </packages>
diff --git a/src/LessMsi.Gui/LessMsi.Gui.csproj b/src/LessMsi.Gui/LessMsi.Gui.csproj
@@ -38,8 +38,8 @@
     <StartupObject>LessMsi.Gui.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LessIO, Version=0.6.16.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LessIO.0.6.16\lib\net40\LessIO.dll</HintPath>
+    <Reference Include="LessIO, Version=1.0.34.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LessIO.1.0.34\lib\net40\LessIO.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="libmspackn, Version=0.9.10.0, Culture=neutral, processorArchitecture=x86">

diff --git a/src/LessMsi.Gui/packages.config b/src/LessMsi.Gui/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LessIO" version="0.6.16" targetFramework="net4" />
+  <package id="LessIO" version="1.0.34" targetFramework="net40" />
   <package id="libmspack4n" version="0.9.10" targetFramework="net4" />
 </packages>
diff --git a/src/Lessmsi.Tests/LessMsi.Tests.csproj b/src/Lessmsi.Tests/LessMsi.Tests.csproj
@@ -42,8 +42,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LessIO, Version=0.6.16.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LessIO.0.6.16\lib\net40\LessIO.dll</HintPath>
+    <Reference Include="LessIO, Version=1.0.34.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LessIO.1.0.34\lib\net40\LessIO.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="libmspackn, Version=0.9.10.0, Culture=neutral, processorArchitecture=x86">

diff --git a/src/Lessmsi.Tests/packages.config b/src/Lessmsi.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LessIO" version="0.6.16" targetFramework="net45" />
+  <package id="LessIO" version="1.0.34" targetFramework="net45" />
   <package id="libmspack4n" version="0.9.10" targetFramework="net45" />
   <package id="xunit" version="2.1.0" targetFramework="net45" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />