Skip to content
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

Jump to bottom

[Ready] Fix/refactor/improve framework restriction system, add performance metrics and pre-load requests #2336

Merged
merged 49 commits into from
May 25, 2017
Merged

[Ready] Fix/refactor/improve framework restriction system, add performance metrics and pre-load requests #2336

merged 49 commits into from
May 25, 2017

Conversation

matthid
Copy link
Member

@matthid matthid commented May 13, 2017 •
edited
Loading

start fixing #2317 because #2333 shows that its relevant.

Changes:

  • Remove all magic version strings
  • Restrictions can now be as complex as wanted - the simplifier almost always makes them look as "simple" as before
  • Changed Syntax in Lockfile from "Framework: " to "Restriction: " in order to be backwards compatible and allow new syntax (see below).
  • Restrictions now work nicely in combination with Portable profiles
  • Removed a various amount of hacks
  • Remove support for V4_Client -> if complains come up we need to find a general solution as -client and -full exists for all framework versions
  • Adds a performance overview.

TODO:

  • Fix tests (part of Parallel requests #2356)
  • Performance
  • Lots of Json Exceptions seem to happen in the background...
  • Write parser for the new syntax
  • Is Syntax OK?

Example:

NUGET
  remote: https://www.nuget.org/api/v2
    CommonServiceLocator (1.3) - restriction: || (== sl5) (>= net40) (>= portable-net45 monoandroid xamarinios win8 wp8 wpa81)
    MvvmLightLibs (5.2)
      CommonServiceLocator (>= 1.0) - restriction: || (== net35) (== sl4)
      CommonServiceLocator (>= 1.3) - restriction: || (== sl5) (>= net40) (>= portable-net45 monoandroid xamarinios win8 wp8 wpa81)

The general syntax is

  • OP (operand1) (operand2) ... for ||, NOT and && and
  • OP tfm for ==, >= and <.
  • operandN itself can be a operator again, for example || (&& (>= net3) (< net4)) (== sl4)

Future Work:

@forki
Copy link
Member

forki commented May 14, 2017 via email

@matthid
Copy link
Member Author

matthid commented May 14, 2017

I don't think I can finish this in the next days, it will be quite invasive in the code base (and remove so many hacks that it might hurt). These changes just show the direction it's going.... For now, I just demonstrate how the low-level code is currently broken (and quite a lot of code sits on top of this)

matthid and others added 18 commits May 14, 2017 16:11
@matthid
initial (probably broken) compiling version.
624c71e
@matthid
we need to find all platforms supporting us in restriction logic.
1e187c8
@matthid
parsing nuspec is a bit more complicated than expected. We properly n…
a97805b 
…eed to detect the group restrictions in a future compatible way.
@matthid
generating a generic description is not as easy as it should be :/
b246942
@matthid
proper handling in addFrameworkRestrictionsToDependencies.
127a175
@matthid
refactor
98d3ab8
@matthid
make sure formulars are always in dnf (which makes writing the simpli…
7f86897 
…fier easier and only generated 'simple' formulas).
@matthid
refactor FrameworkIdentifier, remove V4_Client (if still needed we ne…
7f27225 
…ed to solve it for all version). Remove magic strings (not finished jet)
@matthid
refactor handling of portable profiles
c91e856
@matthid
properly implement SupportedPlatforms for PCL and start to fix test s…
4623d5d 
…uite.
@matthid
fix several bugs and tests
d1646af
@matthid
cleanup and more test fixes
e4c0f89
@matthid
increase cache version
6951693
@matthid
more cleanup and more test fixes.
8d15286
@matthid
cleanup and support for unknown portable profiles.
281b221
@matthid
cleanup and fix almost everything but the parser.
d02e5a0
@matthid
unit tests green again
9318160
@matthid
Cleanup and some code-simplifications.
8245a16
@matthid
Copy link
Member Author

matthid commented May 22, 2017

I think this is ready for review. Note that integration-tests probably need to be adapted, but I need some days break from this. If one of you wants to finish this let me know (like I said I think its just fixing the tests). Unittest-suite is green already. See my edited first post for more info.
/cc @cloudRoutine @forki

@matthid matthid mentioned this pull request May 22, 2017
Closed
@forki
Copy link
Member

forki commented May 23, 2017

files changed: 80 2,601 −1,895
ouch

matthid added 22 commits May 23, 2017 19:19
@matthid
more performance by using sets and removing some conversations
1390a07
@matthid
REVIEW: select another conflict
613b750
@matthid
REVIEW: compare restrictions at least (because it is slowest)
1d6088d
@matthid
Change Profile-Code to work in parallel and thread changing environme…
2fff14b 
…nts. Push Async down into the resolver to make the resolver aware that these are costly.
@matthid
preload dependency information, such that the resolver doesn't need t…
e6a7cf6 
…o wait.
@matthid
change the keys for the cache and delete an old cache.
7373ae6
@matthid
bugfix in new stats
a4e4d77
@matthid
add getPreferredVersionF to properly handle caching and preloading in…
a481dea 
… combination with resolverstrategy.
@matthid
let the user overwrite restriction globally
d7d39f8
@matthid
fix some tests and a bug in the simplifier.
e5fe351
@matthid
improve performance output
4a4090c
@matthid
more performance data & fix test
306e06d
@matthid
another test fixed
9dd5336
@matthid
fix a parser bug and another test
09220ea
@matthid
another test
dfbd104
@matthid
Fix Stackoverflows in DEBUG mode by increasing the Stack-Size (in a n…
364a5f4 
…ew Thread).
@matthid
fix tests
cb2f0ee
@matthid
add warning when something is not working as it should and fix caching.
ea40687
@matthid
fix test code
0ffa1d6
@matthid
fix test code
3874a3b
@matthid
Cleanup stuff
bba0419
@matthid
Merge pull request #2356 from fsprojects/parallel_requests
cf5c947 
Parallel requests
@matthid matthid changed the title [Ready for Review] Fix/refactor/improve framework restriction system [Ready for Review] Fix/refactor/improve framework restriction system, add performance metrics and pre-load requests May 24, 2017
@matthid matthid changed the title [Ready for Review] Fix/refactor/improve framework restriction system, add performance metrics and pre-load requests [Ready] Fix/refactor/improve framework restriction system, add performance metrics and pre-load requests May 24, 2017
@matthid
Copy link
Member Author

matthid commented May 24, 2017

I can try to merge and release tomorrow.

@matthid matthid merged commit e817322 into master May 25, 2017
@matthid matthid deleted the fix_restrictions branch May 25, 2017 09:30
This was referenced May 26, 2017
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@forki forki Awaiting requested review from forki

@cloudRoutine cloudRoutine Awaiting requested review from cloudRoutine

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@matthid @forki