Skip to content

Commit 69df4b3

Browse files
Daniel15Daniel15
committed
Upgraded JSPool and JavaScriptEngineSwitcher to latest versions
1 parent 5062b4e commit 69df4b3

26 files changed

+155
-102
lines changed

‎build.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ of patent rights can be found in the PATENTS file in the same directory.
1010
<Project ToolsVersion="4.0" DefaultTargets="Build;Test;Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1111
<PropertyGroup>
1212
<Major>2</Major>
13-
<Minor>2</Minor>
14-
<Build>2</Build>
13+
<Minor>3</Minor>
14+
<Build>0</Build>
1515
<Revision>0</Revision>
1616
<DevNuGetServer>http://reactjs.net/packages/</DevNuGetServer>
1717
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\tools\MSBuildTasks</MSBuildCommunityTasksPath>

‎src/React.AspNet/project.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
}
1616
},
1717
"dependencies": {
18-
"JsPool": "0.3.1",
18+
"JsPool": "0.4.1",
1919
"Microsoft.AspNet.Mvc.Core": "6.0.0-rc1-final",
2020
"Microsoft.AspNet.StaticFiles": "1.0.0-rc1-final",
2121
"Microsoft.AspNet.FileProviders.Physical": "1.0.0-rc1-final",
2222
"Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-rc1-final",
23-
"MsieJavaScriptEngine": "1.6.0",
2423
"React.Core": "",
25-
"JavaScriptEngineSwitcher.Core": "1.2.4.0",
2624
"Microsoft.Extensions.DependencyInjection": "1.0.0-rc1-final",
27-
"JavaScriptEngineSwitcher.Msie": "1.4.0",
28-
"JavaScriptEngineSwitcher.V8": "1.4.1"
25+
"JavaScriptEngineSwitcher.Core": "1.5.0",
26+
"JavaScriptEngineSwitcher.Msie": "1.5.0",
27+
"JavaScriptEngineSwitcher.V8": "1.5.2",
28+
"MsieJavaScriptEngine": "1.7.0"
2929
},
3030
"frameworks": {
3131
"dnx451": { }

‎src/React.Core/React.Core.csproj

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\JavaScriptEngineSwitcher.V8.1.4.1\build\JavaScriptEngineSwitcher.V8.props" Condition="Exists('..\packages\JavaScriptEngineSwitcher.V8.1.4.1\build\JavaScriptEngineSwitcher.V8.props')" />
3+
<Import Project="..\packages\JavaScriptEngineSwitcher.V8.1.5.2\build\JavaScriptEngineSwitcher.V8.props" Condition="Exists('..\packages\JavaScriptEngineSwitcher.V8.1.5.2\build\JavaScriptEngineSwitcher.V8.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -49,28 +49,28 @@
4949
<StartupObject />
5050
</PropertyGroup>
5151
<ItemGroup>
52-
<Reference Include="ClearScript, Version=5.4.4.0, Culture=neutral, PublicKeyToken=935d0c957da47c73, processorArchitecture=MSIL">
53-
<HintPath>..\packages\JavaScriptEngineSwitcher.V8.1.4.1\lib\net40\ClearScript.dll</HintPath>
52+
<Reference Include="ClearScript, Version=5.4.5.0, Culture=neutral, PublicKeyToken=935d0c957da47c73, processorArchitecture=MSIL">
53+
<HintPath>..\packages\JavaScriptEngineSwitcher.V8.1.5.2\lib\net40\ClearScript.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
56-
<Reference Include="JavaScriptEngineSwitcher.Core, Version=1.2.4.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
57-
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\packages\JavaScriptEngineSwitcher.Core.1.2.4\lib\net40\JavaScriptEngineSwitcher.Core.dll</HintPath>
56+
<Reference Include="JavaScriptEngineSwitcher.Core, Version=1.5.0.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
57+
<HintPath>..\packages\JavaScriptEngineSwitcher.Core.1.5.0\lib\net40\JavaScriptEngineSwitcher.Core.dll</HintPath>
58+
<Private>True</Private>
5959
</Reference>
60-
<Reference Include="JavaScriptEngineSwitcher.Msie, Version=1.4.0.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
61-
<HintPath>..\packages\JavaScriptEngineSwitcher.Msie.1.4.0\lib\net40\JavaScriptEngineSwitcher.Msie.dll</HintPath>
60+
<Reference Include="JavaScriptEngineSwitcher.Msie, Version=1.5.0.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
61+
<HintPath>..\packages\JavaScriptEngineSwitcher.Msie.1.5.0\lib\net40\JavaScriptEngineSwitcher.Msie.dll</HintPath>
6262
<Private>True</Private>
6363
</Reference>
64-
<Reference Include="JavaScriptEngineSwitcher.V8, Version=1.4.1.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
65-
<HintPath>..\packages\JavaScriptEngineSwitcher.V8.1.4.1\lib\net40\JavaScriptEngineSwitcher.V8.dll</HintPath>
64+
<Reference Include="JavaScriptEngineSwitcher.V8, Version=1.5.0.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
65+
<HintPath>..\packages\JavaScriptEngineSwitcher.V8.1.5.2\lib\net40\JavaScriptEngineSwitcher.V8.dll</HintPath>
6666
<Private>True</Private>
6767
</Reference>
68-
<Reference Include="JSPool, Version=0.3.0.0, Culture=neutral, PublicKeyToken=2fc7775f73072640, processorArchitecture=MSIL">
69-
<HintPath>..\packages\JSPool.0.3.1\lib\net40-Client\JSPool.dll</HintPath>
68+
<Reference Include="JSPool, Version=0.4.0.0, Culture=neutral, PublicKeyToken=2fc7775f73072640, processorArchitecture=MSIL">
69+
<HintPath>..\packages\JSPool.0.4.1\lib\net40-Client\JSPool.dll</HintPath>
7070
<Private>True</Private>
7171
</Reference>
72-
<Reference Include="MsieJavaScriptEngine, Version=1.6.0.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
73-
<HintPath>..\packages\MsieJavaScriptEngine.1.6.0\lib\net40\MsieJavaScriptEngine.dll</HintPath>
72+
<Reference Include="MsieJavaScriptEngine, Version=1.7.0.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
73+
<HintPath>..\packages\MsieJavaScriptEngine.1.7.0\lib\net40\MsieJavaScriptEngine.dll</HintPath>
7474
<Private>True</Private>
7575
</Reference>
7676
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -158,7 +158,7 @@
158158
<PropertyGroup>
159159
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
160160
</PropertyGroup>
161-
<Error Condition="!Exists('..\packages\JavaScriptEngineSwitcher.V8.1.4.1\build\JavaScriptEngineSwitcher.V8.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JavaScriptEngineSwitcher.V8.1.4.1\build\JavaScriptEngineSwitcher.V8.props'))" />
161+
<Error Condition="!Exists('..\packages\JavaScriptEngineSwitcher.V8.1.5.2\build\JavaScriptEngineSwitcher.V8.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JavaScriptEngineSwitcher.V8.1.5.2\build\JavaScriptEngineSwitcher.V8.props'))" />
162162
</Target>
163163
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
164164
Other similar extension points exist, see Microsoft.Common.targets.

‎src/React.Core/VroomJsEngine.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ namespace React
2323
/// </summary>
2424
public class VroomJsEngine : JsEngineBase
2525
{
26+
private bool _disposed;
27+
2628
/// <summary>
2729
/// The VroomJs engine. One engine is shared for the whole app, and separate contexts are
2830
/// used for each instance of this class.

‎src/React.Core/packages.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="JavaScriptEngineSwitcher.Core" version="1.2.4" targetFramework="net4" />
4-
<package id="JavaScriptEngineSwitcher.Msie" version="1.4.0" targetFramework="net40" />
5-
<package id="JavaScriptEngineSwitcher.V8" version="1.4.1" targetFramework="net40" />
6-
<package id="JSPool" version="0.3.1" targetFramework="net4" />
7-
<package id="MsieJavaScriptEngine" version="1.6.0" targetFramework="net40" />
3+
<package id="JavaScriptEngineSwitcher.Core" version="1.5.0" targetFramework="net40" />
4+
<package id="JavaScriptEngineSwitcher.Msie" version="1.5.0" targetFramework="net40" />
5+
<package id="JavaScriptEngineSwitcher.V8" version="1.5.2" targetFramework="net40" />
6+
<package id="JSPool" version="0.4.1" targetFramework="net40" />
7+
<package id="MsieJavaScriptEngine" version="1.7.0" targetFramework="net40" />
88
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net4" />
99
</packages>

‎src/React.Owin/React.Owin.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
<SignAssembly>true</SignAssembly>
4545
</PropertyGroup>
4646
<ItemGroup>
47-
<Reference Include="JavaScriptEngineSwitcher.Core, Version=1.2.4.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
48-
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\packages\JavaScriptEngineSwitcher.Core.1.2.4\lib\net40\JavaScriptEngineSwitcher.Core.dll</HintPath>
47+
<Reference Include="JavaScriptEngineSwitcher.Core, Version=1.5.0.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
48+
<HintPath>..\packages\JavaScriptEngineSwitcher.Core.1.5.0\lib\net40\JavaScriptEngineSwitcher.Core.dll</HintPath>
49+
<Private>True</Private>
5050
</Reference>
5151
<Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5252
<HintPath>..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll</HintPath>

‎src/React.Owin/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="JavaScriptEngineSwitcher.Core" version="1.2.4" targetFramework="net45" />
3+
<package id="JavaScriptEngineSwitcher.Core" version="1.5.0" targetFramework="net45" />
44
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
55
<package id="Microsoft.Owin.FileSystems" version="3.0.1" targetFramework="net45" />
66
<package id="Microsoft.Owin.StaticFiles" version="3.0.1" targetFramework="net45" />

‎src/React.Sample.Cassette/React.Sample.Cassette.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,9 @@
6868
<HintPath>..\packages\Cassette.Views.2.4.2\lib\net40\Cassette.Views.dll</HintPath>
6969
<Private>True</Private>
7070
</Reference>
71-
<Reference Include="JavaScriptEngineSwitcher.Core">
72-
<HintPath>..\packages\JavaScriptEngineSwitcher.Core.1.2.4\lib\net40\JavaScriptEngineSwitcher.Core.dll</HintPath>
71+
<Reference Include="JavaScriptEngineSwitcher.Core, Version=1.5.0.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
72+
<HintPath>..\packages\JavaScriptEngineSwitcher.Core.1.5.0\lib\net40\JavaScriptEngineSwitcher.Core.dll</HintPath>
73+
<Private>True</Private>
7374
</Reference>
7475
<Reference Include="Microsoft.CSharp" />
7576
<Reference Include="System" />

‎src/React.Sample.Cassette/Web.config

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,16 @@
5353
<runtime>
5454
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5555
<dependentAssembly>
56-
<assemblyIdentity name="MsieJavaScriptEngine" publicKeyToken="a3a2846a37ac0d3e" culture="neutral" />
57-
<bindingRedirect oldVersion="0.0.0.0-1.4.2.0" newVersion="1.4.2.0" />
56+
<assemblyIdentity name="MsieJavaScriptEngine" publicKeyToken="a3a2846a37ac0d3e" culture="neutral"/>
57+
<bindingRedirect oldVersion="0.0.0.0-1.4.2.0" newVersion="1.4.2.0"/>
5858
</dependentAssembly>
5959
<dependentAssembly>
60-
<assemblyIdentity name="AjaxMin" publicKeyToken="21ef50ce11b5d80f" culture="neutral" />
61-
<bindingRedirect oldVersion="0.0.0.0-5.14.5506.26196" newVersion="5.14.5506.26196" />
60+
<assemblyIdentity name="AjaxMin" publicKeyToken="21ef50ce11b5d80f" culture="neutral"/>
61+
<bindingRedirect oldVersion="0.0.0.0-5.14.5506.26196" newVersion="5.14.5506.26196"/>
62+
</dependentAssembly>
63+
<dependentAssembly>
64+
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral"/>
65+
<bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0"/>
6266
</dependentAssembly>
6367
</assemblyBinding>
6468
</runtime>

‎src/React.Sample.Cassette/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Cassette.Aspnet" version="2.4.2" targetFramework="net40" />
66
<package id="Cassette.MSBuild" version="2.4.2" targetFramework="net40" />
77
<package id="Cassette.Views" version="2.4.2" targetFramework="net40" />
8-
<package id="JavaScriptEngineSwitcher.Core" version="1.2.4" targetFramework="net40" />
8+
<package id="JavaScriptEngineSwitcher.Core" version="1.5.0" targetFramework="net40" />
99
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />
1010
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" targetFramework="net40" />
1111
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />

0 commit comments

Comments
 (0)