Merge pull request #1403 from pms1969/fix-pdbs

pdb's no longer being packaged in the non symbols package
fsprojects · Jan 18, 2016 · c410e75 · c410e75
2 parents 6390e86 + a5a537d
commit c410e75
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 9 deletions.
diff --git a/src/Paket.Core/PackageMetaData.fs b/src/Paket.Core/PackageMetaData.fs
@@ -177,8 +177,15 @@ let findDependencies (dependencies : DependenciesFile) config platform (template
                                 |> Array.map (fun f -> FileInfo f)
                                 |> Array.filter (fun fi -> 
                                                     let isSameFileName = (Path.GetFileNameWithoutExtension fi.Name) = name
+                                                    let validExtensions = match template.Contents with
+                                                                          | CompleteInfo(core, optional) ->
+                                                                              if core.Symbols || optional.IncludePdbs then [".xml"; ".dll"; ".exe"; ".pdb"; ".mdb"]
+                                                                              else [".xml"; ".dll"; ".exe"; ".mdb"]
+                                                                          | ProjectInfo(core, optional) ->
+                                                                              if core.Symbols  || optional.IncludePdbs then [".xml"; ".dll"; ".exe"; ".pdb"; ".mdb"]
+                                                                              else [".xml"; ".dll"; ".exe"; ".mdb"]
                                                     let isValidExtension = 
-                                                        [".xml"; ".dll"; ".exe"; ".pdb"; ".mdb"] 
+                                                        validExtensions
                                                         |> List.exists (String.equalsIgnoreCase fi.Extension)
                                                     isSameFileName && isValidExtension)
                            )

diff --git a/src/Paket.Core/PackageProcess.fs b/src/Paket.Core/PackageProcess.fs
@@ -64,6 +64,15 @@ let private merge buildConfig buildPlatform versionFromAssembly specificVersions
                 | Valid completeCore -> { templateFile with Contents = CompleteInfo(completeCore, mergedOpt) }
     | _ -> templateFile
 
+let private convertToNormal (symbols : bool) templateFile =
+    match templateFile.Contents with
+    | CompleteInfo(core, optional) ->
+        let includePdbs = optional.IncludePdbs
+        { templateFile with Contents = CompleteInfo(core, { optional with IncludePdbs = (if symbols then false else includePdbs) }) }
+    | ProjectInfo(core, optional) ->
+        let includePdbs = optional.IncludePdbs
+        { templateFile with Contents = ProjectInfo(core, { optional with IncludePdbs = (if symbols then false else includePdbs) }) }
+
 let private convertToSymbols (projectFile : ProjectFile) (includeReferencedProjects : bool) templateFile =
     let sourceFiles =
         let getTarget compileItem =
@@ -135,7 +144,7 @@ let Pack(workingDir,dependencies : DependenciesFile, packageOutputPath, buildCon
     // add dependencies
     let allTemplates =
         let optWithSymbols projectFile templateFile =
-            seq { yield templateFile; if symbols then yield templateFile |> convertToSymbols projectFile includeReferencedProjects }
+            seq { yield (templateFile |> convertToNormal symbols); if symbols then yield templateFile |> convertToSymbols projectFile includeReferencedProjects }
 
         let convertRemainingTemplate fileName =
             let templateFile = TemplateFile.Load(fileName,lockFile,version,specificVersions)
@@ -153,11 +162,16 @@ let Pack(workingDir,dependencies : DependenciesFile, packageOutputPath, buildCon
             | _ -> seq { yield templateFile }
 
         projectTemplates
-        |> Map.map (fun _ (t, p) -> p,findDependencies dependencies buildConfig buildPlatform t p lockDependencies projectTemplates)
         |> Map.toList
-        |> Seq.collect (fun (_,(p,t)) -> t |> optWithSymbols p)
-        |> Seq.append (allTemplateFiles |> Seq.collect convertRemainingTemplate)
-        |> Seq.toList
+        |> Seq.collect(fun (_,(t, p)) -> 
+            seq {
+                for template in t |> optWithSymbols p do 
+                    yield template, p
+                }
+            )
+         |> Seq.map (fun (t, p) -> findDependencies dependencies buildConfig buildPlatform t p lockDependencies projectTemplates)
+         |> Seq.append (allTemplateFiles |> Seq.collect convertRemainingTemplate)
+         |> Seq.toList
 
     let excludedTemplates =
         match excludedTemplates with

diff --git a/src/Paket.Core/TemplateFile.fs b/src/Paket.Core/TemplateFile.fs
@@ -135,7 +135,8 @@ type OptionalPackagingInfo =
       References : string list
       FrameworkAssemblyReferences : string list
       Files : (string * string) list
-      FilesExcluded : string list }
+      FilesExcluded : string list 
+      IncludePdbs : bool}
     static member Epmty : OptionalPackagingInfo =
         { Title = None
           Owners = []
@@ -154,7 +155,8 @@ type OptionalPackagingInfo =
           References = []
           FrameworkAssemblyReferences = []
           Files = []
-          FilesExcluded = [] }
+          FilesExcluded = [] 
+          IncludePdbs = false}
 
 type CompleteInfo = CompleteCoreInfo * OptionalPackagingInfo
 
@@ -338,6 +340,11 @@ module internal TemplateFile =
 
         let dependencies = getDependencies(fileName,lockFile,map,currentVersion,specificVersions)
         let excludedDependencies = getExcludedDependencies(fileName,lockFile,map,currentVersion)
+
+        let includePdbs = 
+            match get "include-pdbs" with
+            | Some x when String.equalsIgnoreCase x "true" -> true
+            | _ -> false
 
         { Title = get "title"
           Owners = owners
@@ -356,7 +363,8 @@ module internal TemplateFile =
           References = getReferences map
           FrameworkAssemblyReferences = getFrameworkReferences map
           Files = getFiles map
-          FilesExcluded = getFileExcludes map }
+          FilesExcluded = getFileExcludes map 
+          IncludePdbs = includePdbs }
 
     let Parse(file,lockFile,currentVersion,specificVersions,contentStream : Stream) =
         trial {