Skip to content

Commit db3a3c5

Browse files
TaritsynTaritsyn
committed
In JavaScriptEngineSwitcher.Jurassic added support of Jurassic version of December 12, 2017
1 parent 4572327 commit db3a3c5

12 files changed

Lines changed: 31 additions & 46 deletions

File tree

‎NuGet/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.nuspec‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,24 @@
1010
<projectUrl>http://github.com/Taritsyn/JavaScriptEngineSwitcher</projectUrl>
1111
<iconUrl>https://raw.githubusercontent.com/Taritsyn/JavaScriptEngineSwitcher/master/Icons/JavaScriptEngineSwitcher_Jurassic_Logo128x128.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13-
<description>JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper for the Jurassic JavaScript Engine (http://github.com/paulbartrum/jurassic) version of May 24, 2017).</description>
14-
<summary>JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper for the Jurassic JavaScript Engine version of May 24, 2017).</summary>
15-
<releaseNotes>Jurassic was updated to version of May 24, 2017.</releaseNotes>
16-
<copyright>Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
13+
<description>JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper for the Jurassic JavaScript Engine (http://github.com/paulbartrum/jurassic) version of December 12, 2017).</description>
14+
<summary>JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper for the Jurassic JavaScript Engine version of December 12, 2017).</summary>
15+
<releaseNotes>Jurassic was updated to version of December 12, 2017.</releaseNotes>
16+
<copyright>Copyright (c) 2013-2018 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
1717
<language>en-US</language>
1818
<tags>JavaScriptEngineSwitcher JavaScript ECMAScript Jurassic</tags>
1919
<dependencies>
2020
<group targetFramework=".NETFramework4.0-Client">
21-
<dependency id="JavaScriptEngineSwitcher.Core" version="2.4.0" />
21+
<dependency id="Jurassic.Unofficial" version="2017.12.12" />
22+
<dependency id="JavaScriptEngineSwitcher.Core" version="2.4.10" />
2223
</group>
2324
<group targetFramework=".NETFramework4.5">
24-
<dependency id="JavaScriptEngineSwitcher.Core" version="2.4.0" />
25+
<dependency id="Jurassic.Unofficial" version="2017.12.12" />
26+
<dependency id="JavaScriptEngineSwitcher.Core" version="2.4.10" />
2527
</group>
2628
</dependencies>
2729
<references>
2830
<reference file="JavaScriptEngineSwitcher.Jurassic.dll" />
29-
<reference file="Jurassic.dll" />
3031
</references>
3132
</metadata>
3233
<files>

‎NuGet/JavaScriptEngineSwitcher.Jurassic/build-package.cmd‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ set net4_project_source_dir=..\..\src\%project_name%.Net4
33
set net4_project_bin_dir=%net4_project_source_dir%\bin\Release
44
set dotnet_project_source_dir=..\..\src\%project_name%
55
set dotnet_project_bin_dir=%dotnet_project_source_dir%\bin\Release
6-
set lib_dir=..\..\lib\Jurassic
76
set licenses_dir=..\..\Licenses
87
set nuget_package_manager=..\..\.nuget\nuget.exe
98

@@ -15,14 +14,12 @@ del jurassic-license.txt /Q/S
1514
%net40_msbuild% "%net4_project_source_dir%\%project_name%.Net40.csproj" /p:Configuration=Release
1615
xcopy "%net4_project_bin_dir%\%project_name%.dll" lib\net40-client\
1716
xcopy "%net4_project_bin_dir%\ru-ru\%project_name%.resources.dll" lib\net40-client\ru-ru\
18-
xcopy "%lib_dir%\lib\net40-client\Jurassic.dll" lib\net40-client\
1917

2018
%dotnet_cli% restore "%dotnet_project_source_dir%"
2119
%dotnet_cli% build "%dotnet_project_source_dir%" --framework net45 --configuration Release --no-dependencies --no-incremental
2220
xcopy "%dotnet_project_bin_dir%\net45\%project_name%.dll" lib\net45\
2321
xcopy "%dotnet_project_bin_dir%\net45\%project_name%.xml" lib\net45\
2422
xcopy "%dotnet_project_bin_dir%\net45\ru-ru\%project_name%.resources.dll" lib\net45\ru-ru\
25-
xcopy "%lib_dir%\lib\net40-client\Jurassic.dll" lib\net45\
2623

2724
copy "%licenses_dir%\jurassic-license.txt" jurassic-license.txt /Y
2825

‎NuGet/JavaScriptEngineSwitcher.Jurassic/readme.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55

66
--------------------------------------------------------------------------------
77

8-
Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru
8+
Copyright (c) 2013-2018 Andrey Taritsyn - http://www.taritsyn.ru
99

1010

