Some more code for testing.
Added NET_35 symbol.
Cleaned up the NuGet definition a little.
Fixed some mapping.