Fixed "no method List.ToArray" with params registration.

Author: Sergey-Vlasov

Source/ExcelDna.SourceGenerator.NativeAOT/Generator.cs

@@ -32,6 +32,7 @@ public void Execute(GeneratorExecutionContext context)
 // <auto-generated/>
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -46,7 +47,7 @@ public static short Initialize(void* xlAddInExportInfoAddress, void* hModuleXll,
 
             [ADDINS]
 
-            [FUNCTIONS]
+[FUNCTIONS]
 
             return ExcelDna.ManagedHost.AddInInitialize.InitializeNativeAOT(xlAddInExportInfoAddress, hModuleXll, pPathXLL, disableAssemblyContextUnload, pTempDirPath);
         }
@@ -70,16 +71,24 @@ public static short Initialize(void* xlAddInExportInfoAddress, void* hModuleXll,
                 source = source.Replace("[ADDINS]", addIns);
             }
             {
-                string functions = "List<Type> functionTypes = new List<Type>();\r\n";
+                string functions = "List<Type> typeRefs = new List<Type>();\r\n";
+                string methods = "List<MethodInfo> methodRefs = new List<MethodInfo>();\r\n";
                 foreach (var i in receiver.Functions)
                 {
                     functions += $"ExcelDna.Integration.NativeAOT.MethodsForRegistration.Add(typeof({Util.GetFullTypeName(i.ContainingType)}).GetMethod(\"{i.Name}\")!);\r\n";
-                    functions += $"functionTypes.Add(typeof({Util.MethodType(i)}));\r\n";
+                    functions += $"typeRefs.Add(typeof({Util.MethodType(i)}));\r\n";
                     foreach (var p in i.Parameters)
-                        functions += $"functionTypes.Add(typeof(Func<object, {Util.GetFullTypeName(p.Type)}>));\r\n";
+                    {
+                        functions += $"typeRefs.Add(typeof(Func<object, {Util.GetFullTypeName(p.Type)}>));\r\n";
+                    }
                     functions += "\r\n";
+
+                    if (i.Parameters.Length > 0 && i.Parameters.Last().IsParams && i.Parameters.Last().Type is IArrayTypeSymbol arrayType)
+                    {
+                        methods += $"methodRefs.Add(typeof(List<{Util.GetFullTypeName(arrayType.ElementType)}>).GetMethod(\"ToArray\")!);\r\n";
+                    }
                 }
-                source = source.Replace("[FUNCTIONS]", functions);
+                source = source.Replace("[FUNCTIONS]", functions + methods);
             }
 
             context.AddSource($"ExcelDna.SG.NAOT.Init.g.cs", source);

Source/Tests/ExcelDna.SourceGenerator.NativeAOT.Tests/Generator.cs

@@ -5,10 +5,48 @@ public class Generator
         [Fact]
         public void Empty()
         {
-            SourceGeneratorDriver.Verify("", """
+            VerifyFunctions("", """
+                List<Type> typeRefs = new List<Type>();
+                List<MethodInfo> methodRefs = new List<MethodInfo>();
+                """);
+        }
+
+        [Fact]
+        public void Params()
+        {
+            VerifyFunctions("""
+                using ExcelDna.Integration;
+
+                namespace ExcelDna.AddIn.RuntimeTestsAOT
+                {
+                    public class Functions
+                    {
+                        [ExcelFunction]
+                        public static string NativeParamsJoinString(string separator, params string[] values)
+                        {
+                            return string.Join(separator, values);
+                        }
+                    }
+                }
+                """, """
+                List<Type> typeRefs = new List<Type>();
+                ExcelDna.Integration.NativeAOT.MethodsForRegistration.Add(typeof(ExcelDna.AddIn.RuntimeTestsAOT.Functions).GetMethod("NativeParamsJoinString")!);
+                typeRefs.Add(typeof(Func<string, string[], string>));
+                typeRefs.Add(typeof(Func<object, string>));
+                typeRefs.Add(typeof(Func<object, string[]>));
+                
+                List<MethodInfo> methodRefs = new List<MethodInfo>();
+                methodRefs.Add(typeof(List<string>).GetMethod("ToArray")!);
+                """);
+        }
+
+        private static void VerifyFunctions(string sourceCode, string functions)
+        {
+            string template = """
         // <auto-generated/>
         using System;
         using System.Collections.Generic;
+        using System.Reflection;
         using System.Runtime.CompilerServices;
         using System.Runtime.InteropServices;
         
@@ -23,14 +61,15 @@ public static short Initialize(void* xlAddInExportInfoAddress, void* hModuleXll,
         
                     
         
-                    List<Type> functionTypes = new List<Type>();
+        [FUNCTIONS]
         
         
                     return ExcelDna.ManagedHost.AddInInitialize.InitializeNativeAOT(xlAddInExportInfoAddress, hModuleXll, pPathXLL, disableAssemblyContextUnload, pTempDirPath);
                 }
             }
         }
-        """);
+        """;
+            SourceGeneratorDriver.Verify(sourceCode, template.Replace("[FUNCTIONS]", functions));
         }
     }
 }

Source/Tests/ExcelDna.SourceGenerator.NativeAOT.Tests/SourceGeneratorDriver.cs

@@ -12,6 +12,7 @@ public static void Verify(string sourceCode, string expected)
                 [
                 MetadataReference.CreateFromFile(typeof(object).Assembly.Location),
                 MetadataReference.CreateFromFile(System.Reflection.Assembly.Load("System.Runtime").Location),
+                MetadataReference.CreateFromFile(System.Reflection.Assembly.Load("System.Collections").Location),
                 MetadataReference.CreateFromFile(typeof(ExcelDna.Integration.NativeAOT).Assembly.Location),
                 MetadataReference.CreateFromFile(typeof(ExcelDna.ManagedHost.AddInInitialize).Assembly.Location),
                 ],
@@ -21,7 +22,8 @@ public static void Verify(string sourceCode, string expected)
 
             Assert.Empty(diagnostics);
             Assert.True(outputCompilation.SyntaxTrees.Count() == 2);
-            Assert.Empty(outputCompilation.GetDiagnostics());
+            var outputCompilationDiagnostics = outputCompilation.GetDiagnostics();
+            Assert.Empty(outputCompilationDiagnostics);
 
             GeneratorDriverRunResult runResult = driver.GetRunResult();
             Assert.True(runResult.GeneratedTrees.Length == 1);