PublishDir fix for publishing

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

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.csproj b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.csproj
@@ -3,9 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>    
-    <Version>0.18.2-beta000</Version>
-    <AssemblyVersion>0.18.2.0</AssemblyVersion>
-    <FileVersion>0.18.2.0</FileVersion>
+    <Version>0.18.3-beta000</Version>
     <AssemblyName>FunctionMonkey.Compiler</AssemblyName>
     <PackageId>FunctionMonkey.Compiler</PackageId>
   </PropertyGroup>
@@ -360,8 +358,8 @@
     <IntermediatePackDir>$(MSBuildProjectDirectory)/bin/$(Configuration)/publish/</IntermediatePackDir>
     <PublishDir>$(IntermediatePackDir)$(TargetFramework)/</PublishDir>
     <NuspecProperties>publishDir=$([MSBuild]::NormalizeDirectory($(IntermediatePackDir)))</NuspecProperties>
-    <AssemblyVersion>0.17.1.0</AssemblyVersion>
-    <FileVersion>0.17.1.0</FileVersion>
+    <AssemblyVersion>0.18.3.0</AssemblyVersion>
+    <FileVersion>0.18.3.0</FileVersion>
     <PackageReleaseNotes></PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.nuspec b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.nuspec
@@ -2,10 +2,11 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>FunctionMonkey.Compiler</id>
-    <version>0.18.2-beta000</version>
+    <version>0.18.4-beta000</version>
     <authors>James Randall</authors>
     <description>Generates Azure Functions from command registrations</description>
     <license type="expression">MIT</license>
+    <licenseUrl>https://raw.githubusercontent.com/JamesRandall/AzureFromTheTrenches.Commanding/master/LICENSE</licenseUrl>
     <projectUrl>https://github.com/JamesRandall/FunctionMonkey.git</projectUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
   </metadata>

diff --git a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.targets b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.targets
@@ -9,8 +9,8 @@
     <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>
+    <FunctionPublishParams Condition="'$(OS)' == 'Windows_NT'">bin\$(TargetName).dll</FunctionPublishParams>
+    <FunctionPublishParams Condition="'$(OS)' == 'Unix'">bin/$(TargetName).dll</FunctionPublishParams>
   </PropertyGroup>
 
   <!-- we ensure the functions post build has run first -->
@@ -26,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) $(FunctionPublishParams)" />
+    <Exec Command="$(FunctionCompilerExe) &quot;$(PublishDir)$(FunctionPublishParams)&quot;" />
   </Target>
 </Project>