Removed more .net 7 usage for better compatibility

Debugging/ILRuntimeDebugEngine/ILRuntimeDebugEngine.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ILRuntimeDebugEngine</RootNamespace>
     <AssemblyName>ILRuntimeDebugEngine</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

Debugging/ILRuntimeDebuggerLauncher/ILRuntimeDebuggerLauncher.csproj

@@ -29,7 +29,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ILRuntimeDebuggerLauncher</RootNamespace>
     <AssemblyName>ILRuntimeDebuggerLauncher</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>

ILRuntime/CLR/Method/CLRMethod.cs

@@ -417,7 +417,7 @@ public IMethod MakeGenericMethod(IType[] genericArguments)
                 }
 
                 argString = argString.Substring(0, argString.Length - 2);
-                throw new Exception($"MakeGenericMethod failed : {def.DeclaringType.FullName}.{def.Name}<{argString}>");
+                throw new Exception(string.Format("MakeGenericMethod failed : {0}.{1}<{}>", def.DeclaringType.FullName, def.Name, argString));
             }
 #endif
             var res = new CLRMethod(t, declaringType, appdomain);

ILRuntime/CLR/Method/ILMethod.cs

@@ -405,17 +405,19 @@ void PrewarmBody(HashSet<ILMethod> alreadyPrewarmed)
                     case OpCodeEnum.Callvirt:
                         {
                             var m = appdomain.GetMethod(ins.TokenInteger);
-                            if (m is ILMethod ilm)
+                            if (m is ILMethod)
                             {
+                                ILMethod ilm = (ILMethod)m;
                                 //如果参数alreadyPrewarmed不为空，则不仅prewarm当前方法，还会递归prewarm所有子调用
                                 //如果参数alreadyPrewarmed为空，则只prewarm当前方法
                                 if (alreadyPrewarmed != null)
                                 {
                                     ilm.Prewarm(alreadyPrewarmed);
                                 }
                             }
-                            else if (m is CLRMethod clrm)
+                            else if (m is CLRMethod)
                             {
+                                CLRMethod clrm = (CLRMethod)m;
                                 ILRuntime.CLR.Utils.Extensions.GetTypeFlags(clrm.DeclearingType.TypeForCLR);
                             }
                         }
@@ -456,17 +458,19 @@ void PrewarmBodyRegister(HashSet<ILMethod> alreadyPrewarmed)
                     case OpCodeREnum.Callvirt:
                         {
                             var m = appdomain.GetMethod(ins.Operand);
-                            if (m is ILMethod ilm)
+                            if (m is ILMethod)
                             {
+                                ILMethod ilm = (ILMethod)m;
                                 //如果参数alreadyPrewarmed不为空，则不仅prewarm当前方法，还会递归prewarm所有子调用
                                 //如果参数alreadyPrewarmed为空，则只prewarm当前方法
                                 if (alreadyPrewarmed != null)
                                 {
                                     ilm.Prewarm(alreadyPrewarmed);
                                 }
                             }
-                            else if (m is CLRMethod clrm)
+                            else if (m is CLRMethod)
                             {
+                                CLRMethod clrm = (CLRMethod)m;
                                 ILRuntime.CLR.Utils.Extensions.GetTypeFlags(clrm.DeclearingType.TypeForCLR);
                             }
                         }
@@ -510,8 +514,9 @@ private void Prewarm(HashSet<ILMethod> alreadyPrewarmed)
                 {
                     t = appdomain.GetType(v.VariableType, DeclearingType, this);
                 }
-                if (t is CLRType ct)
+                if (t is CLRType)
                 {
+                    CLRType ct = (CLRType)t;
                     var fields = ct.Fields;
                     ILRuntime.CLR.Utils.Extensions.GetTypeFlags(ct.TypeForCLR);
                 }

ILRuntime/CLR/TypeSystem/CLRType.cs

@@ -346,7 +346,7 @@ public object PerformMemberwiseClone(object target)
 
                     if (memberwiseClone != null)
                     {
-                        var del = (Func<object, object>)memberwiseClone.CreateDelegate(typeof(Func<object, object>));
+                        var del = (Func<object, object>)Delegate.CreateDelegate(typeof(Func<object, object>), memberwiseClone);
                         memberwiseCloneDelegate = (ref object t) => del(t);
                     }
                     else
