Added host.json when using UseAppSettings extension to be used by Azu…

…re Functions settings (#7) * Adding exception to not publish when there is a documentation change. * Fix deploy workflow * Update packages, add host.json to configuration.
junalmeida · Sep 8, 2020 · 49ed6d8 · 49ed6d8
1 parent 2effd3a
commit 49ed6d8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/...encyInjection.AzureFunctions/Autofac.Extensions.DependencyInjection.AzureFunctions.csproj b/...encyInjection.AzureFunctions/Autofac.Extensions.DependencyInjection.AzureFunctions.csproj
@@ -32,7 +32,7 @@
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.8" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Autofac.Extensions.DependencyInjection.AzureFunctions/ConfigurationExtensions.cs b/Autofac.Extensions.DependencyInjection.AzureFunctions/ConfigurationExtensions.cs
@@ -62,14 +62,18 @@ public static IFunctionsHostBuilder UseAppSettings(this IFunctionsHostBuilder ho
             string currentDirectory = fileInfo.Directory.Parent.FullName;
 
             var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
-            if (string.IsNullOrWhiteSpace(environment)) environment = "Development";
+            if (string.IsNullOrWhiteSpace(environment))
+                environment = Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT");
+            if (string.IsNullOrWhiteSpace(environment))
+                environment = "Development"; // Fallback to Development when none is set.
 
             return UseAppSettings(hostBuilder, (builder) =>
             {
                 builder
                     .SetBasePath(currentDirectory)
                     .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
                     .AddJsonFile($"appsettings.{environment}.json", optional: true, reloadOnChange: true)
+                    .AddJsonFile("host.json", optional: true, reloadOnChange: true)
                     .AddEnvironmentVariables();
             });
         }

diff --git a/SampleAutofacFunction/SampleAutofacFunction.csproj b/SampleAutofacFunction/SampleAutofacFunction.csproj
@@ -4,8 +4,8 @@
     <AzureFunctionsVersion>v3</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.10" />
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.3" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.2" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.9" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Autofac.Extensions.DependencyInjection.AzureFunctions\Autofac.Extensions.DependencyInjection.AzureFunctions.csproj" />

diff --git a/SampleAutofacFunction/host.json b/SampleAutofacFunction/host.json
@@ -7,5 +7,6 @@
                 "isEnabled": true
             }
         }
-    }
+    },
+    "functionTimeout": "00:10:00"
 }
diff --git a/autofac-azurefunctions.sln b/autofac-azurefunctions.sln
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
 		LICENSE = LICENSE
+		.github\workflows\main.yml = .github\workflows\main.yml
 		README.md = README.md
 	EndProjectSection
 EndProject
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,5 +7,6 @@ @@
                     "isEnabled": true
                 }
             }
-        }
+        },
+        "functionTimeout": "00:10:00"
     }