X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem.Reflection%2FAssemblyName.cs;h=9da34563f241ccf3e575df1e5acc425dfae28f90;hb=ac194553049b2eeb328f5fc54b708da9b95f4d88;hp=c1114225767e564c7cb97f2774dbb07ca3e6f485;hpb=2ab02d99c44321dfc73fd10bee7a6fbf7016116b;p=mono.git diff --git a/mcs/class/corlib/System.Reflection/AssemblyName.cs b/mcs/class/corlib/System.Reflection/AssemblyName.cs index c1114225767..9da34563f24 100644 --- a/mcs/class/corlib/System.Reflection/AssemblyName.cs +++ b/mcs/class/corlib/System.Reflection/AssemblyName.cs @@ -76,9 +76,7 @@ namespace System.Reflection { #endregion #pragma warning restore 169 -#if NET_4_5 AssemblyContentType contentType; -#endif public AssemblyName () { // defaults @@ -431,14 +429,9 @@ namespace System.Reflection { } #endif -#if NET_4_5 public string CultureName { get { - if (cultureinfo == null) - return null; - if (cultureinfo.LCID == CultureInfo.InvariantCulture.LCID) - return "neutral"; - return cultureinfo.Name; + return (cultureinfo == null)? null : cultureinfo.Name; } } @@ -451,6 +444,5 @@ namespace System.Reflection { contentType = value; } } -#endif } }