Skip to content

Commit 514fdbc

Browse files
forkiforki
committed
moar cleanup
1 parent e625ac5 commit 514fdbc

File tree

4 files changed

+71
-76
lines changed

4 files changed

+71
-76
lines changed

‎src/Paket.Core/PaketConfigFiles/InstallModel.fs‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ module MsBuildFile =
6161
if String.IsNullOrEmpty ext then fi.Name
6262
else fi.Name.Replace(ext, "")
6363
{ Name = name; Path = unparsedFile.FullPath }
64-
64+
6565
let ofFrameworkDependantFile (f:FrameworkDependentFile) =
6666
ofUnparsedPackageFile f.File
6767

@@ -100,7 +100,7 @@ module FrameworkFolder =
100100
Targets = l.Targets
101101
FolderContents = f l.FolderContents
102102
}
103-
103+
104104
[<RequireQualifiedAccess>]
105105
type TargetsFolder<'T> = {
106106
Name: string
@@ -114,7 +114,7 @@ module TargetsFolder =
114114
folder.FrameworkFolders
115115
|> Seq.collect (fun f -> f.FolderContents)
116116
|> Seq.append (folder.RootContents)
117-
117+
118118
let isEmpty folder =
119119
folder
120120
|> getAllFiles
@@ -129,7 +129,7 @@ module TargetsFolder =
129129
{ Name = folder.Name
130130
RootContents = folder.RootContents
131131
FrameworkFolders = folder.FrameworkFolders |> List.map f }
132-
132+
133133
type AnalyzerLanguage =
134134
| Any | CSharp | FSharp | VisualBasic
135135

@@ -385,7 +385,7 @@ module FolderScanner =
385385
ScanParserFailure error
386386
| None ->
387387
ScanSuccess (results |> Array.map (function ParseSucceeded res -> res | ParseError _ -> failwithf "Should not happen here"))
388-
| _ as s -> s
388+
| s -> s
389389

390390
let trySscanfExt context advancedScanners opts (pf:PrintfFormat<_,_,_,_,'t>) s : 't option =
391391
match sscanfExtHelper context advancedScanners opts pf s with
@@ -546,25 +546,24 @@ module InstallModel =
546546
/// This is for reference assemblies (new dotnetcore world)
547547
let getCompileReferences (target: TargetProfile) (installModel : InstallModel) =
548548
let results =
549-
getFileFolders target (installModel.CompileRefFolders) (fun f -> f |> Set.toSeq )
549+
getFileFolders target (installModel.CompileRefFolders) Set.toSeq
550550
|> Seq.cache
551551
if results |> Seq.isEmpty then
552552
// Fallback for old packages
553553
getLegacyReferences target installModel
554554
else results
555-
555+
556556
let getTargetsFiles (target : TargetProfile) (installModel:InstallModel) =
557557
let frameworkSpecificFolders =
558558
installModel.TargetsFileFolders
559559
|> List.collect (fun target -> target.FrameworkFolders)
560-
560+
561561
let frameworkSpecificTargetFiles = getFileFolders target frameworkSpecificFolders Set.toSeq
562562
let rootTargetFiles =
563563
installModel.TargetsFileFolders
564-
|> List.map (fun folder -> folder.RootContents)
565-
|> List.map Set.toSeq
564+
|> List.map (fun folder -> Set.toSeq folder.RootContents)
566565
|> Seq.collect id
567-
566+
568567
seq {yield! rootTargetFiles; yield! frameworkSpecificTargetFiles}
569568

570569
/// This is for library references, which at the same time can be used for references (old world - pre dotnetcore)
@@ -575,7 +574,7 @@ module InstallModel =
575574
lib
576575
|> Seq.map (fun l -> l.FolderContents)
577576
|> Seq.forall Set.isEmpty
578-
577+
579578
let isEmpty' (folders: TargetsFolder<Set<'T>> list) =
580579
folders
581580
|> Seq.forall TargetsFolder.isEmpty
@@ -685,7 +684,7 @@ module InstallModel =
685684
|> List.ofSeq
686685

