Fixing issue with type/function indexing when multiple functions are defined in a single type

Author: fabiocav

src/WebJobs.Script/Host/ScriptHost.cs

@@ -500,7 +500,7 @@ private void GenerateFunctions()
             Type functionWrapperType = FunctionGenerator.Generate(HostAssemblyName, typeName, typeAttributes, Functions);
 
             // configure the Type locator
-            var types = new List<Type>
+            var types = new HashSet<Type>
             {
                 functionWrapperType
             };

test/TestFunctions/Function1.cs test/TestFunctions/Functions.cstest/TestFunctions/Function1.cs renamed to test/TestFunctions/Functions.cs

@@ -9,7 +9,7 @@
 
 namespace TestFunctions
 {
-    public static class Function1
+    public static class Functions
     {
         [FunctionName("Function1")]
         public static IActionResult Run([HttpTrigger(AuthorizationLevel.Function, "get", "post", Route = null)] HttpRequest req, ILogger log)
@@ -34,5 +34,29 @@ public static IActionResult Run([HttpTrigger(AuthorizationLevel.Function, "get",
                 ? (ActionResult)new OkObjectResult($"Hello, {name}!")
                 : new BadRequestObjectResult("Please pass a name on the query string or in the request body");
         }
+
+        [FunctionName("Function2")]
+        public static IActionResult Function2([HttpTrigger(AuthorizationLevel.Function, "get", "post", Route = null)] HttpRequest req, ILogger log)
+        {
+            log.LogInformation("C# HTTP trigger function processed a request.");
+
+            string action = req.Query["action"];
+            if (action == "throw")
+            {
+                throw new InvalidOperationException("Kaboom!");
+            }
+
+            string name = req.Query["name"];
+
+            // Explicitly read the body synchronously; this is used in the AllowSynchronousIOMiddleware tests
+            string requestBody = new StreamReader(req.Body).ReadToEnd();
+
+            dynamic data = JsonConvert.DeserializeObject(requestBody);
+            name = name ?? data?.name;
+
+            return name != null
+                ? (ActionResult)new OkObjectResult($"Hello, {name}!")
+                : new BadRequestObjectResult("Please pass a name on the query string or in the request body");
+        }
     }
 }

test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/DirectLoadEndToEndTests.cs

@@ -91,7 +91,7 @@ public async Task Invoke_ExceptionThrown_DetailsLogged()
             var error = errorLogs[0];
             var invocationException = (FunctionInvocationException)error.Exception;
             Assert.Equal("Exception while executing function: Function1", invocationException.Message);
-            Assert.Equal("TestFunctions.Function1.Run", invocationException.MethodName);
+            Assert.Equal("TestFunctions.Functions.Run", invocationException.MethodName);
             Assert.Equal("Function1", error.Scope[ScopeKeys.FunctionName]);
             Assert.Equal(LogCategories.CreateFunctionCategory("Function1"), error.Category);
         }

test/WebJobs.Script.Tests.Integration/TestScripts/DirectLoad/Function1/function.json

@@ -14,5 +14,5 @@
     ],
     "disabled": false,
     "scriptFile": "..\\..\\..\\TestFunctions.dll",
-    "entryPoint": "TestFunctions.Function1.Run"
+    "entryPoint": "TestFunctions.Functions.Run"
 }

test/WebJobs.Script.Tests.Integration/TestScripts/DirectLoad/Function2/function.json

@@ -0,0 +1,18 @@
+{
+    "generatedBy": "Microsoft.NET.Sdk.Functions-1.0.13",
+    "configurationSource": "attributes",
+    "bindings": [
+        {
+            "type": "httpTrigger",
+            "methods": [
+                "get",
+                "post"
+            ],
+            "authLevel": "function",
+            "name": "req"
+        }
+    ],
+    "disabled": false,
+    "scriptFile": "..\\..\\..\\TestFunctions.dll",
+    "entryPoint": "TestFunctions.Functions.Function2"
+}