PORTABLE improvements

Removed the #if..#endif around the RequiredIf and AssertThat TypeId Property. If PORTABLE they both inherit from ConditionAttribute, so the override is ok with and without PORTABLE.