Merge branch 'main' into satvu/ext-validation-targets

Azure · Oct 10, 2024 · b03ef3c · b03ef3c
2 parents 90575d8 + 9590def
commit b03ef3c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 39 deletions.
diff --git a/eng/build/WorkerExtensions.targets b/eng/build/WorkerExtensions.targets
@@ -4,7 +4,7 @@
         <_ExtensionValidationLocation>$(IntermediateOutputPath)ExtensionValidation/</_ExtensionValidationLocation>
     </PropertyGroup>
 
-    <Target Name="AddWebJobsExtensionInformation" BeforeTargets="CoreCompile" Condition="'@(WebJobsExtension)' != ''">
+    <Target Name="AddWebJobsExtensionInformation" BeforeTargets="GetAssemblyAttributes" Condition="'@(WebJobsExtension)' != ''">
         <ItemGroup>
             <_ExtensionInformationAttribute Include="@(WebJobsExtension->'Microsoft.Azure.Functions.Worker.Extensions.Abstractions.ExtensionInformationAttribute')">
                 <_Parameter1>%(WebJobsExtension.Identity)</_Parameter1>

diff --git a/extensions/Directory.Build.targets b/extensions/Directory.Build.targets
@@ -0,0 +1,8 @@
+<Project>
+
+    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, $(_DirectoryBuildTargetsFile)))/$(_DirectoryBuildTargetsFile)"
+    Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, $(_DirectoryBuildTargetsFile)))' != '' " />
+
+    <Import Project="$(TargetsRoot)WorkerExtensions.targets" />
+
+</Project>
diff --git a/extensions/Worker.Extensions.Kafka/src/Properties/AssemblyInfo.cs b/extensions/Worker.Extensions.Kafka/src/Properties/AssemblyInfo.cs
diff --git a/extensions/Worker.Extensions.RabbitMQ/src/Properties/AssemblyInfo.cs b/extensions/Worker.Extensions.RabbitMQ/src/Properties/AssemblyInfo.cs
diff --git a/extensions/Worker.Extensions.SendGrid/src/Properties/AssemblyInfo.cs b/extensions/Worker.Extensions.SendGrid/src/Properties/AssemblyInfo.cs
diff --git a/extensions/Worker.Extensions.SignalRService/src/Properties/AssemblyInfo.cs b/extensions/Worker.Extensions.SignalRService/src/Properties/AssemblyInfo.cs
diff --git a/test/Sdk.Generator.Tests/FunctionExecutor/DependentAssemblyTest.cs b/test/Sdk.Generator.Tests/FunctionExecutor/DependentAssemblyTest.cs
@@ -101,47 +101,39 @@ public DirectFunctionExecutor(global::Microsoft.Azure.Functions.Worker.IFunction
                                                        var instanceType = types["MyCompany.MyHttpTriggers"];
                                                        var i = _functionActivator.CreateInstance(instanceType, context) as global::MyCompany.MyHttpTriggers;
                                                        context.GetInvocationResult().Value = i.Foo((global::Microsoft.Azure.Functions.Worker.Http.HttpRequestData)inputArguments[0], (global::Microsoft.Azure.Functions.Worker.FunctionContext)inputArguments[1]);
-                                                       goto end;
+                                                       return;
                                                    }
-
                                                    if (string.Equals(context.FunctionDefinition.EntryPoint, "DependentAssemblyWithFunctions.DependencyFunction.Run", StringComparison.Ordinal))
                                                    {
                                                        var instanceType = types["DependentAssemblyWithFunctions.DependencyFunction"];
                                                        var i = _functionActivator.CreateInstance(instanceType, context) as global::DependentAssemblyWithFunctions.DependencyFunction;
                                                        context.GetInvocationResult().Value = i.Run((global::Microsoft.Azure.Functions.Worker.Http.HttpRequestData)inputArguments[0]);
-                                                       goto end;
+                                                       return;
                                                    }
-
                                                    if (string.Equals(context.FunctionDefinition.EntryPoint, "DependentAssemblyWithFunctions.InternalFunction.Run", StringComparison.Ordinal))
                                                    {
                                                        await _defaultExecutor.Value.ExecuteAsync(context);
-                                                       goto end;
+                                                       return;
                                                    }
-
                                                    if (string.Equals(context.FunctionDefinition.EntryPoint, "DependentAssemblyWithFunctions.StaticFunction.Run", StringComparison.Ordinal))
                                                    {
                                                        context.GetInvocationResult().Value = global::DependentAssemblyWithFunctions.StaticFunction.Run((global::Microsoft.Azure.Functions.Worker.Http.HttpRequestData)inputArguments[0], (global::Microsoft.Azure.Functions.Worker.FunctionContext)inputArguments[1]);
-                                                       goto end;
+                                                       return;
                                                    }
-
                                                    if (string.Equals(context.FunctionDefinition.EntryPoint, "MyCompany.MyProduct.MyApp.HttpFunctions.Run", StringComparison.Ordinal))
                                                    {
                                                        var instanceType = types["MyCompany.MyProduct.MyApp.HttpFunctions"];
                                                        var i = _functionActivator.CreateInstance(instanceType, context) as global::MyCompany.MyProduct.MyApp.HttpFunctions;
                                                        context.GetInvocationResult().Value = i.Run((global::Microsoft.Azure.Functions.Worker.Http.HttpRequestData)inputArguments[0]);
-                                                       goto end;
+                                                       return;
                                                    }
-
                                                    if (string.Equals(context.FunctionDefinition.EntryPoint, "MyCompany.MyProduct.MyApp.Foo.Bar.Run", StringComparison.Ordinal))
                                                    {
                                                        var instanceType = types["MyCompany.MyProduct.MyApp.Foo.Bar"];
                                                        var i = _functionActivator.CreateInstance(instanceType, context) as global::MyCompany.MyProduct.MyApp.Foo.Bar;
                                                        context.GetInvocationResult().Value = i.Run((global::Microsoft.Azure.Functions.Worker.Http.HttpRequestData)inputArguments[0]);
-                                                       goto end;
+                                                       return;
                                                    }
-
-                                                   end:
-                                                   return;
                                                }
                                        
                                                private global::Microsoft.Azure.Functions.Worker.Invocation.IFunctionExecutor CreateDefaultExecutorInstance(global::Microsoft.Azure.Functions.Worker.FunctionContext context)