Skip to content

Commit e19d165

Browse files
committed
Merge pull request #647 from JonCanning/master
Detect 4.5.1
2 parents ebae7dd + 1c89388 commit e19d165

3 files changed

Lines changed: 5 additions & 14 deletions

File tree

‎src/Paket.Core/DependenciesFile.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ type DependenciesFile(fileName,options,sources,packages : PackageRequirement lis
302302
{ ResolvedPackages = PackageResolver.Resolve(getVersionF, getPackageDetailsF, options.Settings.FrameworkRestrictions, remoteDependencies @ packages)
303303
ResolvedSourceFiles = remoteFiles }
304304

305-
member __.AddAdditionionalPackage(packageName:PackageName,version:string,settings) =
305+
member __.AddAdditionalPackage(packageName:PackageName,version:string,settings) =
306306
let versionRange = DependenciesFileParser.parseVersionRequirement (version.Trim '!')
307307
let sources =
308308
match packages |> List.rev with
@@ -374,7 +374,7 @@ type DependenciesFile(fileName,options,sources,packages : PackageRequirement lis
374374
tracefn "Adding %s to %s" name fileName
375375
else
376376
tracefn "Adding %s %s to %s" name version fileName
377-
this.AddAdditionionalPackage(packageName,version,InstallSettings.Default)
377+
this.AddAdditionalPackage(packageName,version,InstallSettings.Default)
378378

379379
member this.Remove(packageName) =
380380
let (PackageName name) = packageName

‎src/Paket.Core/FrameworkHandling.fs‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,8 @@ module KnownAliases =
4242
"windowsphone", "wp"
4343
"windows", "win"
4444
"windowsPhoneApp", "wpa"
45-
46-
"1.0", "10"
47-
"1.1", "11"
48-
"2.0", "20"
49-
"3.5", "35"
50-
"4.0", "40"
51-
"4.5", "45"
52-
"5.0", "50"
53-
"8.0", "80"
54-
"8.1", "81"
55-
"0.0", "" ]
45+
"0.0", ""
46+
".", "" ]
5647
|> List.map (fun (p,r) -> p.ToLower(),r.ToLower())
5748

5849

‎src/Paket.Core/UpdateProcess.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ let addPackagesFromReferenceFiles projects (dependenciesFile:DependenciesFile) =
4040
if dependenciesFile.HasPackage dep.Name then
4141
dependenciesFile
4242
else
43-
dependenciesFile.AddAdditionionalPackage(dep.Name,"",dep.Settings)) dependenciesFile
43+
dependenciesFile.AddAdditionalPackage(dep.Name,"",dep.Settings)) dependenciesFile
4444
newDependenciesFile.Save()
4545
newDependenciesFile
4646

0 commit comments

Comments
 (0)