687686
{ installModel with PackageLoadScripts = installModel.PackageLoadScripts @ packageLoadScripts}
688-
687+
689688
let getAllRuntimeAssemblies (installModel:InstallModel) =
690689
getAllFiles installModel.RuntimeAssemblyFolders (fun f -> f |> Set.toSeq)
691690
|> Seq.cache
@@ -810,7 +809,7 @@ module InstallModel =
810809
references |> Seq.fold addFrameworkAssemblyReference (installModel:InstallModel)
811810

812811

813-
let filterExcludes (excludes:string list) (installModel:InstallModel) =
812+
let filterExcludes (excludes:string list) (installModel:InstallModel) =
814813
let excluded (e: string) (pathOrName:string) =
815814
pathOrName.Contains e
816815

@@ -871,7 +870,7 @@ module InstallModel =
871870
with FrameworkFolders = targetFolder.FrameworkFolders
872871
|> List.filter (fun folder -> not folder.Targets.IsEmpty) })
873872
}
874-
873+
875874
let getRootFiles (targetsFiles:UnparsedPackageFile list) =
876875
targetsFiles
877876
|> List.choose
@@ -884,11 +883,11 @@ module InstallModel =
884883
let rec addTargetsFiles (name: string) (targetsFiles:UnparsedPackageFile list) (this:InstallModel) : InstallModel =
885884
let frameworkFolders =
886885
calcLibFoldersG Set.empty getFrameworkDependentMsbuildFile targetsFiles
887-
886+
888887
let rootMsBuildFiles =
889888
targetsFiles
890-
|> getRootFiles
891-
889+
|> getRootFiles
890+
892891
let frameworkFolders =
893892
List.fold (fun (frameworkFolders:FrameworkFolder<MsBuildFile Set> list) file ->
894893
match getFrameworkDependentMsbuildFile file with
@@ -898,13 +897,13 @@ module InstallModel =
898897
addFileToFolder folder (MsBuildFile.ofFrameworkDependantFile parsedFile) frameworkFolders Set.add
899898
| _ -> frameworkFolders
900899
| None -> frameworkFolders) frameworkFolders targetsFiles
901-
900+
902901
let targetsFolder: TargetsFolder<MsBuildFile Set> = {
903902
Name = name
904903
RootContents = rootMsBuildFiles
905904
FrameworkFolders = frameworkFolders
906905
}
907-
906+
908907
{ this with TargetsFileFolders = targetsFolder::this.TargetsFileFolders }
909908

910909

@@ -1046,7 +1045,7 @@ type InstallModel with
10461045
member this.AddPackageLoadScriptFiles packageLoadScriptFiles = InstallModel.addPackageLoadScriptFiles packageLoadScriptFiles this
10471046

10481047
member this.AddTargetsFiles (name,targetsFiles) = InstallModel.addTargetsFiles name targetsFiles this
1049-
1048+
10501049
member this.AddTargetsFiles targetsFiles = InstallModel.addTargetsFiles "build" targetsFiles this
10511050

10521051
member this.AddFrameworkAssemblyReference reference = InstallModel.addFrameworkAssemblyReference this reference

‎src/Paket.Core/PaketConfigFiles/LocalFile.fs‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ open Paket.Domain
44
open Paket.ModuleResolver
55
open Paket.PackageSources
66

