Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kotas <jkotas@microsoft.com>2017-02-08 08:25:58 +0300
committerGitHub <noreply@github.com>2017-02-08 08:25:58 +0300
commitc3b7d4fad979eb52c8ffbfb180e8c18ac4fb632b (patch)
tree876839ab6bb882805fddcbe65e49e427d06866ce
parentc537ba673aa58ff60804d96d89611638c8680289 (diff)
Delete unnecessary ifdef (#15940)
-rw-r--r--src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj1
-rw-r--r--src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/FormatterServices.cs23
2 files changed, 2 insertions, 22 deletions
diff --git a/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj b/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj
index 342bb8af86..123507c561 100644
--- a/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj
+++ b/src/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj
@@ -5,7 +5,6 @@
<ProjectGuid>{CF80D24A-787A-43DB-B9E7-10BCA02D10EA}</ProjectGuid>
<AssemblyName>System.Runtime.Serialization.Formatters</AssemblyName>
<RootNamespace>System.Runtime.Serialization.Formatters</RootNamespace>
- <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);netcoreapp11</DefineConstants>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Debug|AnyCPU'" />
diff --git a/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/FormatterServices.cs b/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/FormatterServices.cs
index 2b59de0b5d..352b943879 100644
--- a/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/FormatterServices.cs
+++ b/src/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/FormatterServices.cs
@@ -67,28 +67,9 @@ namespace System.Runtime.Serialization
// nop
}
-#if !netcoreapp11
- private static readonly Func<Type, object> s_getUninitializedObjectDelegate = (Func<Type, object>)
- typeof(string).Assembly
- .GetType("System.Runtime.Serialization.FormatterServices")
- .GetMethod("GetUninitializedObject", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static)
- .CreateDelegate(typeof(Func<Type, object>));
-#endif // netcoreapp11
-
- public static object GetUninitializedObject(Type type)
- {
- if (type == null)
- {
- throw new ArgumentNullException(nameof(type));
- }
-#if netcoreapp11
- return RuntimeHelpers.GetUninitializedObject(type);
-#else
- return s_getUninitializedObjectDelegate(type);
-#endif // netcoreapp11
- }
+ public static object GetUninitializedObject(Type type) => RuntimeHelpers.GetUninitializedObject(type);
- public static object GetSafeUninitializedObject(Type type) => GetUninitializedObject(type);
+ public static object GetSafeUninitializedObject(Type type) => RuntimeHelpers.GetUninitializedObject(type);
internal static void SerializationSetValue(MemberInfo fi, object target, object value)
{