@@ -967,7 +967,7 @@ public IType MakeGenericInstance(KeyValuePair<string, IType>[] genericArguments)
                     }
 
                     argString = argString.Substring(0, argString.Length - 2);
-                    throw new Exception($"MakeGenericType failed : {clrType.FullName}<{argString}>");
+                    throw new Exception(string.Format("MakeGenericType failed : {0}<{1}>", clrType.FullName, argString));
                 }
 #endif
                 var res = new CLRType(newType, appdomain);

ILRuntime/Other/UncheckedStack.cs

@@ -9,7 +9,10 @@
 [Serializable]
 [DebuggerDisplay("Count = {Count}")]
 [ComVisible(false)]
-public class UncheckedStack<T> : IEnumerable<T>, IEnumerable, ICollection, IReadOnlyCollection<T>
+public class UncheckedStack<T> : IEnumerable<T>, IEnumerable, ICollection
+#if NET_4_6 || NET_STANDARD_2_0
+	, IReadOnlyCollection<T>
+#endif
 {
 	[Serializable]
 	public struct Enumerator : IEnumerator<T>, IDisposable, IEnumerator

ILRuntime/Reflection/Extensions.cs

@@ -51,7 +51,8 @@ public static object CreateInstance(this CustomAttribute attribute, IType at, Ru
                 {
                     foreach (var j in attribute.Fields)
                     {
-                        var field = it.GetField(j.Name, out int index);
+                        int index;
+                        var field = it.GetField(j.Name, out index);
                         if (field != null)
                             ((ILRuntime.Runtime.Intepreter.ILTypeInstance)ins)[index] = j.Argument.Value;
                     }

ILRuntime/Reflection/ILRuntimeMethodInfo.cs

@@ -178,10 +178,14 @@ public override Type ReturnType
         {
             get
             {
-                return method.ReturnType?.ReflectionType;
+                if (method.ReturnType != null)
+                    return method.ReturnType.ReflectionType;
+                else
+                    return null;
             }
         }
 
+#if NET_4_6 || NET_STANDARD_2_0
         public override Delegate CreateDelegate(Type delegateType)
         {
             throw new NotSupportedException("please use CreateDelegate(Type delegateType, object target)");
@@ -216,5 +220,6 @@ public override Delegate CreateDelegate(Type delegateType, object target)
             }
             return del.GetConvertor(delegateType);
         }
+#endif
     }
 }

ILRuntime/Reflection/ILRuntimePropertyInfo.cs

@@ -141,7 +141,13 @@ public override Type PropertyType
             }
         }
 
-        public ILRuntime.Mono.Cecil.TypeReference Definition => definition.GetMethod != null ? definition.GetMethod.ReturnType : definition.SetMethod.Parameters [ 0 ].ParameterType;
+        public ILRuntime.Mono.Cecil.TypeReference Definition
+        {
+            get
+            {
+                return definition.GetMethod != null ? definition.GetMethod.ReturnType : definition.SetMethod.Parameters[0].ParameterType;
+            }
+        }
 
 
         public override Type DeclaringType

ILRuntime/Reflection/ILRuntimeType.cs

@@ -613,10 +613,12 @@ public override int GetHashCode()
         {
             return type.GetHashCode();
         }
+#if NET_4_6 || NET_STANDARD_2_0
         public override bool Equals(Type o)
         {
             return o is ILRuntimeType ? ((ILRuntimeType)o).type == type : false;
         }
+#endif
         public override bool Equals(object o)
         {
             return o is ILRuntimeType ? ((ILRuntimeType)o).type == type : false;

ILRuntime/Runtime/CLRBinding/CLRBindingUtils.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace ILRuntime.Runtime.CLRBinding
 {

ILRuntime/Runtime/Enviorment/AppDomain.cs

@@ -801,7 +801,7 @@ public void InitializeBindings(bool isThread = false)
                     UnityEngine.Debug.Log("CLRBindingUtils.Initialize Done in thread..");
 #endif
                 });
-                thread.Name = $"CLRBindings-Thread #{thread.ManagedThreadId}";
+                thread.Name = string.Format("CLRBindings-Thread #{0}",thread.ManagedThreadId);
                 thread.Start();
             }
             else
