feat: merge master

arcus-azure · Jan 12, 2022 · 1dc97cb · 1dc97cb
2 parents a716271 + 511b75e
commit 1dc97cb
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 80 deletions.
diff --git a/build/templates/install-azure-functions-core-tools.yml b/build/templates/install-azure-functions-core-tools.yml
@@ -3,5 +3,5 @@ steps:
       wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb
       sudo dpkg -i packages-microsoft-prod.deb
       sudo apt-get update
-      sudo apt-get install azure-functions-core-tools-3
+      sudo apt-get install azure-functions-core-tools-4
     displayName: 'Install Azure Functions Core tools'
diff --git a/src/Arcus.Templates.AzureFunctions.Http/.template.config/template.json b/src/Arcus.Templates.AzureFunctions.Http/.template.config/template.json
@@ -104,7 +104,7 @@
       "args": {
         "referenceType": "package",
         "reference": "Microsoft.NET.Sdk.Functions",
-        "version": "3.0.13",
+        "version": "4.0.1",
         "projectFileExtensions": ".csproj"
       }
     }

diff --git a/src/Arcus.Templates.AzureFunctions.Http/Arcus.Templates.AzureFunctions.Http.csproj b/src/Arcus.Templates.AzureFunctions.Http/Arcus.Templates.AzureFunctions.Http.csproj
@@ -1,79 +1,79 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
-		<AzureFunctionsVersion>v3</AzureFunctionsVersion>
-		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-		<!--#if (AuthoringMode)-->
-		<Authors>Arcus</Authors>
-		<Company>Arcus</Company>
-		<RepositoryType>Git</RepositoryType>
-		<Description>Provide a template to easily build an Azure Functions that exposes an HTTP endpoint.</Description>
-		<IsPackable>true</IsPackable>
-		<PackageId>Arcus.Templates.AzureFunctions.Http</PackageId>
-		<Title>Template for Azure Functions HTTP project</Title>
-		<PackageType>Template</PackageType>
-		<PackageTags>Azure;Azure Functions;HTTP;API</PackageTags>
-		<Copyright>Copyright (c) Arcus</Copyright>
-		<PackageLicenseUrl>https://github.com/arcus-azure/arcus.templates/blob/master/LICENSE</PackageLicenseUrl>
-		<PackageProjectUrl>https://github.com/arcus-azure/arcus.templates</PackageProjectUrl>
-		<RepositoryUrl>https://github.com/arcus-azure/arcus.templates</RepositoryUrl>
-		<PackageIconUrl>https://raw.githubusercontent.com/arcus-azure/arcus/master/media/arcus.png</PackageIconUrl>
-		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<IncludeContentInPack>true</IncludeContentInPack>
-		<IncludeBuildOutput>false</IncludeBuildOutput>
-		<ContentTargetFolders>content</ContentTargetFolders>
-		<EnableDefaultContentItems>false</EnableDefaultContentItems>
-		<DockerComposeProjectPath>..\Arcus.Templates.Orchestrator.dcproj</DockerComposeProjectPath>
-		<NoWarn>NU5048;NU5125;NU5119</NoWarn>
-		<!--#endif-->
-	</PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <AzureFunctionsVersion>v4</AzureFunctionsVersion>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <!--#if (AuthoringMode)-->
+    <Authors>Arcus</Authors>
+    <Company>Arcus</Company>
+    <RepositoryType>Git</RepositoryType>
+    <Description>Provide a template to easily build an Azure Functions that exposes an HTTP endpoint.</Description>
+    <IsPackable>true</IsPackable>
+    <PackageId>Arcus.Templates.AzureFunctions.Http</PackageId>
+    <Title>Template for Azure Functions HTTP project</Title>
+    <PackageType>Template</PackageType>
+    <PackageTags>Azure;Azure Functions;HTTP;API</PackageTags>
+    <Copyright>Copyright (c) Arcus</Copyright>
+    <PackageLicenseUrl>https://github.com/arcus-azure/arcus.templates/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/arcus-azure/arcus.templates</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/arcus-azure/arcus.templates</RepositoryUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/arcus-azure/arcus/master/media/arcus.png</PackageIconUrl>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <IncludeContentInPack>true</IncludeContentInPack>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <ContentTargetFolders>content</ContentTargetFolders>
+    <EnableDefaultContentItems>false</EnableDefaultContentItems>
+    <DockerComposeProjectPath>..\Arcus.Templates.Orchestrator.dcproj</DockerComposeProjectPath>
+    <NoWarn>NU5048;NU5125;NU5119</NoWarn>
+    <!--#endif-->
+  </PropertyGroup>
 
-	<!--#if (AuthoringMode)-->
-	<ItemGroup>
-		<Content Include="**\*" Exclude="**\bin\**\*;**\obj\**\*;**\.vs\**\*;**\launchSettings.json" />
-	</ItemGroup>
+  <!--#if (AuthoringMode)-->
+  <ItemGroup>
+    <Content Include="**\*" Exclude="**\bin\**\*;**\obj\**\*;**\.vs\**\*;**\launchSettings.json" />
+  </ItemGroup>
 