1111
===========
1212
DESCRIPTION
1313
===========
1414
JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper
1515
for the Jurassic JavaScript Engine (http://github.com/paulbartrum/jurassic)
16-
version of May 24, 2017).
16+
version of December 12, 2017).
1717

1818
=============
1919
RELEASE NOTES
2020
=============
21-
Jurassic was updated to version of May 24, 2017.
21+
Jurassic was updated to version of December 12, 2017.
2222

2323
=============
2424
DOCUMENTATION

‎lib/Jurassic/License.txt‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎lib/Jurassic/lib/net40-client/Jurassic.dll‎

-464 KB
Binary file not shown.

‎src/JavaScriptEngineSwitcher.Jurassic.Net4/JavaScriptEngineSwitcher.Jurassic.Net40.csproj‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
15+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
16+
<RestorePackages>true</RestorePackages>
1517
</PropertyGroup>
1618
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1719
<DebugSymbols>true</DebugSymbols>
@@ -44,8 +46,8 @@
4446
</ItemGroup>
4547
<ItemGroup>
4648
<Reference Include="Jurassic, Version=3.0.0.0, Culture=neutral, PublicKeyToken=42f272f6dd312a2c, processorArchitecture=MSIL">
47-
<SpecificVersion>False</SpecificVersion>
48-
<HintPath>..\..\lib\Jurassic\lib\net40-client\Jurassic.dll</HintPath>
49+
<HintPath>..\..\packages\Jurassic.Unofficial.2017.12.12\lib\net40-client\Jurassic.dll</HintPath>
50+
<Private>True</Private>
4951
</Reference>
5052
<Reference Include="System" />
5153
<Reference Include="System.Core" />
@@ -54,6 +56,7 @@
5456
<None Include="..\..\tools\Key.snk">
5557
<Link>Key.snk</Link>
5658
</None>
59+
<None Include="packages.config" />
5760
</ItemGroup>
5861
<ItemGroup>
5962
<Compile Include="..\JavaScriptEngineSwitcher.Jurassic\FileScriptSource.cs">
@@ -82,6 +85,13 @@
8285
<Folder Include="Properties\" />
8386
</ItemGroup>
8487
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
88+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
89+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
90+
<PropertyGroup>
91+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
92+
</PropertyGroup>
93+
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
94+
</Target>
8595
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8696
Other similar extension points exist, see Microsoft.Common.targets.
8797
<Target Name="BeforeBuild">

‎src/JavaScriptEngineSwitcher.Jurassic/FileScriptSource.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public override string Path
3838

3939

4040
/// <summary>
41-
/// Constructs a instance of <see cref="FileScriptSource"/>
41+
/// Constructs an instance of <see cref="FileScriptSource"/>
4242
/// </summary>
4343
/// <param name="documentName">The document name</param>
4444
/// <param name="path">The path to the JS-file</param>

‎src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<Reference Include="Jurassic">
26-
<HintPath>..\..\lib\Jurassic\lib\net40-client\Jurassic.dll</HintPath>
27-
</Reference>
25+
<PackageReference Include="Jurassic.Unofficial" Version="2017.12.12" />
2826

2927
<ProjectReference Include="..\JavaScriptEngineSwitcher.Core\JavaScriptEngineSwitcher.Core.csproj" />
3028
</ItemGroup>

‎src/JavaScriptEngineSwitcher.Jurassic/JurassicJsEngine.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public sealed class JurassicJsEngine : JsEngineBase
3232
/// <summary>
3333
/// Version of original JS engine
3434
/// </summary>
35-
private const string EngineVersion = "May 24, 2017";
35+
private const string EngineVersion = "Dec 12, 2017";
3636

3737
/// <summary>
3838
/// Jurassic JS engine
@@ -76,14 +76,14 @@ public override bool SupportsGarbageCollection
7676

7777

7878
/// <summary>
79-
/// Constructs a instance of adapter for the Jurassic JS engine
79+
/// Constructs an instance of adapter for the Jurassic JS engine
8080
/// </summary>
8181
public JurassicJsEngine()
8282
: this(new JurassicSettings())
8383
{ }
8484

8585
/// <summary>
86-
/// Constructs a instance of adapter for the Jurassic JS engine
86+
/// Constructs an instance of adapter for the Jurassic JS engine
8787
/// </summary>
8888
/// <param name="settings">Settings of the Jurassic JS engine</param>
8989
public JurassicJsEngine(JurassicSettings settings)

‎src/JavaScriptEngineSwitcher.Jurassic/JurassicSettings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public bool StrictMode
3636

3737

3838
/// <summary>
39-
/// Constructs instance of the Jurassic settings
39+
/// Constructs an instance of the Jurassic settings
4040
/// </summary>
4141
public JurassicSettings()
4242
{

0 commit comments

Comments
 (0)