Merge pull request #236 from hhblaze/master

migrating .net5

Author: rpgmaker

NetJSON/NetJSON.Internals.cs

@@ -93,7 +93,7 @@ sealed class NetJSONMemberInfo
 
 	static partial class CompatibleExtensions
 	{
-#if !NET_STANDARD && !NET_PCL && !NET_46 && !NET_47 && !NET_5
+#if !NET_STANDARD && !NET_PCL && !NET_46 && !NET_47 && !NET5_0
 		internal static Type GetTypeInfo(this Type type) {
 			return type;
 		}

NetJSON/NetJSON.cs

@@ -25,7 +25,7 @@
 using System.Xml.Serialization;
 
 
-#if NET_STANDARD && !NET_STANDARD_20
+#if NET_STANDARD && !NET_STANDARD_20 && !NET5_0
 using Microsoft.Extensions.DependencyModel;
 #endif
 
@@ -309,7 +309,7 @@ private static class NetJSONCachedSerializer<T> {
 
             private static NetJSONSerializer<T> GetSerializer()
             {     
-#if NET_STANDARD_20
+#if NET_STANDARD_20 || NET5_0
                 return new DynamicNetJSONSerializer<T>();
 #else
                 NetJSONSerializer<T> serializer = null;
@@ -1131,7 +1131,7 @@ public static void GenerateTypesInto(string asmName, params Type[] types) {
 
             }
 
-#if !NET_STANDARD && !NET_5
+#if !NET_STANDARD && !NET5_0
             assembly.Save(String.Concat(assembly.GetName().Name, _dllStr));
 #endif
         }
@@ -1159,7 +1159,7 @@ internal static Type Generate(Type objType) {
 
             _types[objType] = returnType;
 
-#if !NET_STANDARD && !NET_5
+#if !NET_STANDARD && !NET5_0
             if (_generateAssembly)
                 assembly.Save(String.Concat(assembly.GetName().Name, _dllStr));
 #endif
@@ -1376,7 +1376,7 @@ private static AssemblyBuilder GenerateAssemblyBuilder() {
                 lock (_lockAsmObject) {
                     if (_assembly == null) {
                         _assembly =
-#if NET_STANDARD || NET_5
+#if NET_STANDARD || NET5_0
                 AssemblyBuilder
 #else
                 AppDomain.CurrentDomain
@@ -1385,7 +1385,7 @@ private static AssemblyBuilder GenerateAssemblyBuilder() {
                             new AssemblyName(NET_JSON_GENERATED_ASSEMBLY_NAME) {
                                 Version = new Version(1, 0, 0, 0)
                             },
-#if NET_STANDARD || NET_5
+#if NET_STANDARD || NET5_0
                             AssemblyBuilderAccess.Run
 #else
                             AssemblyBuilderAccess.RunAndSave
@@ -1428,7 +1428,7 @@ private static AssemblyBuilder GenerateAssemblyBuilder() {
 
         private static AssemblyBuilder GenerateAssemblyBuilderNoShare(string asmName) {
             var assembly =
-#if NET_STANDARD || NET_5
+#if NET_STANDARD || NET5_0
                 AssemblyBuilder
 #else
                 AppDomain.CurrentDomain
@@ -1437,7 +1437,7 @@ private static AssemblyBuilder GenerateAssemblyBuilderNoShare(string asmName) {
                 new AssemblyName(asmName) {
                     Version = new Version(1, 0, 0, 0)
                 },
-#if !NET_STANDARD && !NET_5
+#if !NET_STANDARD && !NET5_0
                 AssemblyBuilderAccess.RunAndSave
 #else
                 AssemblyBuilderAccess.Run
@@ -1902,7 +1902,7 @@ internal static MethodInfo DefineMethodEx(this TypeBuilder builder, string metho
             if (builder == null)
                 return new DynamicMethod(methodName, returnType, parameterTypes,
 #if NET_STANDARD
-#if NET_STANDARD_20
+#if NET_STANDARD_20 || NET5_0
                     Assembly.GetExecutingAssembly().ManifestModule
 #else
                     Assembly.GetEntryAssembly().ManifestModule
@@ -2517,13 +2517,13 @@ private static List<Type> GetIncludedTypeTypes(Type type) {
                     if (types == null) {
                         types = new List<Type>();
 #if NET_STANDARD
-#if NET_STANDARD_20
+#if NET_STANDARD_20 || NET5_0
     var assemblies = AppDomain.CurrentDomain.GetAssemblies();
 #else
     var assemblies = DependencyContext.Default.GetDefaultAssemblyNames().Select(x => Assembly.Load(x));
 #endif
 #else
-    var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+                        var assemblies = AppDomain.CurrentDomain.GetAssemblies();
 #endif
                         foreach (var asm in assemblies) {
                             try {