Merge pull request #3224 from ludovic-henry/iolayer-extract-wait-handle

[mono.git] / mcs / class / corlib / System.Reflection / AssemblyName.cs

diff --git a/mcs/class/corlib/System.Reflection/AssemblyName.cs b/mcs/class/corlib/System.Reflection/AssemblyName.cs
index c1114225767e564c7cb97f2774dbb07ca3e6f485..9da34563f241ccf3e575df1e5acc425dfae28f90 100644 (file)
--- 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
        }
 }