Fixed it so that it runs in Azure aswell

ppotturi · Oct 18, 2018 · 6344299 · 6344299
1 parent 677e46d
commit 6344299
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -258,4 +258,5 @@ paket-files/
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
+*.pyc
+/AzureFunctionsV2DI/Properties/PublishProfiles/AllegoDibranTestV2 - Web Deploy.pubxml
diff --git a/AzureFunctionsV2.DependencyInjection/AzureFunctionsV2.DependencyInjection.csproj b/AzureFunctionsV2.DependencyInjection/AzureFunctionsV2.DependencyInjection.csproj
@@ -5,8 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.0-beta8" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/AzureFunctionsV2DI.sln b/AzureFunctionsV2DI.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28010.2016
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureFunctionsV2DI", "AzureFunctionsV2DI\AzureFunctionsV2DI.csproj", "{F09C4202-2C7F-4FB0-AC83-42436B7437A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureFunctionsV2DI", "AzureFunctionsV2DI\AzureFunctionsV2DI.csproj", "{F09C4202-2C7F-4FB0-AC83-42436B7437A6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureFunctionsV2.DependencyInjection", "AzureFunctionsV2.DependencyInjection\AzureFunctionsV2.DependencyInjection.csproj", "{B9E54B38-88D4-4028-8EBC-7FD0586591D5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureFunctionsV2.DependencyInjection", "AzureFunctionsV2.DependencyInjection\AzureFunctionsV2.DependencyInjection.csproj", "{B9E54B38-88D4-4028-8EBC-7FD0586591D5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/AzureFunctionsV2DI/AzureFunctionsV2DI.csproj b/AzureFunctionsV2DI/AzureFunctionsV2DI.csproj
@@ -4,7 +4,7 @@
     <AzureFunctionsVersion>v2</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.19" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.23" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AzureFunctionsV2.DependencyInjection\AzureFunctionsV2.DependencyInjection.csproj" />
@@ -13,9 +13,15 @@
     <None Update="host.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="local.settings.json">
+    <None Update="appsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>Never</CopyToPublishDirectory>
     </None>
+    <None Update="local.settings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
+  <Target Name="CopyTargetPathToEarlyPublish" BeforeTargets="Publish">
+    <Copy SourceFiles="$(TargetPath)" DestinationFiles="$(FunctionsTargetPath)" />
+  </Target>
 </Project>
diff --git a/AzureFunctionsV2DI/DemoFunction.cs b/AzureFunctionsV2DI/DemoFunction.cs
@@ -23,6 +23,8 @@ public static IActionResult Run(
 
             var res = demoService.GetResponse();
 
+            log.LogInformation($"Res = {res}");
+
             return new OkObjectResult(res);
         }
     }

diff --git a/AzureFunctionsV2DI/WebJobsExtensionStartup.cs b/AzureFunctionsV2DI/WebJobsExtensionStartup.cs
@@ -1,11 +1,11 @@
-using System;
-using AzureFunctionsV2.DependencyInjection;
+using AzureFunctionsV2.DependencyInjection;
 using AzureFunctionsV2DI;
 using AzureFunctionsV2DI.Service;
 using Microsoft.Azure.WebJobs;
 using Microsoft.Azure.WebJobs.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using System.Linq;
 
 [assembly: WebJobsStartup(typeof(WebJobsExtensionStartup), "A Web Jobs Extension Sample")]
 namespace AzureFunctionsV2DI
@@ -14,13 +14,9 @@ public class WebJobsExtensionStartup : IWebJobsStartup
     {
         public void Configure(IWebJobsBuilder builder)
         {
-            IConfigurationRoot config = new ConfigurationBuilder()
-                .SetBasePath(Environment.CurrentDirectory)
-                .AddJsonFile("local.settings.json", optional: true, reloadOnChange: true)
-                .AddEnvironmentVariables()
-                .Build();
+            var config = builder.Services.FirstOrDefault(p => p.ServiceType == typeof(IConfiguration))?.ImplementationInstance as IConfiguration;
 
-            var testValue = config.GetValue<string>("Test");
+            string testValue = config.GetValue<string>("Test");
 
             builder.Services.AddSingleton<IDemoService>(new DemoService(testValue));
 

diff --git a/FunctionApp1/local.settings.json b/FunctionApp1/local.settings.json
@@ -0,0 +1,7 @@
+{
+    "IsEncrypted": false,
+    "Values": {
+        "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+        "FUNCTIONS_WORKER_RUNTIME": "dotnet"
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,8 @@ public static IActionResult Run( @@
                 var res = demoService.GetResponse();
+                log.LogInformation($"Res = {res}");
                 return new OkObjectResult(res);
             }
         }
@@ Expand Down @@