@@ -853,8 +853,9 @@ public IType GetType(string fullname)
                     for (int i = 0; i < genericArguments.Length; i++)
                     {
                         string key = null;
-                        if (bt is ILType ilt)
+                        if (bt is ILType)
                         {
+                            ILType ilt = (ILType)bt;
                             key = ilt.TypeDefinition.GenericParameters[i].FullName;
                         }
                         else

ILRuntime/Runtime/Enviorment/CrossBindingCodeGenerator.cs

@@ -138,7 +138,7 @@ static void GenerateCrossBindingMethodBody(StringBuilder sb, List<MethodInfo> vi
                         StringBuilder sBuilder = new StringBuilder();
                         var p = i.GetParameters()[0];
                         p.ParameterType.GetClassName(out clsName, out realClsName, out isByRef, true);
-                        pName = $"this [{realClsName + " " + p.Name}]";
+                        pName = string.Format("this [{0}]", realClsName + " " + p.Name);
 
                         isIndexFunc = true;
                     }
@@ -192,8 +192,8 @@ static void GenerateCrossBindingMethodBody(StringBuilder sb, List<MethodInfo> vi
                     if (isProperty)
                     {
                         string baseMethodName = isIndexFunc
-                            ? $"base[{i.GetParameters()[0].Name}]"
-                            : $"base.{i.Name.Substring(4)}";
+                            ? string.Format("base[{0}]", i.GetParameters()[0].Name)
+                            : string.Format("base.{0}", i.Name.Substring(4));
                         if (isGetter)
                         {
                             sb.AppendLine(string.Format("                    return {0};", baseMethodName));
@@ -597,7 +597,7 @@ static void GenInitParams(StringBuilder sb, ParameterInfo[] param)
             {
                 if (p.IsOut)
                 {
-                    sb.AppendLine($"                    {p.Name} = default({p.ParameterType.GetElementType().FullName});");
+                    sb.AppendLine(string.Format("                    {0} = default({1});", p.Name, p.ParameterType.GetElementType().FullName));
                 }
             }
         }

ILRuntime/Runtime/Enviorment/InvocationContext.cs

@@ -215,16 +215,31 @@ internal void SetInvoked(StackObject* esp)
 
         internal StackObject* ESP
         {
-            get => esp;
+            get
+            {
+                return esp;
+            }
             set
             {
                 esp = value;
             }
         }
 
-        internal ILIntepreter Intepreter => intp;
+        internal ILIntepreter Intepreter
+        {
+            get
+            {
+                return intp;
+            }
+        }
 
-        internal IList<object> ManagedStack => mStack;
+        internal IList<object> ManagedStack
+        {
+            get
+            {
+                return mStack;
+            }
+        }
 
         public void PushBool(bool val)
         {
@@ -300,7 +315,8 @@ public void PushValueType<T>(ref T obj)
             Type t = typeof(T);
             bool needPush = false;
             StackObject* res = default(StackObject*);
-            if (domain.ValueTypeBinders.TryGetValue(t, out var binder))
+            ValueTypeBinder binder;
+            if (domain.ValueTypeBinders.TryGetValue(t, out binder))
             {
                 var binderT = binder as ValueTypeBinder<T>;
                 if (binderT != null)
@@ -492,7 +508,8 @@ public T ReadValueType<T>()
             CheckReturnValue();
             Type t = typeof(T);
             T res = default(T);
-            if (domain.ValueTypeBinders.TryGetValue(t, out var binder))
+            ValueTypeBinder binder;
+            if (domain.ValueTypeBinders.TryGetValue(t, out binder))
             {
                 var binderT = binder as ValueTypeBinder<T>;
                 if (binderT != null)

ILRuntime/Runtime/ILRuntimeJITAttribute.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace ILRuntime.Runtime
 {

ILRuntime/Runtime/Intepreter/RegisterVM/AsyncJITCompileWorker.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using ILRuntime.CLR.Method;
 
 namespace ILRuntime.Runtime.Intepreter.RegisterVM

ILRuntime/Runtime/Stack/StackObjectAllocator.cs

@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace ILRuntime.Runtime.Stack
 {