Imported Upstream version 4.0.1

Former-commit-id: 757121caeaad523350be5330f0a3ecc891c70fb8
2015-04-26 19:10:23 +01:00
parent 7fce50ac98
commit c54b0bda4e
252 changed files with 16715 additions and 1176 deletions
--- a/external/referencesource/System/compmod/system/componentmodel/CategoryAttribute.cs
+++ b/external/referencesource/System/compmod/system/componentmodel/CategoryAttribute.cs
@@ -314,8 +314,10 @@ namespace System.ComponentModel {
            case "Config":
                return "PropertyCategoryConfig";
            }
-#endif
+            return value;
+#else
            return (string)SR.GetObject("PropertyCategory" + value);
+#endif
 #else
            bool usedFallback;
            string localizedString = SR.GetString("PropertyCategory" + value, out usedFallback);