-	<PropertyGroup>
-		<DefineConstants>$(DefineConstants);</DefineConstants>
-		<ExcludeOpenApi>false</ExcludeOpenApi>
-		<DockerFastModeProjectMountDirectory>/home/site/wwwroot</DockerFastModeProjectMountDirectory>
-	</PropertyGroup>
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);</DefineConstants>
+    <ExcludeOpenApi>false</ExcludeOpenApi>
+    <DockerFastModeProjectMountDirectory>/home/site/wwwroot</DockerFastModeProjectMountDirectory>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<None Remove="Dockerfile" />
-	</ItemGroup>
-	<!--#endif-->
+  <ItemGroup>
+    <None Remove="Dockerfile" />
+  </ItemGroup>
+  <!--#endif-->
 
-	<ItemGroup>
-		<None Update="host.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Update="local.settings.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-			<CopyToPublishDirectory>Never</CopyToPublishDirectory>
-		</None>
-	</ItemGroup>
+  <ItemGroup>
+    <None Update="host.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="local.settings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+    </None>
+  </ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Arcus.Observability.Telemetry.AspNetCore" Version="2.3.0" />
-		<PackageReference Include="Arcus.Observability.Telemetry.AzureFunctions" Version="2.3.0" />
-		<PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.Applicationinsights" Version="2.3.0" />
-		<PackageReference Include="Arcus.Security.AzureFunctions" Version="1.6.0" />
-		<PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="1.6.0" />
-		<PackageReference Include="Arcus.WebApi.Logging.AzureFunctions" Version="1.4.1" />
-		<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="4.0.1" />
-		<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.12" />
-		<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.OpenApi" Version="1.0.0" Condition="'$(ExcludeOpenApi)' == 'false'" />
-		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
-		<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-		<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
-		<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
-	</ItemGroup>
-
-	<Target Name="FunctionsPostBuildDepsCopy" AfterTargets="PostBuildEvent">
-		<Copy SourceFiles="$(OutDir)$(AssemblyName).deps.json" DestinationFiles="$(OutDir)bin\$(AssemblyName).deps.json" />
-	</Target>
-	<Target Name="FunctionsPublishDepsCopy" AfterTargets="Publish">
-		<Copy SourceFiles="$(OutDir)$(AssemblyName).deps.json" DestinationFiles="$(PublishDir)bin\$(AssemblyName).deps.json" />
-	</Target>
+  <ItemGroup>
+    <PackageReference Include="Arcus.Observability.Telemetry.AspNetCore" Version="2.3.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.AzureFunctions" Version="2.3.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.Applicationinsights" Version="2.3.0" />
+    <PackageReference Include="Arcus.Security.AzureFunctions" Version="1.6.0" />
+    <PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="1.6.0" />
+    <PackageReference Include="Arcus.WebApi.Logging.AzureFunctions" Version="1.4.1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="4.0.1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.12" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.OpenApi" Version="1.0.0" Condition="'$(ExcludeOpenApi)' == 'false'" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+  </ItemGroup>
+  
+  <Target Name="FunctionsPostBuildDepsCopy" AfterTargets="PostBuildEvent">
+    <Copy SourceFiles="$(OutDir)$(AssemblyName).deps.json" DestinationFiles="$(OutDir)bin\$(AssemblyName).deps.json" />
+  </Target>
+  <Target Name="FunctionsPublishDepsCopy" AfterTargets="Publish">
+    <Copy SourceFiles="$(OutDir)$(AssemblyName).deps.json" DestinationFiles="$(PublishDir)bin\$(AssemblyName).deps.json" />
+  </Target>
 </Project>
diff --git a/src/Arcus.Templates.AzureFunctions.Http/Dockerfile b/src/Arcus.Templates.AzureFunctions.Http/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/azure-functions/dotnet:3.0 AS base
+FROM mcr.microsoft.com/azure-functions/dotnet:4 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0.100-bullseye-slim AS build
 WORKDIR /src
 COPY ["Arcus.Templates.AzureFunctions.Http.csproj", ""]
 
@@ -17,4 +17,4 @@ FROM base AS final
 WORKDIR /app
 COPY --from=publish /app .
 ENV AzureWebJobsScriptRoot=/app \
-    AzureFunctionsJobHost__Logging__Console__IsEnabled=true
+    AzureFunctionsJobHost__Logging__Console__IsEnabled=true
diff --git a/src/Arcus.Templates.Tests.Integration/Arcus.Templates.Tests.Integration.csproj b/src/Arcus.Templates.Tests.Integration/Arcus.Templates.Tests.Integration.csproj
@@ -43,7 +43,7 @@
     <PackageReference Include="Microsoft.Azure.Databricks.Client" Version="1.1.2133.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.2.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/Arcus.Templates.Tests.Integration/AzureFunctions/Http/AzureFunctionsHttpProject.cs b/src/Arcus.Templates.Tests.Integration/AzureFunctions/Http/AzureFunctionsHttpProject.cs
@@ -193,7 +193,7 @@ public static AzureFunctionsHttpProject CreateNew(TestConfig configuration, Azur
         /// </summary>
         public async Task StartAsync()
         {
-            Run(Configuration.BuildConfiguration, TargetFramework.NetCoreApp31);
+            Run(Configuration.BuildConfiguration, TargetFramework.Net6_0);
             await WaitUntilTriggerIsAvailableAsync(OrderFunctionEndpoint);
         }
     }

diff --git a/src/Arcus.Templates.Tests.Integration/AzureFunctions/Http/Health/HealthChecksTests.cs b/src/Arcus.Templates.Tests.Integration/AzureFunctions/Http/Health/HealthChecksTests.cs
@@ -7,7 +7,6 @@
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-
 using Xunit;
 using Xunit.Abstractions;