Moving to Edge.js v6.4.0

Author: mathewc

src/Packages/Packages.csproj

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

src/WebJobs.Script.NuGet/WebJobs.Script.nuspec

@@ -22,7 +22,7 @@
       <dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-beta1-10359" />
       <dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-beta1-10359" />
       <dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-beta1-10359" />
-      <dependency id="Edge.js" version="5.9.1" />
+      <dependency id="Edge.js" version="6.4.0" />
       <dependency id="Microsoft.CodeAnalysis.CSharp.Scripting" version="1.3.2" />
       <dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.3" />
     </dependencies>

src/WebJobs.Script/WebJobs.Script.csproj

@@ -43,7 +43,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EdgeJs, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Edge.js.5.9.1\lib\EdgeJs.dll</HintPath>
+      <HintPath>..\..\packages\Edge.js.6.4.0\lib\net40\EdgeJs.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FSharp.Compiler.Service, Version=6.0.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -408,27 +408,27 @@
     <Compile Include="Utility.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\packages\Edge.js.5.9.1\content\edge\x86\edge_nativeclr.node">
+    <Content Include="..\..\packages\Edge.js.6.4.0\content\edge\x86\edge_nativeclr.node">
       <Link>edge\x86\edge_nativeclr.node</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\packages\Edge.js.5.9.1\content\edge\x86\node.dll">
+    <Content Include="..\..\packages\Edge.js.6.4.0\content\edge\x86\node.dll">
       <Link>edge\x86\node.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\packages\Edge.js.5.9.1\content\edge\x64\edge_nativeclr.node">
+    <Content Include="..\..\packages\Edge.js.6.4.0\content\edge\x64\edge_nativeclr.node">
       <Link>edge\x64\edge_nativeclr.node</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\packages\Edge.js.5.9.1\content\edge\x64\node.dll">
+    <Content Include="..\..\packages\Edge.js.6.4.0\content\edge\x64\node.dll">
       <Link>edge\x64\node.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\packages\Edge.js.5.9.1\content\edge\double_edge.js">
+    <Content Include="..\..\packages\Edge.js.6.4.0\content\edge\double_edge.js">
       <Link>edge\double_edge.js</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\packages\Edge.js.5.9.1\content\edge\edge.js">
+    <Content Include="..\..\packages\Edge.js.6.4.0\content\edge\edge.js">
       <Link>edge\edge.js</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

src/WebJobs.Script/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Edge.js" version="5.9.1" targetFramework="net46" />
+  <package id="Edge.js" version="6.4.0" targetFramework="net46" />
   <package id="FSharp.Compiler.Service" version="6.0.1" targetFramework="net46" />
   <package id="FSharp.Core" version="4.0.0.1" targetFramework="net46" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />

test/WebJobs.Script.Tests/NodeEndToEndTests.cs

@@ -260,6 +260,7 @@ public async Task Scenario_Logging()
             Assert.Equal(TraceLevel.Info, scriptTrace.Level);
             JObject logEntry = JObject.Parse(scriptTrace.Message);
             Assert.Equal("This is a test", logEntry["message"]);
+            Assert.Equal("v6.4.0", (string)logEntry["version"]);
             Assert.Equal(testData, logEntry["input"]);
         }
 

test/WebJobs.Script.Tests/TestScripts/Node/Scenarios/index.js

@@ -22,6 +22,7 @@ var assert = require('assert');
     else if (scenario == 'logging') {
         var logEntry = {
             message: 'This is a test',
+            version: process.version,
             input: input.input
         };
         context.log(logEntry);