Skip to content

Support content files from nuget #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
forki merged 6 commits into from
Sep 16, 2014
Merged

Support content files from nuget #84

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d3b96b3
resetting all content files on install command
theimowski Sep 10, 2014
ed5e60d
grouped and sorted by filepath all content nodes in project file
theimowski Sep 12, 2014
16fa68e
inserting Content nodes before existing ones for the same dir
theimowski Sep 13, 2014
8e5a3d8
Removing content files from project file when installing --hard
theimowski Sep 16, 2014
ae79a98
Removing hard flag for updating Content files
theimowski Sep 16, 2014
2280b1f
moved createRelativePath to utils
theimowski Sep 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Removing hard flag for updating Content files
  • Loading branch information
@theimowski
theimowski committed Sep 16, 2014
commit ae79a98aa99d1b2cf8d31b1d454ec22e0359b506
18 changes: 9 additions & 9 deletions src/Paket/Process.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,24 +120,24 @@ let Install(regenerate, force, hard, dependenciesFilename) =
let sourceFile = name.Split(':').[1]
usedSourceFiles.Add sourceFile |> ignore
else
match allPackages |> Map.tryFind name with
| Some package ->
if usedPackages.Add name then
if not lockFile.Strict then
for d,_ in package.DirectDependencies do
addPackage d
| None -> failwithf "Project %s references package %s, but it was not found in the paket.lock file." proj.FullName name
match allPackages |> Map.tryFind name with
| Some package ->
if usedPackages.Add name then
if not lockFile.Strict then
for d,_ in package.DirectDependencies do
addPackage d
| None -> failwithf "Project %s references package %s, but it was not found in the paket.lock file." proj.FullName name

directPackages
|> Array.iter addPackage

project.UpdateReferences(extractedPackages,usedPackages,hard)

lockFile.SourceFiles
|> List.filter (fun file -> usedSourceFiles.Contains(file.Name))
|> project.UpdateSourceFiles

removeContentFiles project
removeContentFiles project
let packagesWithContent = findPackagesWithContent usedPackages
let contentFiles = copyContentFilesToProject project packagesWithContent
project.UpdateContentFiles(contentFiles)
Expand Down
12 changes: 6 additions & 6 deletions src/Paket/ProjectFile.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ type ProjectFile =
this.FindPaketNodes("Content")
|> List.map (fun n -> FileInfo(Path.Combine(Path.GetDirectoryName(this.FileName), n.Attributes.["Include"].Value)))

member this.UpdateContentFiles(contentFiles : list<FileInfo>, hard) =
member this.UpdateContentFiles(contentFiles : list<FileInfo>) =
let contentNode (fi: FileInfo) =
this.CreateNode "Content"
|> addAttribute "Include" (UriHelper.createRelativePath this.FileName fi.FullName)
Expand Down Expand Up @@ -233,12 +233,12 @@ type ProjectFile =

static member Load(fileName:string) =
try
let fi = FileInfo(fileName)
let doc = new XmlDocument()
doc.Load fi.FullName
let fi = FileInfo(fileName)
let doc = new XmlDocument()
doc.Load fi.FullName

let manager = new XmlNamespaceManager(doc.NameTable)
manager.AddNamespace("ns", ProjectFile.DefaultNameSpace)
let manager = new XmlNamespaceManager(doc.NameTable)
manager.AddNamespace("ns", ProjectFile.DefaultNameSpace)
{ FileName = fi.FullName; Document = doc; Namespaces = manager; OriginalText = Utils.normalizeXml doc }
with
| exn -> failwithf "Error while parsing %s:%s %s" fileName Environment.NewLine exn.Message