Add Framework build target and test for Azure functions

newrelic · Feb 12, 2025 · aa84496 · aa84496
1 parent 164df1d
commit aa84496
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/...nt/IntegrationTests/Applications/AzureFunctionApplication/AzureFunctionApplication.csproj b/...nt/IntegrationTests/Applications/AzureFunctionApplication/AzureFunctionApplication.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net481;net8.0;net9.0</TargetFrameworks>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -22,7 +22,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App"  Condition="'$(TargetFramework)' == 'net9.0'"/>
     <None Include="local.settings.json" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />

diff --git a/...Tests/Applications/AzureFunctionApplication/HttpTriggerFunctionUsingAspNetCorePipeline.cs b/...Tests/Applications/AzureFunctionApplication/HttpTriggerFunctionUsingAspNetCorePipeline.cs
@@ -1,6 +1,7 @@
 // Copyright 2020 New Relic, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+#if NET9
 using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -34,3 +35,4 @@ public async Task<IActionResult> Run([HttpTrigger(AuthorizationLevel.Function, "
         }
     }
 }
+#endif
diff --git a/tests/Agent/IntegrationTests/Applications/AzureFunctionApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/AzureFunctionApplication/Program.cs
@@ -20,9 +20,9 @@ private static async Task Main(string[] args)
 
 
         var host = new HostBuilder()
-            // the net8 target uses the "basic" azure function configuration
+            // the net481 and net8 target uses the "basic" azure function configuration
             // the net9 target uses the aspnetcore azure function configuration
-#if NET8_0
+#if NETFRAMEWORK || NET8_0
             .ConfigureFunctionsWorkerDefaults()
 #elif NET9_0
             .ConfigureFunctionsWebApplication()

diff --git a/tests/Agent/IntegrationTests/IntegrationTests/AzureFunction/AzureFunctionHttpTriggerTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/AzureFunction/AzureFunctionHttpTriggerTests.cs
@@ -357,3 +357,12 @@ public AzureFunctionHttpTriggerTestsCoreLatest(AzureFunctionApplicationFixtureHt
     {
     }
 }
+
+[NetFrameworkTest]
+public class AzureFunctionHttpTriggerTestsFWLatest : AzureFunctionHttpTriggerTestsBase<AzureFunctionApplicationFixtureHttpTriggerFWLatest>
+{
+    public AzureFunctionHttpTriggerTestsFWLatest(AzureFunctionApplicationFixtureHttpTriggerFWLatest fixture, ITestOutputHelper output)
+        : base(fixture, output, AzureFunctionHttpTriggerTestMode.SimpleInvocation)
+    {
+    }
+}
diff --git a/...ntegrationTests/IntegrationTests/RemoteServiceFixtures/AzureFunctionApplicationFixture.cs b/...ntegrationTests/IntegrationTests/RemoteServiceFixtures/AzureFunctionApplicationFixture.cs
@@ -23,8 +23,8 @@ public abstract class AzureFunctionApplicationFixture : RemoteApplicationFixture
     private const string Priority = "1.23456";
     private const string Timestamp = "1518469636025";
 
-    protected AzureFunctionApplicationFixture(string functionNames, string targetFramework, bool enableAzureFunctionMode)
-        : base(new AzureFuncTool(ApplicationDirectoryName, targetFramework, ApplicationType.Bounded, true, true, true, enableAzureFunctionMode))
+    protected AzureFunctionApplicationFixture(string functionNames, string targetFramework, bool enableAzureFunctionMode, bool isCoreApp = true)
+        : base(new AzureFuncTool(ApplicationDirectoryName, targetFramework, ApplicationType.Bounded, true, isCoreApp, true, enableAzureFunctionMode))
     {
         CommandLineArguments = $"start --no-build --language-worker dotnet-isolated --dotnet-isolated --functions {functionNames} ";
 
@@ -73,6 +73,13 @@ public AzureFunctionApplicationFixtureHttpTriggerCoreLatest() : base("httpTrigge
     }
 }
 
+public class AzureFunctionApplicationFixtureHttpTriggerFWLatest : AzureFunctionApplicationFixture
+{
+    public AzureFunctionApplicationFixtureHttpTriggerFWLatest() : base("httpTriggerFunctionUsingSimpleInvocation", "net481", true, false)
+    {
+    }
+}
+
 public class AzureFunctionApplicationFixtureInstrumentationDisabledCoreLatest : AzureFunctionApplicationFixture
 {
     public AzureFunctionApplicationFixtureInstrumentationDisabledCoreLatest() : base("httpTriggerFunctionUsingAspNetCorePipeline httpTriggerFunctionUsingSimpleInvocation", "net9.0", false)