- 修复 CreateInstance 发生歧义的问题；#1962

Examples/base_entity/Program.cs

@@ -522,6 +522,8 @@ public class Student2222
 
         static void Main(string[] args)
         {
+            var ddultval = typeof(System.Text.Json.Nodes.JsonArray).CreateInstanceGetDefaultValue();
+
             var pams = new Dictionary<string, string>();
             var sql2rscs = Utils.ReplaceSqlConstString("'', 'SARTEN ACERO VITR.18CM''''GRAFIT''''', 'a",
                 pams, "@lantin1");
@@ -906,22 +908,22 @@ static void Main(string[] args)
                 })
                 .ToSql();
 			Console.WriteLine(list0x1sql);
-			var sql1c2 = fsql.Select<User1>()
-				.GroupBy(a => new { a.Nickname, a.Avatar })
-				.WithTempQuery(b => new
-				{
-					sum = b.Sum(b.Value.Sort),
-					b.Key.Nickname,
-					b.Key.Avatar,
-				})
-				.OrderByDescending(arg => arg.sum)
-				.ToSql(arg => new
-				{
-					str1 = string.Concat(arg.Nickname, '-', arg.Avatar, '-'),
-					str2 = string.Concat(arg.Nickname, '-', arg.Avatar)
-				});   //报错 多括号
-					  //.ToOne(arg => string.Concat(arg.Nickname, '-', arg.Avatar)); //正常
-			Console.WriteLine(sql1c2);
+			//var sql1c2 = fsql.Select<User1>()
+			//	.GroupBy(a => new { a.Nickname, a.Avatar })
+			//	.WithTempQuery(b => new
+			//	{
+			//		sum = b.Sum(b.Value.Sort),
+			//		b.Key.Nickname,
+			//		b.Key.Avatar,
+			//	})
+			//	.OrderByDescending(arg => arg.sum)
+			//	.ToSql(arg => new
+			//	{
+			//		str1 = string.Concat(arg.Nickname, '-', arg.Avatar, '-'),
+			//		str2 = string.Concat(arg.Nickname, '-', arg.Avatar)
+			//	});   //报错 多括号
+			//		  //.ToOne(arg => string.Concat(arg.Nickname, '-', arg.Avatar)); //正常
+			//Console.WriteLine(sql1c2);
 
 			//var clickhouseSql1 = fsql.Select<User1>().Where(a => new[] { 1, 2, 3 }.Contains(a.GroupId)).ToSql();
 			//         var clickhouseVal1 = new[] { 1, 2, 3 };

Examples/base_entity/base_entity.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<PlatformTarget>AnyCPU</PlatformTarget>
 	</PropertyGroup>
 

FreeSql/Extensions/FreeSqlGlobalExtensions.cs

@@ -169,12 +169,12 @@ public static object CreateInstanceGetDefaultValue(this Type that)
         if (that == typeof(byte[])) return default(byte[]);
         if (that.IsArray) return Array.CreateInstance(that.GetElementType(), 0);
         if (that.IsInterface || that.IsAbstract) return null;
-        var ctorParms = that.InternalGetTypeConstructor0OrFirst(false)?.GetParameters();
+        var ctor = that.InternalGetTypeConstructor0OrFirst(false);
+        var ctorParms = ctor?.GetParameters();
         if (ctorParms == null || ctorParms.Any() == false) return Activator.CreateInstance(that, true);
-        return Activator.CreateInstance(that, ctorParms
-            .Select(a => a.ParameterType.IsInterface || a.ParameterType.IsAbstract || a.ParameterType == typeof(string) || a.ParameterType.IsArray ?
-            null :
-            Activator.CreateInstance(a.ParameterType, null)).ToArray());
+        var ctorArgs = ctorParms.Select(a => a.ParameterType.IsInterface || a.ParameterType.IsAbstract || a.ParameterType == typeof(string) || a.ParameterType.IsArray ? 
+            null : Activator.CreateInstance(a.ParameterType, null)).ToArray();
+        return ctor.Invoke(ctorArgs);
     }
     internal static NewExpression InternalNewExpression(this Type that)
     {
@@ -186,13 +186,10 @@ internal static NewExpression InternalNewExpression(this Type that)
     internal static ConstructorInfo InternalGetTypeConstructor0OrFirst(this Type that, bool isThrow = true)
     {
         var ret = _dicInternalGetTypeConstructor0OrFirst.GetOrAdd(that, tp =>
-            new Lazy<ConstructorInfo>(() =>
-            {
-                return tp.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, new Type[0], null) ??
-                    tp.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
-                    .OrderBy(a => a.IsPublic ? 0 : 1)
-                    .FirstOrDefault();
-            }));
+            new Lazy<ConstructorInfo>(() => tp.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, new Type[0], null) ??
+                tp.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+                .OrderBy(a => a.IsPublic ? 0 : 1)
+                .FirstOrDefault()));
         if (ret.Value == null && isThrow) throw new ArgumentException(CoreErrorStrings.Type_Cannot_Access_Constructor(that.FullName));
         return ret.Value;
     }