Skip to content

Commit

Permalink
Revert "Do not reference NETStandard.Library directly - fixes #2852"
Browse files Browse the repository at this point in the history
This reverts commit 25643f1.

# Conflicts:
#	RELEASE_NOTES.md
#	src/Paket.Core/Installation/RestoreProcess.fs
  • Loading branch information
forki committed Oct 18, 2017
1 parent 93c06f0 commit fdd2eea
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
3 changes: 3 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#### 5.116.1 - 2017-10-18
* REVERT: Do not reference NETStandard.Library directly - https://github.com/fsprojects/Paket/issues/2852

#### 5.116.0 - 2017-10-18
* USABILITY: No need for .clitools file in /obj anymore

Expand Down
11 changes: 4 additions & 7 deletions src/Paket.Core/Installation/RestoreProcess.fs
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,6 @@ let createPaketPropsFile (cliTools:ResolvedPackage seq) restoreSuccess (fileInfo
if verbose then
tracefn " - %s already up-to-date" fileInfo.FullName

let ImplicitPackages = [PackageName "NETStandard.Library"] |> Set.ofList

let createProjectReferencesFiles (lockFile:LockFile) (projectFile:ProjectFile) (referencesFile:ReferencesFile) (resolved:Lazy<Map<GroupName*PackageName,PackageInfo>>) (groups:Map<GroupName,LockFileGroup>) =
let projectFileInfo = FileInfo projectFile.FileName
let hulls =
Expand Down Expand Up @@ -295,11 +293,10 @@ let createProjectReferencesFiles (lockFile:LockFile) (projectFile:ProjectFile) (
let restore =
let resolvedPackage = resolved.Force().[key]

not (ImplicitPackages.Contains resolvedPackage.Name) &&
match resolvedPackage.Settings.FrameworkRestrictions with
| Requirements.ExplicitRestriction restrictions ->
Requirements.isTargetMatchingRestrictions(restrictions, targetProfile)
| _ -> true
match resolvedPackage.Settings.FrameworkRestrictions with
| Requirements.ExplicitRestriction restrictions ->
Requirements.isTargetMatchingRestrictions(restrictions, targetProfile)
| _ -> true

if restore then
let _,packageName = key
Expand Down

0 comments on commit fdd2eea

Please sign in to comment.