Skip to content

Commit 980f1fa

Browse files
author
Matt Mason
committed
Update node to 6.11.2 (edge 6.11.3)
This reverts commit 15364ab.
1 parent 15364ab commit 980f1fa

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

runappveyortests.cmd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@ vstest.console.exe "%APPVEYOR_BUILD_FOLDER%\test\WebJobs.Script.Tests.Integratio
2828
IF %ERRORLEVEL% NEQ 0 (set /a exitCode=1)
2929
vstest.console.exe "%APPVEYOR_BUILD_FOLDER%\test\WebJobs.Script.Tests.Integration\bin\Release\Microsoft.Azure.WebJobs.Script.Tests.Integration.dll" "%APPVEYOR_BUILD_FOLDER%\test\WebJobs.Script.Tests\bin\Release\xunit.runner.visualstudio.testadapter.dll" /logger:Appveyor /TestAdapterPath:"%APPVEYOR_BUILD_FOLDER%" /TestCaseFilter:"E2E=SamplesEndToEndTests"
3030
IF %ERRORLEVEL% NEQ 0 (set /a exitCode=1)
31+
vstest.console.exe "%APPVEYOR_BUILD_FOLDER%\test\WebJobs.Script.Tests.Integration\bin\Release\Microsoft.Azure.WebJobs.Script.Tests.Integration.dll" "%APPVEYOR_BUILD_FOLDER%\test\WebJobs.Script.Tests\bin\Release\xunit.runner.visualstudio.testadapter.dll" /logger:Appveyor /TestAdapterPath:"%APPVEYOR_BUILD_FOLDER%" /TestCaseFilter:"E2E=NodeEndToEndTests" /Platform:x64
32+
IF %ERRORLEVEL% NEQ 0 (set /a exitCode=1)
3133

3234
EXIT /B %exitCode%

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1515
<tags>Microsoft Azure WebJobs Jobs Script Node.js</tags>
1616
<dependencies>
17-
<dependency id="Edge.js" version="6.5.1" />
17+
<dependency id="Edge.js" version="6.11.3" />
1818
<dependency id="FSharp.Compiler.Service" version="9.0.1" />
1919
<dependency id="FSharp.Core" version="4.0.0.1" />
2020
<dependency id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-11013" />

src/WebJobs.Script/WebJobs.Script.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -553,30 +553,30 @@
553553
<Compile Include="Description\Node\NodeFunctionDescriptorProvider.cs" />
554554
<Compile Include="Description\Node\NodeFunctionInvoker.cs" />
555555
<Reference Include="EdgeJs, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
556-
<HintPath>..\..\packages\Edge.js.6.5.1\lib\net40\EdgeJs.dll</HintPath>
556+
<HintPath>..\..\packages\Edge.js.6.11.3\lib\net40\EdgeJs.dll</HintPath>
557557
<Private>True</Private>
558558
</Reference>
559-
<Content Include="..\..\packages\Edge.js.6.5.1\content\edge\x86\edge_nativeclr.node">
559+
<Content Include="..\..\packages\Edge.js.6.11.3\content\edge\x86\edge_nativeclr.node">
560560
<Link>edge\x86\edge_nativeclr.node</Link>
561561
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
562562
</Content>
563-
<Content Include="..\..\packages\Edge.js.6.5.1\content\edge\x86\node.dll">
563+
<Content Include="..\..\packages\Edge.js.6.11.3\content\edge\x86\node.dll">
564564
<Link>edge\x86\node.dll</Link>
565565
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
566566
</Content>
567-
<Content Include="..\..\packages\Edge.js.6.5.1\content\edge\x64\edge_nativeclr.node">
567+
<Content Include="..\..\packages\Edge.js.6.11.3\content\edge\x64\edge_nativeclr.node">
568568
<Link>edge\x64\edge_nativeclr.node</Link>
569569
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
570570
</Content>
571-
<Content Include="..\..\packages\Edge.js.6.5.1\content\edge\x64\node.dll">
571+
<Content Include="..\..\packages\Edge.js.6.11.3\content\edge\x64\node.dll">
572572
<Link>edge\x64\node.dll</Link>
573573
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
574574
</Content>
575-
<Content Include="..\..\packages\Edge.js.6.5.1\content\edge\double_edge.js">
575+
<Content Include="..\..\packages\Edge.js.6.11.3\content\edge\double_edge.js">
576576
<Link>edge\double_edge.js</Link>
577577
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
578578
</Content>
579-
<Content Include="..\..\packages\Edge.js.6.5.1\content\edge\edge.js">
579+
<Content Include="..\..\packages\Edge.js.6.11.3\content\edge\edge.js">
580580
<Link>edge\edge.js</Link>
581581
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
582582
</Content>

src/WebJobs.Script/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Edge.js" version="6.5.1" targetFramework="net46" />
3+
<package id="Edge.js" version="6.11.3" targetFramework="net46" />
44
<package id="FSharp.Compiler.Service" version="9.0.1" targetFramework="net46" />
55
<package id="FSharp.Core" version="4.0.0.1" targetFramework="net46" />
66
<package id="Microsoft.ApplicationInsights" version="2.4.0" targetFramework="net46" />

test/WebJobs.Script.Tests.Integration/NodeEndToEndTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ await TestHelpers.Await(() =>
270270
Assert.Equal(TraceLevel.Info, scriptTrace.Level);
271271
JObject logEntry = JObject.Parse(scriptTrace.Message);
272272
Assert.Equal("This is a test", logEntry["message"]);
273-
Assert.Equal("v6.5.0", (string)logEntry["version"]);
273+
Assert.Equal("v6.11.2", (string)logEntry["version"]);
274274
Assert.Equal(testData, logEntry["input"]);
275275

276276
// verify log levels in traces

0 commit comments

Comments
 (0)