cleanup workaround - references #1227

fsprojects · Nov 16, 2015 · bd01652 · bd01652
1 parent 28d299a
commit bd01652
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 2.25.6 - 16.11.2015
+* BUGFIX: Update ProjectFile.GetTargetProfile to work with conditional nodes - https://github.com/fsprojects/Paket/pull/1227
+
 #### 2.25.5 - 16.11.2015
 * USABILITY: Sets default resolver strategy for convert from nuget to None - https://github.com/fsprojects/Paket/pull/1228
 

diff --git a/src/Paket.Core/PackageMetaData.fs b/src/Paket.Core/PackageMetaData.fs
@@ -140,14 +140,6 @@ let addFile (source : string) (target : string) (templateFile : TemplateFile) =
     | IncompleteTemplate -> 
         failwith "You should only try and add files to template files with complete metadata."
 
-let prependFile (source : string) (target : string) (templateFile : TemplateFile) = 
-    match templateFile with
-    | CompleteTemplate(core, opt) -> 
-        { FileName = templateFile.FileName
-          Contents = CompleteInfo(core, { opt with Files = opt.Files @ [source,target] }) }
-    | IncompleteTemplate -> 
-        failwith "You should only try and add files to template files with complete metadata."
-
 let findDependencies (dependencies : DependenciesFile) config (template : TemplateFile) (project : ProjectFile) lockDependencies (map : Map<string, TemplateFile * ProjectFile>) =
     let targetDir = 
         match project.OutputType with
@@ -185,7 +177,7 @@ let findDependencies (dependencies : DependenciesFile) config (template : Templa
 
                 isSameFileName && isValidExtension)
         additionalFiles
-        |> Array.fold (fun template file -> prependFile file.FullName targetDir template) template
+        |> Array.fold (fun template file -> addFile file.FullName targetDir template) template
 
     // If project refs will also be packaged, add dependency
     let withDeps = 

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -37,15 +37,15 @@
     <StartArguments>update group Build</StartArguments>
     <StartArguments>pack output D:\code\paketbug\output</StartArguments>
     <StartArguments>install</StartArguments>
-    <StartArguments>update</StartArguments>
+    <StartArguments>pack output "D:\code\paket_bug\out"</StartArguments>
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
     <StartWorkingDirectory>c:\code\Paketkopie</StartWorkingDirectory>
     <StartWorkingDirectory>C:\Temp\paket_test\</StartWorkingDirectory>
     <StartWorkingDirectory>d:\code\paketkopie</StartWorkingDirectory>
     <StartWorkingDirectory>d:\code\paketbug</StartWorkingDirectory>
     <StartWorkingDirectory>d:\code\paketrepro</StartWorkingDirectory>
-    <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001219-props-files\temp\</StartWorkingDirectory>
+    <StartWorkingDirectory>D:\code\paket_bug\</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>