Merge branch 'master' into chore/summary/deployment-pipeline

equinor · Aug 29, 2024 · 4706972 · 4706972
2 parents 92a5a6d + d959e0c
commit 4706972
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/src/Fusion.Summary.Functions/Deployment/function.template.json b/src/Fusion.Summary.Functions/Deployment/function.template.json
@@ -40,7 +40,7 @@
     },
     "netFrameworkVersion": {
       "type": "string",
-      "defaultValue": "v6.0"
+      "defaultValue": "v8.0"
     }
   },
   "variables": {
@@ -97,6 +97,10 @@
               "name": "FUNCTIONS_EXTENSION_VERSION",
               "value": "~4"
             },
+            {
+              "name": "FUNCTIONS_INPROC_NET8_ENABLED",
+              "value": "1"
+            },
             {
               "name": "WEBSITE_NODE_DEFAULT_VERSION",
               "value": "~10"

diff --git a/src/Fusion.Summary.Functions/Fusion.Summary.Functions.csproj b/src/Fusion.Summary.Functions/Fusion.Summary.Functions.csproj
@@ -7,6 +7,7 @@
 		<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
 		<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.16.4"/>
 		<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.4.1"/>
+		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0"/>
 	</ItemGroup>
 	<ItemGroup>
 		<None Update="host.json">

diff --git a/src/backend/function/Fusion.Resources.Functions/Deployment/function.template.json b/src/backend/function/Fusion.Resources.Functions/Deployment/function.template.json
@@ -41,7 +41,7 @@
     },
     "netFrameworkVersion": {
       "type": "string",
-      "defaultValue": "v6.0"
+      "defaultValue": "v8.0"
     }
   },
   "variables": {
@@ -98,6 +98,10 @@
               "name": "FUNCTIONS_EXTENSION_VERSION",
               "value": "~4"
             },
+            {
+              "name": "FUNCTIONS_INPROC_NET8_ENABLED",
+              "value": "1"
+            },
             {
               "name": "WEBSITE_NODE_DEFAULT_VERSION",
               "value": "~10"

diff --git a/src/backend/function/Fusion.Resources.Functions/Fusion.Resources.Functions.csproj b/src/backend/function/Fusion.Resources.Functions/Fusion.Resources.Functions.csproj
@@ -8,6 +8,7 @@
 		<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.4.1"/>
 		<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
 		<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.16.4"/>
+		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0"/>
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\..\Fusion.Resources.Functions.Common\Fusion.Resources.Functions.Common.csproj" />

diff --git a/src/backend/function/Fusion.Resources.Functions/Startup.cs b/src/backend/function/Fusion.Resources.Functions/Startup.cs
@@ -17,7 +17,7 @@ public override void Configure(IFunctionsHostBuilder builder)
                 opts.Secret = cfg.GetValue<string>("AzureAd_Secret");
                 opts.TenantId = cfg.GetValue<string>("AzureAd_TenantId");
             });
-            
+
             builder.Services.AddConfigServiceResolver();
             builder.Services.AddHttpClients();
         }