From 2563f18219c625910ee2d5c4fc782405060c8403 Mon Sep 17 00:00:00 2001
From: Alexey Markov <amarkovnsk@gmail.com>
Date: Thu, 12 Mar 2020 13:10:48 +0100
Subject: [PATCH] added missing ConvertErrors task to publish because it may
 fail independently of a successful build

---
 .../FunctionMonkey.Compiler/FunctionMonkey.Compiler.targets | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.targets b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.targets
index 12f02e67..2bffd1b6 100644
--- a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.targets
+++ b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.targets
@@ -26,12 +26,12 @@
   <Target Name="_FunctionMonkeyAzureFunctionsCompiler" AfterTargets="_GenerateFunctionsPostBuild" Condition="'$(AzureFunctionsVersion)' != ''">
     <Message Text="Running Function Monkey build for Azure Functions" />
     <Exec Command="$(FunctionCompilerExe) $(FunctionCompilerParams)" />
-    <ConvertErrors InputPath="$(TargetDir)bin" />
+    <ConvertErrors InputPath="$(TargetDir)$(FunctionPathSubFolder)" />
   </Target>
   <Target Name="_FunctionMonkeyAspNetCompiler" AfterTargets="Build" Condition="'$(AzureFunctionsVersion)' == ''">
     <Message Text="Running Function Monkey build for ASP.Net Core for &quot;$(TargetDir)$(FunctionPathSubFolder)$(TargetName).dll&quot;" />
     <Exec Command="$(FunctionCompilerExe) &quot;$(TargetDir)$(FunctionPathSubFolder)$(TargetName).dll&quot; --netcore21 --jsonoutput" />
-    <ConvertErrors InputPath="$(TargetDir)" />
+    <ConvertErrors InputPath="$(TargetDir)$(FunctionPathSubFolder)" />
   </Target>
 
   <!--
@@ -42,9 +42,11 @@
   <Target Name="_FunctionMonkeyAzureFunctionsPublishCompiler" AfterTargets="_GenerateFunctionsAndCopyContentFiles" Condition="'$(AzureFunctionsVersion)' != ''">
     <Message Text="Running Function Monkey in Publish location $(PublishDir) for Azure Functions" />
     <Exec Command="$(FunctionCompilerExe) &quot;$(PublishDir)$(FunctionPublishParams)&quot; $(FunctionPublishPostfix)" />
+    <ConvertErrors InputPath="$(PublishDir)$(FunctionPathSubFolder)" />
   </Target>
   <Target Name="_FunctionMonkeyAspNetPublishCompiler" AfterTargets="AfterPublish" Condition="'$(AzureFunctionsVersion)' == ''">
     <Message Text="Running Function Monkey in Publish location $(PublishDir) for ASP.Net Core" />
     <Exec Command="$(FunctionCompilerExe) &quot;$(PublishDir)$(TargetName).dll&quot; --netcore21 --jsonoutput" />
+    <ConvertErrors InputPath="$(PublishDir)$(FunctionPathSubFolder)" />
   </Target>
 </Project>
\ No newline at end of file