Do not try to pack output folder - fixes #1473

fsprojects · Feb 14, 2016 · d1771c4 · d1771c4
1 parent bf699bc
commit d1771c4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 2.50.9 - 14.02.2016
+* BUGFIX: Do not try to pack output folder - https://github.com/fsprojects/Paket/issues/1473
+
 #### 2.50.8 - 13.02.2016
 * Experimental Visual C++ support in binding redirects - https://github.com/fsprojects/Paket/issues/1467
 

diff --git a/src/Paket.Core/NupkgWriter.fs b/src/Paket.Core/NupkgWriter.fs
@@ -188,6 +188,7 @@ let writeNupkg  (core : CompleteCoreInfo) optional =
       relsPath, relsDoc core |> xDocWriter ]
 
 let Write (core : CompleteCoreInfo) optional workingDir outputDir =
+    let outputFolder = DirectoryInfo(outputDir).FullName |> normalizePath
     let outputPath = Path.Combine(outputDir, core.PackageFileName)
     if File.Exists outputPath then
         File.Delete outputPath
@@ -223,7 +224,7 @@ let Write (core : CompleteCoreInfo) optional workingDir outputDir =
 
     let isExcluded p =
         let path = DirectoryInfo(p).FullName
-        exclusions |> List.exists (fun f -> f path)
+        normalizePath path = outputFolder || (exclusions |> List.exists (fun f -> f path))
 
     let ensureValidName (target: string) =
         // Some characters that are considered reserved by RFC 2396
@@ -275,6 +276,7 @@ let Write (core : CompleteCoreInfo) optional workingDir outputDir =
     let addEntryFromFile path source =
         if entries.Contains(path) then () else
         entries.Add path |> ignore
+
         zipFile.CreateEntryFromFile(source,path) |> ignore
 
     let ensureValidTargetName (target:string) =

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -50,7 +50,7 @@
     <StartArguments>pack -v output "D:\code\Paket\integrationtests\scenarios\i001376-pack-template\temp\out" templatefile "D:\code\Paket\integrationtests\scenarios\i001376-pack-template\temp\PaketBug\paket.template"</StartArguments>
     <StartArguments>pack -v output D:\code\Paket\integrationtests\scenarios\i001429-pack-deps\temp\out</StartArguments>
     <StartArguments>pack output "out/nuget"  version  0.9.3 releaseNotes  "[LanguageExtensions][New] New Ensure methods with exception parameter." include-referenced-projects</StartArguments>
-    <StartArguments>update</StartArguments>
+    <StartArguments>pack templatefile paket.template output o</StartArguments>
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
     <StartWorkingDirectory>c:\code\Paketkopie</StartWorkingDirectory>
@@ -62,7 +62,7 @@
     <StartWorkingDirectory>C:\code\restore</StartWorkingDirectory>
     <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001450-twiddle-wakka\temp</StartWorkingDirectory>
     <StartWorkingDirectory>D:\code\Paket-issue-1469</StartWorkingDirectory>
-    <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001467-cpp-native\temp</StartWorkingDirectory>
+    <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001473-blocking\temp</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>