Skip to content

Make Paket runtime dependency aware #1626

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 2 commits into from
Apr 19, 2016
Merged

Make Paket runtime dependency aware #1626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8d2805
Make Paket runtimes aware
forki Apr 19, 2016
ebb0786
Implement super naive runtime detection
forki Apr 19, 2016
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
16 changes: 15 additions & 1 deletion src/Paket.Core/FrameworkHandling.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ type FrameworkIdentifier =
| MonoTouch
| MonoMac
| Native of string * string
| Runtimes of string
| XamariniOS
| XamarinMac
| Windows of string
Expand All @@ -130,6 +131,7 @@ type FrameworkIdentifier =
| MonoTouch -> "monotouch"
| MonoMac -> "monomac"
| Native(_) -> "native"
| Runtimes(_) -> "runtimes"
| XamariniOS -> "xamarinios"
| XamarinMac -> "xamarinmac"
| Windows v -> "win" + v
Expand All @@ -145,6 +147,7 @@ type FrameworkIdentifier =
| MonoTouch -> [ ]
| MonoMac -> [ ]
| Native(_) -> [ ]
| Runtimes(_) -> [ ]
| XamariniOS -> [ ]
| XamarinMac -> [ ]
| DotNetFramework FrameworkVersion.V1 -> [ ]
Expand Down Expand Up @@ -196,6 +199,7 @@ type FrameworkIdentifier =
| DNXCore _, DNXCore _ -> true
| MonoAndroid _, MonoAndroid _ -> true
| MonoMac _, MonoMac _ -> true
| Runtimes _, Runtimes _ -> true
| MonoTouch _, MonoTouch _ -> true
| Windows _, Windows _ -> true
| WindowsPhoneApp _, WindowsPhoneApp _ -> true
Expand Down Expand Up @@ -247,6 +251,9 @@ module FrameworkDetection =
| "native/arm/release" -> Some(Native("Release","arm"))
| "native/address-model-32" -> Some(Native("","Win32"))
| "native/address-model-64" -> Some(Native("","x64"))
| x when x.StartsWith "runtimes/" -> Some(Runtimes(x.Substring(9)))
| "runtimes/win7-x86" -> Some(Runtimes("Win32"))
| "runtimes/win7-arm" -> Some(Runtimes("arm"))
| "native" -> Some(Native("",""))
| "sl" | "sl3" | "sl30" -> Some (Silverlight "v3.0")
| "sl4" | "sl40" -> Some (Silverlight "v4.0")
Expand Down Expand Up @@ -453,7 +460,14 @@ module KnownTargetProfiles =
Native("Release","x64")
Native("Release","arm")]

let AllProfiles = (AllNativeProfiles |> List.map (fun p -> SinglePlatform p)) @ AllDotNetProfiles
let AllRuntimes =
[ Runtimes("win7-x64")
Runtimes("win7-x86")
Runtimes("win7-arm")
Runtimes("debian-x64")
Runtimes("osx") ]

let AllProfiles = (AllNativeProfiles |> List.map (fun p -> SinglePlatform p)) @ (AllRuntimes |> List.map (fun p -> SinglePlatform p)) @ AllDotNetProfiles

let FindPortableProfile name =
AllProfiles
Expand Down
7 changes: 5 additions & 2 deletions src/Paket.Core/InstallModel.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,10 @@ module InstallModel =
TargetsFileFolders = []
Analyzers = [] }

let extractLibFolder path = Utils.extractPath ("lib", path)
let extractLibFolder path =
match Utils.extractPath ("lib", path) with
| None when path.Contains "runtimes" -> Utils.extractPath ("runtimes", path)
| x -> x

let extractBuildFolder path = Utils.extractPath ("build", path)

Expand Down Expand Up @@ -184,7 +187,7 @@ module InstallModel =
this

let calcLibFolders libs =
libs
libs
|> Seq.choose extractLibFolder
|> Seq.distinct
|> PlatformMatching.getSupportedTargetProfiles
Expand Down
5 changes: 4 additions & 1 deletion src/Paket.Core/NuGetV2.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,10 @@ let private getFiles targetFolder subFolderName filesDescriptionForVerbose =
files

/// Finds all libraries in a nuget package.
let GetLibFiles(targetFolder) = getFiles targetFolder "lib" "libraries"
let GetLibFiles(targetFolder) =
let libs = getFiles targetFolder "lib" "libraries"
let runtimeLibs = getFiles targetFolder "runtimes" "libraries"
Array.append libs runtimeLibs

