Resolved path issue on nix target

Mark-RSK · Dec 1, 2018 · 6b5b7ba · 6b5b7ba
1 parent 34be328
commit 6b5b7ba
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.csproj b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>    
-    <Version>0.18.1-beta000</Version>
-    <AssemblyVersion>0.18.1.0</AssemblyVersion>
-    <FileVersion>0.18.1.0</FileVersion>
+    <Version>0.18.2-beta000</Version>
+    <AssemblyVersion>0.18.2.0</AssemblyVersion>
+    <FileVersion>0.18.2.0</FileVersion>
     <AssemblyName>FunctionMonkey.Compiler</AssemblyName>
     <PackageId>FunctionMonkey.Compiler</PackageId>
   </PropertyGroup>

diff --git a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.nuspec b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>FunctionMonkey.Compiler</id>
-    <version>0.18.1-beta000</version>
+    <version>0.18.2-beta000</version>
     <authors>James Randall</authors>
     <description>Generates Azure Functions from command registrations</description>
     <license type="expression">MIT</license>

diff --git a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.targets b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.targets
@@ -3,8 +3,14 @@
   <PropertyGroup>
     <FunctionCompilerExe Condition="('$(TargetFrameworkIdentifier)' == '.NETCoreApp' OR '$(TargetFrameworkIdentifier)' == '.NETStandard') AND '$(OS)' == 'Windows_NT'">dotnet "$(MSBuildThisFileDirectory)..\..\tools\netcoreapp2.1/FunctionMonkey.Compiler.dll"</FunctionCompilerExe>
     <FunctionCompilerExe Condition="('$(TargetFrameworkIdentifier)' == '.NETCoreApp' OR '$(TargetFrameworkIdentifier)' == '.NETStandard') AND '$(OS)' == 'Unix'">dotnet "$(MSBuildThisFileDirectory)../../tools/netcoreapp2.1/FunctionMonkey.Compiler.dll"</FunctionCompilerExe>
-    <FunctionCompilerParams Condition="('$(TargetFrameworkIdentifier)' == '.NETCoreApp')">&quot;$(TargetDir)bin\$(TargetName).dll&quot; --netcore21</FunctionCompilerParams>
-    <FunctionCompilerParams Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp')">&quot;$(TargetDir)bin\$(TargetName).dll&quot;</FunctionCompilerParams>
+    <!-- compiler params -->
+    <FunctionCompilerParams Condition="('$(TargetFrameworkIdentifier)' == '.NETCoreApp') AND '$(OS)' == 'Windows_NT'">&quot;$(TargetDir)bin\$(TargetName).dll&quot; --netcore21</FunctionCompilerParams>
+    <FunctionCompilerParams Condition="('$(TargetFrameworkIdentifier)' == '.NETCoreApp') AND '$(OS)' == 'Unix'">&quot;$(TargetDir)bin/$(TargetName).dll&quot; --netcore21</FunctionCompilerParams>
+    <FunctionCompilerParams Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp') AND '$(OS)' == 'Windows_NT'">&quot;$(TargetDir)bin\$(TargetName).dll&quot;</FunctionCompilerParams>
+    <FunctionCompilerParams Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp') AND '$(OS)' == 'Unix'">&quot;$(TargetDir)bin/$(TargetName).dll&quot;</FunctionCompilerParams>
+    <!-- publish params -->
+    <FunctionPublishParams Condition="'$(OS)' == 'Windows_NT'">&quot;$(PublishDir)bin\$(TargetName).dll&quot;</FunctionPublishParams>
+    <FunctionPublishParams Condition="'$(OS)' == 'Unix'">&quot;$(PublishDir)bin/$(TargetName).dll&quot;</FunctionPublishParams>
   </PropertyGroup>
 
   <!-- we ensure the functions post build has run first -->
@@ -20,6 +26,6 @@
   <!--<Target Name="_FunctionMonkeyPublishCompiler" AfterTargets="AfterPublish">-->
   <Target Name="_FunctionMonkeyPublishCompiler" AfterTargets="_GenerateFunctionsAndCopyContentFiles">
     <Message Text="Running Function Monkey in Publish location $(PublishDir)" />
-    <Exec Command="$(FunctionCompilerExe) &quot;$(PublishDir)bin\$(TargetName).dll&quot;" />
+    <Exec Command="$(FunctionCompilerExe) $(FunctionPublishParams)" />
   </Target>
 </Project>