Ensuring tooling support for .NET Core 2.1

pack/Microsoft.NET.Sdk.Functions/Microsoft.NET.Sdk.Functions.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
     <PackageName>Microsoft.NET.Sdk.Functions</PackageName>
-    <Version>1.0.22</Version>
+    <Version>1.0.23</Version>
     <Authors>Microsoft</Authors>
     <ProjectUrl>https://github.com/Azure/azure-functions-vs-build-sdk</ProjectUrl>
     <PackageProjectUrl>https://github.com/Azure/azure-functions-vs-build-sdk</PackageProjectUrl>
@@ -50,7 +50,7 @@
     </None>
     <None Include="$(FunctionsBuildTaskOutputPath)\netstandard1.5\Microsoft.NET.Sdk.Functions.MSBuild.dll">
       <Pack>true</Pack>
-      <PackagePath>tools\netstandard2.0\</PackagePath>
+      <PackagePath>tools\netcoreapp2.1\</PackagePath>
     </None>
 
     <!-- Generator and dependent assemblies-->
@@ -77,15 +77,15 @@
 
     <None Include="$(FunctionsGeneratorOutputPath)\netcoreapp2.0\Newtonsoft.Json.dll">
       <Pack>true</Pack>
-      <PackagePath>tools\netstandard2.0\</PackagePath>
+      <PackagePath>tools\netcoreapp2.1\</PackagePath>
     </None>
     <None Include="$(FunctionsGeneratorOutputPath)\netcoreapp2.0\Microsoft.NET.Sdk.Functions.Generator.dll">
       <Pack>true</Pack>
-      <PackagePath>tools\netstandard2.0\</PackagePath>
+      <PackagePath>tools\netcoreapp2.1\</PackagePath>
     </None>
     <None Include="$(FunctionsGeneratorOutputPath)\netcoreapp2.0\Microsoft.NET.Sdk.Functions.Generator.runtimeconfig.json">
       <Pack>true</Pack>
-      <PackagePath>tools\netstandard2.0\</PackagePath>
+      <PackagePath>tools\netcoreapp2.1\</PackagePath>
     </None>
   </ItemGroup>
 

src/Microsoft.NET.Sdk.Functions.Generator/Microsoft.NET.Sdk.Functions.Generator.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
   </PropertyGroup>
@@ -14,7 +14,7 @@
     <DefineConstants>$(DefineConstants);RELESE_BUILD</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
     <PackageReference Include="Newtonsoft.Json" Version="[11.0.2]" />
     <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />

src/Microsoft.NET.Sdk.Functions.MSBuild/Targets/netstandard1.0/Microsoft.NET.Sdk.Functions.Build.targets

@@ -20,7 +20,9 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     -->
   <Target Name="_GenerateFunctionsPostBuild"
           AfterTargets="Build">
-    
+    <PropertyGroup>
+      <UseNETCoreGenerator Condition="$(UseNETCoreGenerator)=='' AND $(AzureFunctionsVersion) == 'v2'">true</UseNETCoreGenerator>
+    </PropertyGroup>
     <!-- TODO: CopyFilesToOutputDirectory does not look at the outdir to copy the pdbs. hence copying it manually. -->
     <!-- Copy the application pdb to the bin folder-->
     <Move SourceFiles="$(TargetDir)$(TargetName).pdb"

src/Microsoft.NET.Sdk.Functions.MSBuild/Targets/netstandard1.0/Microsoft.NET.Sdk.Functions.targets

@@ -12,7 +12,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
          xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <_FunctionsTaskFramework Condition=" '$(MSBuildRuntimeType)' == 'Core'">netstandard2.0</_FunctionsTaskFramework>
+    <_FunctionsTaskFramework Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp2.1</_FunctionsTaskFramework>
     <_FunctionsTaskFramework Condition=" '$(_FunctionsTaskFramework)' == ''">net46</_FunctionsTaskFramework>
     <_FunctionsTasksDir Condition=" '$(_FunctionsTasksDir)'=='' ">$(MSBuildThisFileDirectory)..\..\tools\$(_FunctionsTaskFramework)\</_FunctionsTasksDir>
     <_FunctionsTaskAssemblyFullPath Condition=" '$(_FunctionsTaskAssemblyFullPath)'=='' ">$(_FunctionsTasksDir)\Microsoft.NET.Sdk.Functions.MSBuild.dll</_FunctionsTaskAssemblyFullPath>

src/Microsoft.NET.Sdk.Functions.MSBuild/Tasks/GenerateFunctions.cs

@@ -22,7 +22,7 @@ namespace Microsoft.NET.Sdk.Functions.Tasks
         public string OutputPath { get; set; }
 
         private const string NETFrameworkFolder = "net46";
-        private const string NETStandardFolder = "netstandard2.0";
+        private const string NETStandardFolder = "netcoreapp2.1";
 
         public bool UseNETCoreGenerator { get; set; }
 
@@ -58,6 +58,8 @@ namespace Microsoft.NET.Sdk.Functions.Tasks
             }
 
 #endif
+            this.Log.LogMessage(MessageImportance.Low, $"Function generator path: '{processStartInfo.FileName}'");
+            this.Log.LogCommandLine(MessageImportance.Low, processStartInfo.Arguments);
             using (Process process = new Process { StartInfo = processStartInfo })
             {
                 process.Start();