/// Finds all targets files in a nuget package.
let GetTargetsFiles(targetFolder) = getFiles targetFolder "build" ".targets files"
Expand Down
16 changes: 10 additions & 6 deletions src/Paket.Core/PlatformMatching.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ let getTargetCondition (target:TargetProfile) =
| XamarinMac -> "$(TargetFrameworkIdentifier) == 'Xamarin.Mac'", ""
| Native("","") -> "true", ""
| Native("",bits) -> (sprintf "'$(Platform)'=='%s'" bits), ""
| Runtimes(platform) -> failwithf "Runtime dependencies are unsupported in project files."
| Native(profile,bits) -> (sprintf "'$(Configuration)|$(Platform)'=='%s|%s'" profile bits), ""
| PortableProfile(name, _) -> sprintf "$(TargetFrameworkProfile) == '%O'" name,""

Expand All @@ -181,14 +182,17 @@ let getCondition (referenceCondition:string option) (targets : TargetProfile lis
|> CheckIfFullyInGroup "WindowsPhoneApp" (fun x -> match x with | SinglePlatform(WindowsPhoneApp(_)) -> true | _ -> false)
|> CheckIfFullyInGroup "WindowsPhone" (fun x -> match x with | SinglePlatform(WindowsPhoneSilverlight(_)) -> true | _ -> false)

let conditions =
if targets = [SinglePlatform(Native("",""))] then
targets
else
let conditions =
if targets = [ SinglePlatform(Native("", "")) ] then
targets
|> List.filter (fun x -> match x with | SinglePlatform(Native("","")) -> false | _ -> true )
else
targets
|> List.filter (function
| SinglePlatform(Native("", "")) -> false
| SinglePlatform(Runtimes(_)) -> false
| _ -> true)
|> List.map getTargetCondition
|> List.filter (fun (_,v) -> v <> "false")
|> List.filter (fun (_, v) -> v <> "false")
|> List.append grouped
|> List.groupBy fst

Expand Down
5 changes: 4 additions & 1 deletion src/Paket.Core/ProjectFile.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,10 @@ module ProjectFile =

let conditions =
model.ReferenceFileFolders
|> List.map (fun lib -> PlatformMatching.getCondition referenceCondition lib.Targets,createItemGroup lib.Files.References)
|> List.choose (fun lib ->
match lib with
| x when (match x.Targets with | [SinglePlatform(Runtimes(_))] -> true | _ -> false) -> None // TODO: Add reference to custom task instead
| _ -> Some (PlatformMatching.getCondition referenceCondition lib.Targets,createItemGroup lib.Files.References))
|> List.sortBy fst

let targetsFileConditions =
Expand Down
25 changes: 15 additions & 10 deletions src/Paket.Core/PublicAPI.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ open Chessie.ErrorHandling

/// Paket API which is optimized for F# Interactive use.
type Dependencies(dependenciesFileName: string) =
let getLockFile() =
let lockFileName = DependenciesFile.FindLockfile dependenciesFileName
LockFile.LoadFrom(lockFileName.FullName)

let listPackages (packages: System.Collections.Generic.KeyValuePair<GroupName*PackageName, PackageResolver.ResolvedPackage> seq) =
packages
Expand All @@ -34,6 +31,14 @@ type Dependencies(dependenciesFileName: string) =
/// Tries to locate the paket.dependencies file in the current folder or a parent folder.
static member Locate(): Dependencies = Dependencies.Locate(Environment.CurrentDirectory)

/// Returns an instance of the paket.lock file.
member this.GetLockFile() =
let lockFileName = DependenciesFile.FindLockfile dependenciesFileName
LockFile.LoadFrom(lockFileName.FullName)

/// Returns an instance of the paket.dependencies file.
member this.GetDependenciesFile() = DependenciesFile.ReadFromFile dependenciesFileName

/// Tries to locate the paket.dependencies file in the given folder or a parent folder.
static member Locate(path: string): Dependencies =
let rec findInPath(dir:DirectoryInfo,withError) =
Expand Down Expand Up @@ -311,15 +316,15 @@ type Dependencies(dependenciesFileName: string) =
| None -> Constants.MainDependencyGroup
| Some name -> GroupName name

match getLockFile().Groups |> Map.tryFind groupName with
match this.GetLockFile().Groups |> Map.tryFind groupName with
| None -> None
| Some group ->
group.Resolution.TryFind(PackageName packageName)
|> Option.map (fun package -> package.Version.ToString())

/// Returns the installed versions of all installed packages.
member this.GetInstalledPackages(): (string * string * string) list =
getLockFile().GetGroupedResolution()
this.GetLockFile().GetGroupedResolution()
|> listPackages

/// Returns all sources from the dependencies file.
Expand All @@ -340,7 +345,7 @@ type Dependencies(dependenciesFileName: string) =

/// Returns the installed versions of all installed packages which are referenced in the references file.
member this.GetInstalledPackages(referencesFile:ReferencesFile): (string * string * string) list =
let lockFile = getLockFile()
let lockFile = this.GetLockFile()
let resolved = lockFile.GetGroupedResolution()
referencesFile
|> lockFile.GetPackageHull
Expand Down Expand Up @@ -386,7 +391,7 @@ type Dependencies(dependenciesFileName: string) =
|> Seq.map (fun kv -> kv.Value.NugetPackages |> List.map (fun p -> kv.Key, p.Name))
|> List.concat

getLockFile().GetGroupedResolution()
this.GetLockFile().GetGroupedResolution()
|> Seq.filter (fun kv -> normalizedDependendenciesFromRefFile |> Seq.exists ((=) kv.Key))
|> Seq.filter (fun kv -> normalizedDependencies |> Seq.exists ((=) kv.Key))
|> listPackages
Expand All @@ -399,7 +404,7 @@ type Dependencies(dependenciesFileName: string) =
|> Seq.map (fun kv -> dependenciesFile.GetDependenciesInGroup(kv.Value.Name) |> Seq.map (fun kv' -> kv.Key, kv'.Key) |> Seq.toList)
|> List.concat

getLockFile().GetGroupedResolution()
this.GetLockFile().GetGroupedResolution()
|> Seq.filter (fun kv -> normalizedDependencies |> Seq.exists ((=) kv.Key))
|> listPackages

Expand All @@ -412,7 +417,7 @@ type Dependencies(dependenciesFileName: string) =

/// Returns the direct dependencies for the given package.
member this.GetDirectDependenciesForPackage(groupName,packageName:string): (string * string * string) list =
let resolvedPackages = getLockFile().GetGroupedResolution()
let resolvedPackages = this.GetLockFile().GetGroupedResolution()
let package = resolvedPackages.[groupName, (PackageName packageName)]
let normalizedDependencies = package.Dependencies |> Seq.map (fun (name,_,_) -> groupName, name) |> Seq.toList

Expand Down Expand Up @@ -560,7 +565,7 @@ type Dependencies(dependenciesFileName: string) =

/// Lists all paket.template files in the current solution.
member this.ListTemplateFiles() : TemplateFile list =
let lockFile = getLockFile()
let lockFile = this.GetLockFile()
ProjectFile.FindAllProjects(this.RootPath)
|> Array.choose (fun proj -> ProjectFile.FindTemplatesFile(FileInfo(proj.FileName)))
|> Array.choose (fun path ->
Expand Down
21 changes: 16 additions & 5 deletions src/Paket.Core/Utils.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ let inline createRelativePath root path =
uri.MakeRelativeUri(Uri path).ToString().Replace("/", "\\").Replace("%20", " ")

let getNative (path:string) =
if path.Contains "native" |> not then "" else
if path.Contains "/x86/debug" then "x86/debug" else
if path.Contains "/x86/release" then "/x86/release" else
if path.Contains "/arm/debug" then "/arm/debug" else
Expand All @@ -145,28 +146,38 @@ let getNative (path:string) =
if path.Contains "/x64/release" then "/x64/release" else
if path.Contains "/address-model-32" then "/address-model-32" else
if path.Contains "/address-model-64" then "/address-model-64" else
if path.Contains "/win7-x64" then "/win7-x64" else
if path.Contains "/win7-x86" then "/win7-x86" else
if path.Contains "/win7-arm" then "/win7-arm" else
if path.Contains "/debian-x64" then "/debian-x64" else
if path.Contains "/osx" then "/osx" else
""

let extractPath =
memoize <| fun (infix, fileName : string) ->
let path = fileName.Replace("\\", "/").ToLower()
let path = if path.StartsWith "lib/" then "/" + path else path
let needle = sprintf "/%s/" infix
if path.Contains needle |> not then None else
let fi = FileInfo path

let packagesPos = path.LastIndexOf "packages/"
let startPos =
if packagesPos >= 0 then
path.IndexOf(sprintf "/%s/" infix,packagesPos) + 1
path.IndexOf(needle,packagesPos) + 1
else
path.LastIndexOf(sprintf "/%s/" infix) + 1
path.LastIndexOf(needle) + 1

let endPos = path.IndexOf('/', startPos + infix.Length + 1)
if startPos < 0 then None
elif endPos < 0 then Some("")
else
let nativePart = getNative path
let libPart = path.Substring(startPos + infix.Length + 1, endPos - startPos - infix.Length - 1)
Some (libPart + nativePart)
if infix = "runtimes" then
Some("runtimes" + getNative path)
else
let nativePart = getNative path
let libPart = path.Substring(startPos + infix.Length + 1, endPos - startPos - infix.Length - 1)
Some (libPart + nativePart)

/// [omit]
let inline normalizeXml (doc:XmlDocument) =
Expand Down
4 changes: 4 additions & 0 deletions src/Paket/Paket.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,15 @@
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="Commands.fs" />
<Compile Include="PlatformTask.fs" />
<Compile Include="Program.fs" />
<Content Include="App.config" />
<None Include="paket.references" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.Build" />
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="Microsoft.Build.Utilities.v4.0" />
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
Loading