Add azurefunctions scripts to nuget package

Author: Matt Mason

WebJobs.Script.proj

@@ -114,11 +114,11 @@
     <ItemGroup>
       <ScriptHostBinaries Include="$(ScriptHostOutput)\*.dll;$(ScriptHostOutput)\*.exe*;$(ScriptHostOutput)\*.optdata;$(ScriptHostOutput)\*.sigdata"/>
       <EdgeJsFiles Include="$(ScriptHostOutput)\edge\**\*.*"/>
-      <StaticContent Include="$(ScriptHostOutput)\Content\**\*.*"/>
+      <StaticContent Include="$(ScriptHostOutput)\azurefunctions\**\*.*"/>
     </ItemGroup>
     <Copy SourceFiles="@(ScriptHostBinaries)" DestinationFolder="$(PublishPath)\Binaries\WebJobs.Script.Host" />
     <Copy SourceFiles="@(EdgeJsFiles)" DestinationFiles="@(EdgeJsFiles->'$(PublishPath)\Binaries\WebJobs.Script.Host\edge\%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(StaticContent)" DestinationFiles="@(StaticContent->'$(PublishPath)\Binaries\WebJobs.Script.Host\Content\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(StaticContent)" DestinationFiles="@(StaticContent->'$(PublishPath)\Binaries\WebJobs.Script.Host\azurefunctions\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Zip
       InputPath="$(PublishPath)\Binaries\WebJobs.Script.Host"
       OutputFileName="$(PublishPath)\Packages\WebJobs.Script.Host.zip"

src/Packages/Packages.csproj

@@ -50,6 +50,7 @@
       <Link>NuGetProj.settings.targets</Link>
     </None>
     <None Include="app.config" />
+    <None Include="tools\install.ps1" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="Build">

src/Packages/tools/install.ps1

@@ -0,0 +1,26 @@
+param($installPath, $toolsPath, $package, $project)
+
+function MarkDirectoryAsCopyToOutputRecursive($item)
+{
+    $item.ProjectItems | ForEach-Object { MarkFileASCopyToOutputDirectory($_) }
+}
+
+function MarkFileASCopyToOutputDirectory($item)
+{
+    Try
+    {
+        Write-Host Try set $item.Name
+        $item.Properties.Item("CopyToOutputDirectory").Value = 2
+    }
+    Catch
+    {
+        Write-Host RecurseOn $item.Name
+        MarkDirectoryAsCopyToOutputRecursive($item)
+    }
+}
+
+# nuget packages are a zip
+# objects in the 'content' directory will be added to the user project root
+# we have content/Content/Scripts/functions.js -> add Content folder to root of user project
+# recursively step through Content folder of user project marking objects as CopyAlways
+MarkDirectoryAsCopyToOutputRecursive($project.ProjectItems.Item("azurefunctions"))

src/WebJobs.Script.NuGet/WebJobs.Script.nuproj

@@ -17,6 +17,12 @@
     <NuGetContent Include="$(WebJobsRootPath)\src\WebJobs.Script\bin\$(Configuration)\Microsoft.Azure.WebJobs.Script.dll">
       <Destination>lib\net451\Microsoft.Azure.WebJobs.Script.dll</Destination>
     </NuGetContent>
+    <NuGetContent Include="$(WebJobsRootPath)\src\Packages\tools**\*.*">
+      <Destination>\</Destination>
+    </NuGetContent>
+    <NuGetContent Include="$(WebJobsRootPath)\src\WebJobs.Script\bin\$(Configuration)\azurefunctions**\*.*">
+      <Destination>content</Destination>
+    </NuGetContent>
     <!--<NuGetContent Include="$(WebJobsRootPath)\src\WebJobs.Script\bin\$(Configuration)\Microsoft.Azure.WebJobs.Script.xml">
       <Destination>lib\net451\Microsoft.Azure.WebJobs.Script.xml</Destination>
     </NuGetContent>-->

src/WebJobs.Script/Description/Node/NodeFunctionInvoker.cs

@@ -42,9 +42,9 @@ public class NodeFunctionInvoker : FunctionInvokerBase
         static NodeFunctionInvoker()
         {
             // node cwd is edge nuget package (double_edge.js)
-            _functionTemplate = @"return require('../Content/Script/functions.js').createFunction(require('{0}'));";
-            _clearRequireCacheScript = @"return require('../Content/Script/functions.js').clearRequireCache;";
-            _globalInitializationScript = @"return require('../Content/Script/functions.js').globalInitialization;";
+            _functionTemplate = @"return require('../azurefunctions/functions.js').createFunction(require('{0}'));";
+            _clearRequireCacheScript = @"return require('../azurefunctions/functions.js').clearRequireCache;";
+            _globalInitializationScript = @"return require('../azurefunctions/functions.js').globalInitialization;";
         }
 
         internal NodeFunctionInvoker(ScriptHost host, BindingMetadata trigger, FunctionMetadata functionMetadata,

src/WebJobs.Script/WebJobs.Script.csproj

@@ -487,13 +487,13 @@
       <Link>edge\edge.js</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Script\http\response.js">
+    <Content Include="azurefunctions\http\response.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Script\http\request.js">
+    <Content Include="azurefunctions\http\request.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Script\functions.js">
+    <Content Include="azurefunctions\functions.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

src/WebJobs.Script/Content/Script/functions.js renamed to src/WebJobs.Script/azurefunctions/functions.js

@@ -4,7 +4,7 @@ var config = process.argv[process.argv.length - 1]
 config = (config.indexOf('--config=') !== -1)? config.substr(9): 'Debug';
 
 function testRequire(script) {
-    return require('../../bin/' + config + '/Content/Script/' + script);
+    return require('../../bin/' + config + '/azurefunctions/' + script);
 }
 
 var functions = testRequire('functions.js');