7-
type OverriddenPackage = {
7+
type OverriddenPackage = {
88
Name : PackageName
9-
Group : GroupName
9+
Group : GroupName
1010
}
1111

1212
type LocalOverride =
@@ -23,23 +23,23 @@ module LocalFile =
2323

2424
let private (|Regex|_|) pattern input =
2525
let m = System.Text.RegularExpressions.Regex(pattern).Match(input)
26-
if m.Success then
26+
if m.Success then
2727
Some(List.tail [ for g in m.Groups -> g.Value ])
28-
else
28+
else
2929
None
3030

31-
let nameGroup (name, group) =
32-
let group =
33-
if group = "" then
34-
Constants.MainDependencyGroup
35-
else
31+
let nameGroup (name, group) =
32+
let group =
33+
if group = "" then
34+
Constants.MainDependencyGroup
35+
else
3636
GroupName group
3737
{ Name = PackageName name
3838
Group = group }
3939

4040
let private parseLine = function
41-
| Regex
42-
"^nuget[ ]+(.*?)([ ]+group[ ]+(.*))?[ ]+->[ ]+(source[ ]+.*?)([ ]+version[ ]+(.*))?$"
41+
| Regex
42+
"^nuget[ ]+(.*?)([ ]+group[ ]+(.*))?[ ]+->[ ]+(source[ ]+.*?)([ ]+version[ ]+(.*))?$"
4343
[package; _; group; source; _; version] ->
4444
let v =
4545
if String.IsNullOrWhiteSpace version then None
@@ -54,7 +54,7 @@ module LocalFile =
5454
|> Trial.Catch PackageSource.Parse
5555
|> Trial.mapFailure (fun _ -> [sprintf "Cannot parse source '%s'" source])
5656
|> Trial.lift (fun s -> LocalSourceOverride (nameGroup(package, group), s, v))
57-
| Regex
57+
| Regex
5858
"nuget[ ]+(.*?)([ ]+group[ ]+(.*))?[ ]+->[ ]+git[ ]+(.*)"
5959
[package; _; group; gitSource] ->
6060
LocalGitOverride (nameGroup(package, group), gitSource)
@@ -78,12 +78,12 @@ module LocalFile =
7878

7979
let empty = LocalFile []
8080

81-
let private overrideResolution (p, v, source) resolution =
81+
let private overrideResolution (p, v, source) resolution =
8282
resolution
83-
|> Map.map (fun name original ->
83+
|> Map.map (fun name original ->
8484
if name = p then
8585
{ original with PackageResolver.ResolvedPackage.Source = source
86-
PackageResolver.ResolvedPackage.Version =
86+
PackageResolver.ResolvedPackage.Version =
8787
defaultArg v original.Version }
8888
else
8989
original)
@@ -101,24 +101,24 @@ module LocalFile =
101101
x
102102

103103
let overrideDependency (lockFile: LockFile) = warning >> function
104-
| LocalSourceOverride ({ Name = p; Group = group },s,v) ->
104+
| LocalSourceOverride ({ Name = p; Group = group },s,v) ->
105105
let groups =
106106
lockFile.Groups
107-
|> Map.map (fun name g ->
108-
if name = group then
107+
|> Map.map (fun name g ->
108+
if name = group then
109109
{ g with Resolution = overrideResolution (p,v,s) g.Resolution }
110110
else
111111
g )
112112
LockFile(lockFile.FileName, groups)
113113
| LocalGitOverride ({ Name = p; Group = group},s) ->
114-
let owner,branch,project,cloneUrl,buildCommand,operatingSystemRestriction,packagePath =
114+
let owner,branch,project,cloneUrl,buildCommand,operatingSystemRestriction,packagePath =
115115
Git.Handling.extractUrlParts s
116116
let restriction = VersionRestriction.Concrete (defaultArg branch "master")
117-
let sha =
118-
RemoteDownload.getSHA1OfBranch (GitLink cloneUrl) owner project restriction None
117+
let sha =
118+
RemoteDownload.getSHA1OfBranch (GitLink cloneUrl) owner project restriction None
119119
|> Async.RunSynchronously
120120

121-
let remoteFile = {
121+
let remoteFile = {
122122
ResolvedSourceFile.Commit = sha
123123
Owner = owner
124124
Origin = GitLink cloneUrl
@@ -127,11 +127,11 @@ module LocalFile =
127127
Command = buildCommand
128128
OperatingSystemRestriction = operatingSystemRestriction
129129
PackagePath = packagePath
130-
Name = ""
131-
AuthKey = None
130+
Name = ""
131+
AuthKey = None
132132
}
133133

134-
let packagesPath =
134+
let packagesPath =
135135
match packagePath with
136136
| Some p -> p
137137
| None ->
@@ -140,24 +140,24 @@ module LocalFile =
140140
let source groupName =
141141
let root = ""
142142
let fullPath = remoteFile.ComputeFilePath(root,groupName, packagesPath)
143-
let relative = (createRelativePath root fullPath).Replace("\\","/")
143+
let relative = (createRelativePath root fullPath).Replace("\\","/")
144144
LocalNuGet(relative, None)
145145

146146
let groups =
147147
lockFile.Groups
148-
|> Map.map (fun name g ->
148+
|> Map.map (fun name g ->
149149
if name = group then
150150
{ g with Resolution = overrideResolution (p,None,source g.Name) g.Resolution
151-
RemoteFiles = remoteFile :: g.RemoteFiles }
151+
RemoteFiles = remoteFile :: g.RemoteFiles }
152152
else
153153
g)
154154
LockFile(lockFile.FileName, groups)
155-
155+
156156
let overrideLockFile (LocalFile overrides) lockFile =
157157
List.fold overrideDependency lockFile overrides
158158

159159
let overrides (LocalFile xs) (package, group) =
160-
xs
160+
xs
161161
|> List.exists (function | LocalSourceOverride ({ Name = p; Group = g}, _, _)
162-
| LocalGitOverride ({ Name = p; Group = g}, _)
162+
| LocalGitOverride ({ Name = p; Group = g}, _)
163163
-> p = package && g = group)

‎src/Paket.Core/PaketConfigFiles/LockFile.fs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -718,14 +718,12 @@ type LockFile (fileName:string, groups: Map<GroupName,LockFileGroup>) =
718718

719719
member this.ResolveFrameworksForScriptGeneration () = lazy (
720720
this.Groups
721-
|> Seq.map (fun f -> f.Value.Options.Settings.FrameworkRestrictions)
722-
|> Seq.map(fun restrictions ->
723-
match restrictions with
721+
|> Seq.collect (fun kvp ->
722+
match kvp.Value.Options.Settings.FrameworkRestrictions with
724723
| Paket.Requirements.AutoDetectFramework -> failwithf "couldn't detect framework"
725724
| Paket.Requirements.ExplicitRestriction list ->
726725
list.RepresentedFrameworks |> Seq.choose (function TargetProfile.SinglePlatform tf -> Some tf | _ -> None)
727-
)
728-
|> Seq.concat
726+
)
729727
)
730728

731729
/// Gets only direct dependencies of the given package in the given group.
@@ -786,8 +784,7 @@ type LockFile (fileName:string, groups: Map<GroupName,LockFileGroup>) =
786784

787785
member this.GetGroupedResolution () =
788786
this.Groups
789-
|> Seq.map (fun kv -> kv.Value.Resolution |> Seq.map (fun kv' -> (kv.Key,kv'.Key),PackageInfo.from kv'.Value kv.Value.Options.Settings))
790-
|> Seq.concat
787+
|> Seq.collect (fun kv -> kv.Value.Resolution |> Seq.map (fun kv' -> (kv.Key,kv'.Key),PackageInfo.from kv'.Value kv.Value.Options.Settings))
791788
|> Map.ofSeq
792789

793790

@@ -992,18 +989,20 @@ type LockFile (fileName:string, groups: Map<GroupName,LockFileGroup>) =
992989
usedPackages
993990

994991
member this.GetDependencyLookupTable () =
995-
groups |> Seq.map (fun kv ->
992+
groups
993+
|> Seq.collect (fun kv ->
996994
kv.Value.Resolution |> Seq.map (fun kv' ->
997995
(kv.Key,kv'.Key),
998996
this.GetAllDependenciesOf(kv.Key,kv'.Value.Name,this.FileName)
999997
|> Set.ofSeq
1000998
|> Set.remove kv'.Value.Name
1001-
)) |> Seq.concat |> Map.ofSeq
999+
))
1000+
|> Map.ofSeq
10021001

10031002

10041003
member this.GetPackageHullSafe (referencesFile, groupName) =
10051004
match referencesFile.Groups |> Map.tryFind groupName with
1006-
| None -> Result.Succeed(Set.empty)
1005+
| None -> Result.Succeed Set.empty
10071006
| Some group ->
10081007
group.NugetPackages
10091008
|> Seq.map (fun package ->

0 commit comments

Comments
 (0)