Skip to content

Fix 2222 - improve output of the outdated warning and fix underlying bug #2223

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 8 commits into from
Apr 9, 2017
Merged

Fix 2222 - improve output of the outdated warning and fix underlying bug #2223

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fd07e55
improve output of the outdated warning.
matthid Apr 9, 2017
14319bd
fixes #2222 , paket was not able to properly parse its own output.
matthid Apr 9, 2017
3d5551a
at least log (maybe even fail?) in such edge cases
matthid Apr 9, 2017
36a3269
of course the logging immediatly found another bug...
matthid Apr 9, 2017
28e98e5
fail directly as this finds bugs... but ignore nuget texts otherwise …
matthid Apr 9, 2017
fb3096e
update tests
matthid Apr 9, 2017
2728bea
apparently the other way around is better (as we don't have to change…
matthid Apr 9, 2017
6cb4a35
some cleanup...
matthid Apr 9, 2017
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
3 changes: 1 addition & 2 deletions src/Paket.Core/DependencyChangeDetection.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ let findNuGetChangesInDependenciesFile(dependenciesFile:DependenciesFile,lockFil
| Some pr ->
let t = t.Value
let t = { t with Settings = lockFile.GetGroup(groupName).Options.Settings + t.Settings }
yield groupName, name, getChanges groupName transitives pr t// then
// yield groupName, name // Modified
yield groupName, name, getChanges groupName transitives pr t // Modified
| _ -> yield groupName, name, [PackageNotFoundInDependenciesFile] // Removed
]
|> List.filter (fun (_,_, changes) -> changes.Length > 0)
Expand Down
4 changes: 2 additions & 2 deletions src/Paket.Core/FrameworkHandling.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,8 @@ module FrameworkDetection =
| "netstandard14" -> Some(DotNetStandard DotNetStandardVersion.V1_4)
| "netstandard15" -> Some(DotNetStandard DotNetStandardVersion.V1_5)
| "netstandard16" -> Some(DotNetStandard DotNetStandardVersion.V1_6)
| "netcore10" | "netcoreapp10" -> Some (DotNetCore DotNetCoreVersion.V1_0)
| "netcore11" | "netcoreapp11" -> Some (DotNetCore DotNetCoreVersion.V1_1)
| "netcore10" -> Some (DotNetCore DotNetCoreVersion.V1_0)
| "netcore11" -> Some (DotNetCore DotNetCoreVersion.V1_1)

@matthid matthid Apr 9, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: This is in fact cleanup as we have the netcoreapp -> netcore alias defined above.

| v when v.StartsWith "netstandard" -> Some(DotNetStandard DotNetStandardVersion.V1_6)
| _ -> None
result)
Expand Down
3 changes: 1 addition & 2 deletions src/Paket.Core/Requirements.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ let parseRestrictions failImmediatly (text:string) =
if verbose then
(fun s ->
traceError s
traceVerbose Environment.StackTrace
)
traceVerbose Environment.StackTrace)
else traceError
let text =
// workaround missing spaces
Expand Down