Use .net standard 2.0 APIs

Mono.Cecil.Cil/Symbols.cs

@@ -938,7 +938,7 @@ static SR.AssemblyName GetSymbolAssemblyName (SymbolKind kind)
 
 			var suffix = GetSymbolNamespace (kind);
 
-			var cecil_name = typeof (SymbolProvider).Assembly ().GetName ();
+			var cecil_name = typeof (SymbolProvider).Assembly.GetName ();
 
 			var name = new SR.AssemblyName {
 				Name = cecil_name.Name + "." + suffix,

Mono.Cecil/AssemblyWriter.cs

@@ -103,12 +103,10 @@ static void Write (ModuleDefinition module, Disposable<Stream> stream, WriterPar
 			if (symbol_writer_provider == null && parameters.WriteSymbols)
 				symbol_writer_provider = new DefaultSymbolWriterProvider ();
 
-#if !NET_CORE
 			if (parameters.StrongNameKeyPair != null && name != null) {
 				name.PublicKey = parameters.StrongNameKeyPair.PublicKey;
 				module.Attributes |= ModuleAttributes.StrongNameSigned;
 			}
-#endif
 
 			var metadata = new MetadataBuilder (module, fq_name, timestamp, symbol_writer_provider);
 			try {
@@ -122,10 +120,8 @@ static void Write (ModuleDefinition module, Disposable<Stream> stream, WriterPar
 					stream.value.SetLength (0);
 					writer.WriteImage ();
 
-#if !NET_CORE
 					if (parameters.StrongNameKeyPair != null)
 						CryptoService.StrongName (stream.value, writer, parameters.StrongNameKeyPair);
-#endif
 				}
 			} finally {
 				module.metadata_builder = null;
@@ -1917,7 +1913,7 @@ static ElementType GetConstantType (TypeReference constant_type, object constant
 
 		static ElementType GetConstantType (Type type)
 		{
-			switch (type.GetTypeCode ()) {
+			switch (Type.GetTypeCode(type)) {
 			case TypeCode.Boolean:
 				return ElementType.Boolean;
 			case TypeCode.Byte:
@@ -2977,7 +2973,7 @@ void WritePrimitiveValue (object value)
 			if (value == null)
 				throw new ArgumentNullException ();
 
-			switch (value.GetType ().GetTypeCode ()) {
+			switch (Type.GetTypeCode(value.GetType ())) {
 			case TypeCode.Boolean:
 				WriteByte ((byte) (((bool) value) ? 1 : 0));
 				break;

Mono.Cecil/BaseAssemblyResolver.cs

@@ -191,10 +191,7 @@ AssemblyDefinition SearchTrustedPlatformAssemblies (AssemblyNameReference name,
 			string paths;
 
 			try {
-				// AppContext is only available on platforms that implement .NET Standard 1.6
-				var appContextType = Type.GetType ("System.AppContext, System.AppContext, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", throwOnError: false);
-				var getData = appContextType?.GetTypeInfo ().GetDeclaredMethod ("GetData");
-				paths = (string) getData?.Invoke (null, new [] { "TRUSTED_PLATFORM_ASSEMBLIES" });
+				paths = (string) AppDomain.CurrentDomain.GetData ("TRUSTED_PLATFORM_ASSEMBLIES");
 			} catch {
 				paths = null;
 			}
@@ -380,7 +377,7 @@ AssemblyDefinition GetAssemblyInNetGac (AssemblyNameReference reference, ReaderP
 
 			return null;
 		}
-#endif
+
 		static string GetAssemblyFile (AssemblyNameReference reference, string prefix, string gac)
 		{
 			var gac_folder = new StringBuilder ()
@@ -396,7 +393,7 @@ static string GetAssemblyFile (AssemblyNameReference reference, string prefix, s
 					Path.Combine (gac, reference.Name), gac_folder.ToString ()),
 				reference.Name + ".dll");
 		}
-
+#endif
 		public void Dispose ()
 		{
 			Dispose (true);

Mono.Cecil/Import.cs

@@ -178,7 +178,7 @@ TypeReference ImportType (Type type, ImportGenericContext context, ImportGeneric
 				type.Name,
 				module,
 				ImportScope (type),
-				type.IsValueType ());
+				type.IsValueType);
 
 			reference.etype = ImportElementType (type);
 
@@ -187,20 +187,20 @@ TypeReference ImportType (Type type, ImportGenericContext context, ImportGeneric
 			else
 				reference.Namespace = type.Namespace ?? string.Empty;
 
-			if (type.IsGenericType ())
+			if (type.IsGenericType)
 				ImportGenericParameters (reference, type.GetGenericArguments ());
 
 			return reference;
 		}
 
 		protected virtual IMetadataScope ImportScope (Type type)
 		{
-			return ImportScope (type.Assembly ());
+			return ImportScope (type.Assembly);
 		}
 
 		static bool ImportOpenGenericType (Type type, ImportGenericKind import_kind)
 		{
-			return type.IsGenericType () && type.IsGenericTypeDefinition () && import_kind == ImportGenericKind.Open;
+			return type.IsGenericType && type.IsGenericTypeDefinition && import_kind == ImportGenericKind.Open;
 		}
 
 		static bool ImportOpenGenericMethod (SR.MethodBase method, ImportGenericKind import_kind)
@@ -224,7 +224,7 @@ TypeReference ImportTypeSpecification (Type type, ImportGenericContext context)
 			if (type.IsArray)
 				return new ArrayType (ImportType (type.GetElementType (), context), type.GetArrayRank ());
 
-			if (type.IsGenericType ())
+			if (type.IsGenericType)
 				return ImportGenericInstance (type, context);
 
 			if (type.IsGenericParameter)
@@ -238,8 +238,8 @@ static TypeReference ImportGenericParameter (Type type, ImportGenericContext con
 			if (context.IsEmpty)
 				throw new InvalidOperationException ();
 
-			if (type.DeclaringMethod () != null)
-				return context.MethodParameter (NormalizeMethodName (type.DeclaringMethod ()), type.GenericParameterPosition);
+			if (type.DeclaringMethod != null)
+				return context.MethodParameter (NormalizeMethodName (type.DeclaringMethod), type.GenericParameterPosition);
 
 			if (type.DeclaringType != null)
 				return context.TypeParameter (NormalizeTypeFullName (type.DeclaringType), type.GenericParameterPosition);
@@ -287,7 +287,7 @@ static bool IsTypeSpecification (Type type)
 
 		static bool IsGenericInstance (Type type)
 		{
-			return type.IsGenericType () && !type.IsGenericTypeDefinition ();
+			return type.IsGenericType && !type.IsGenericTypeDefinition;
 		}
 
 		static ElementType ImportElementType (Type type)
@@ -315,10 +315,8 @@ public virtual AssemblyNameReference ImportReference (SR.AssemblyName name)
 			reference = new AssemblyNameReference (name.Name, name.Version)
 			{
 				PublicKeyToken = name.GetPublicKeyToken (),
-#if !NET_CORE
 				Culture = name.CultureInfo.Name,
 				HashAlgorithm = (AssemblyHashAlgorithm) name.HashAlgorithm,
-#endif
 			};
 
 			module.AssemblyReferences.Add (reference);
@@ -364,20 +362,12 @@ FieldReference ImportField (SR.FieldInfo field, ImportGenericContext context)
 
 		static SR.FieldInfo ResolveFieldDefinition (SR.FieldInfo field)
 		{
-#if NET_CORE
-			throw new NotImplementedException ();
-#else
 			return field.Module.ResolveField (field.MetadataToken);
-#endif
 		}
 
 		static SR.MethodBase ResolveMethodDefinition (SR.MethodBase method)
 		{
-#if NET_CORE
-			throw new NotImplementedException ();
-#else
 			return method.Module.ResolveMethod (method.MetadataToken);
-#endif
 		}
 
 		MethodReference ImportMethod (SR.MethodBase method, ImportGenericContext context, ImportGenericKind import_kind)

Mono.Cecil/ModuleDefinition.cs

@@ -183,25 +183,7 @@ public ModuleParameters ()
 
 		static TargetRuntime GetCurrentRuntime ()
 		{
-#if !NET_CORE
 			return typeof (object).Assembly.ImageRuntimeVersion.ParseRuntime ();
-#else
-			var corlib_name = AssemblyNameReference.Parse (typeof (object).Assembly ().FullName);
-			var corlib_version = corlib_name.Version;
-
-			switch (corlib_version.Major) {
-			case 1:
-				return corlib_version.Minor == 0
-					? TargetRuntime.Net_1_0
-					: TargetRuntime.Net_1_1;
-			case 2:
-				return TargetRuntime.Net_2_0;
-			case 4:
-				return TargetRuntime.Net_4_0;
-			default:
-				throw new NotSupportedException ();
-			}
-#endif
 		}
 	}
 
@@ -211,9 +193,7 @@ public sealed class WriterParameters {
 		Stream symbol_stream;
 		ISymbolWriterProvider symbol_writer_provider;
 		bool write_symbols;
-#if !NET_CORE
 		SR.StrongNameKeyPair key_pair;
-#endif
 
 		public uint? Timestamp {
 			get { return timestamp; }
@@ -235,12 +215,10 @@ public sealed class WriterParameters {
 			set { write_symbols = value; }
 		}
 
-#if !NET_CORE
 		public SR.StrongNameKeyPair StrongNameKeyPair {
 			get { return key_pair; }
 			set { key_pair = value; }
 		}
-#endif
 	}
 
 #endif

Mono.Security.Cryptography/CryptoConvert.cs

@@ -29,8 +29,6 @@
 
 #if !READ_ONLY
 
-#if !NET_CORE
-
 using System;
 using System.Security.Cryptography;
 
@@ -248,6 +246,3 @@ static public RSA FromCapiKeyBlob (byte[] blob, int offset)
 }
 
 #endif
-
-#endif
-

Mono.Security.Cryptography/CryptoService.cs

@@ -10,8 +10,6 @@
 
 #if !READ_ONLY
 
-#if !NET_CORE
-
 using System;
 using System.IO;
 using System.Reflection;
@@ -154,5 +152,3 @@ static bool TryGetKeyContainer (ISerializable key_pair, out byte [] key, out str
 }
 
 #endif
-
-#endif