In JavaScriptEngineSwitcher.Jurassic:

Taritsyn · Taritsyn · commit 138ebb3d480a · 2017-10-12T14:11:34.000+03:00
1. Added support of .NET Standard 2.0;
 2. Jurassic was updated to version of September 1, 2017.
diff --git a/NuGet/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.nuspec b/NuGet/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.nuspec
@@ -10,9 +10,10 @@
 		<projectUrl>http://github.com/Taritsyn/JavaScriptEngineSwitcher</projectUrl>
 		<iconUrl>https://raw.githubusercontent.com/Taritsyn/JavaScriptEngineSwitcher/master/Icons/JavaScriptEngineSwitcher_Jurassic_Logo128x128.png</iconUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper for the Jurassic JavaScript Engine (http://github.com/paulbartrum/jurassic) version of July 13, 2017).</description>
-		<summary>JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper for the Jurassic JavaScript Engine version of July 13, 2017).</summary>
-		<releaseNotes>Jurassic was updated to version of July 13, 2017.</releaseNotes>
+		<description>JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper for the Jurassic JavaScript Engine (http://github.com/paulbartrum/jurassic) version of September 1, 2017).</description>
+		<summary>JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper for the Jurassic JavaScript Engine version of September 1, 2017).</summary>
+		<releaseNotes>1. Added support of .NET Standard 2.0;
+2. Jurassic was updated to version of September 1, 2017.</releaseNotes>
 		<copyright>Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScriptEngineSwitcher JavaScript ECMAScript Jurassic</tags>
@@ -23,6 +24,10 @@
 			<group targetFramework=".NETFramework4.5">
 				<dependency id="JavaScriptEngineSwitcher.Core" version="3.0.0-alpha2" />
 			</group>
+			<group targetFramework=".NETStandard2.0">
+				<dependency id="System.Reflection.Emit.Lightweight" version="4.3.0" />
+				<dependency id="JavaScriptEngineSwitcher.Core" version="3.0.0-alpha2" />
+			</group>
 		</dependencies>
 		<references>
 			<reference file="JavaScriptEngineSwitcher.Jurassic.dll" />
diff --git a/NuGet/JavaScriptEngineSwitcher.Jurassic/build-package.cmd b/NuGet/JavaScriptEngineSwitcher.Jurassic/build-package.cmd
@@ -18,12 +18,19 @@ xcopy "%net4_project_bin_dir%\ru-ru\%project_name%.resources.dll" lib\net40-clie
 xcopy "%lib_dir%\lib\net40-client\Jurassic.dll" lib\net40-client\
 
 %dotnet_cli% restore "%dotnet_project_source_dir%"
+
 %dotnet_cli% build "%dotnet_project_source_dir%" --framework net45 --configuration Release --no-dependencies --no-incremental
 xcopy "%dotnet_project_bin_dir%\net45\%project_name%.dll" lib\net45\
 xcopy "%dotnet_project_bin_dir%\net45\%project_name%.xml" lib\net45\
 xcopy "%dotnet_project_bin_dir%\net45\ru-ru\%project_name%.resources.dll" lib\net45\ru-ru\
 xcopy "%lib_dir%\lib\net40-client\Jurassic.dll" lib\net45\
 
+%dotnet_cli% build "%dotnet_project_source_dir%" --framework netstandard2.0 --configuration Release --no-dependencies --no-incremental
+xcopy "%dotnet_project_bin_dir%\netstandard2.0\%project_name%.dll" lib\netstandard2.0\
+xcopy "%dotnet_project_bin_dir%\netstandard2.0\%project_name%.xml" lib\netstandard2.0\
+xcopy "%dotnet_project_bin_dir%\netstandard2.0\ru-ru\%project_name%.resources.dll" lib\netstandard2.0\ru-ru\
+xcopy "%lib_dir%\lib\net40-client\Jurassic.dll" lib\netstandard2.0\
+
 copy "%licenses_dir%\jurassic-license.txt" jurassic-license.txt /Y
 
 %nuget_package_manager% pack "..\%project_name%\%project_name%.nuspec"
diff --git a/NuGet/JavaScriptEngineSwitcher.Jurassic/readme.txt b/NuGet/JavaScriptEngineSwitcher.Jurassic/readme.txt
@@ -13,12 +13,13 @@
    ===========
    JavaScriptEngineSwitcher.Jurassic contains adapter `JurassicJsEngine` (wrapper
    for the Jurassic JavaScript Engine (http://github.com/paulbartrum/jurassic)
-   version of July 13, 2017).
+   version of September 1, 2017).
 
    =============
    RELEASE NOTES
    =============
-   Jurassic was updated to version of July 13, 2017.
+   1. Added support of .NET Standard 2.0;
+   2. Jurassic was updated to version of September 1, 2017.
 
    =============
    DOCUMENTATION
diff --git a/lib/Jurassic/lib/net40-client/Jurassic.dll b/lib/Jurassic/lib/net40-client/Jurassic.dll
diff --git a/lib/Jurassic/lib/netstandard2.0/Jurassic.dll b/lib/Jurassic/lib/netstandard2.0/Jurassic.dll
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2/JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2.csproj b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2/JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2.csproj
@@ -34,6 +34,7 @@
 		<ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.ChakraCore\JavaScriptEngineSwitcher.ChakraCore.csproj" />
 		<ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.Extensions.MsDependencyInjection\JavaScriptEngineSwitcher.Extensions.MsDependencyInjection.csproj" />
 		<ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.Jint\JavaScriptEngineSwitcher.Jint.csproj" />
+		<ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.Jurassic\JavaScriptEngineSwitcher.Jurassic.csproj" />
 		<ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.Msie\JavaScriptEngineSwitcher.Msie.csproj" />
 		<ProjectReference Include="..\JavaScriptEngineSwitcher.Sample.Logic\JavaScriptEngineSwitcher.Sample.Logic.csproj" />
 		<ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.Vroom\JavaScriptEngineSwitcher.Vroom.csproj" />
diff --git a/samples/JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2/Startup.cs b/samples/JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2/Startup.cs
@@ -8,6 +8,7 @@
 using JavaScriptEngineSwitcher.ChakraCore;
 using JavaScriptEngineSwitcher.Extensions.MsDependencyInjection;
 using JavaScriptEngineSwitcher.Jint;
+using JavaScriptEngineSwitcher.Jurassic;
 using JavaScriptEngineSwitcher.Msie;
 using JavaScriptEngineSwitcher.Sample.Logic.Services;
 using JavaScriptEngineSwitcher.Vroom;
@@ -56,6 +57,7 @@ public void ConfigureServices(IServiceCollection services)
 			)
 				.AddChakraCore()
 				.AddJint()
+				.AddJurassic()
 				.AddMsie(options =>
 				{
 					options.EngineMode = JsEngineMode.ChakraIeJsRt;
diff --git a/samples/JavaScriptEngineSwitcher.Sample.Logic/JavaScriptEngineSwitcher.Sample.Logic.csproj b/samples/JavaScriptEngineSwitcher.Sample.Logic/JavaScriptEngineSwitcher.Sample.Logic.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<VersionPrefix>3.0.0</VersionPrefix>
 		<VersionSuffix>alpha2</VersionSuffix>
-		<TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
+		<TargetFrameworks>netstandard1.6;netstandard2.0;net451</TargetFrameworks>
 		<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>
 		<OutputType>Library</OutputType>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/samples/JavaScriptEngineSwitcher.Sample.Logic/Models/JsEvaluationViewModel.cs b/samples/JavaScriptEngineSwitcher.Sample.Logic/Models/JsEvaluationViewModel.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-#if NETSTANDARD1_6 || NET451
+#if NETSTANDARD1_6 || NETSTANDARD2_0 || NET451
 using Microsoft.AspNetCore.Mvc.Rendering;
 #elif NET40
 using System.Web.Mvc;
diff --git a/samples/JavaScriptEngineSwitcher.Sample.Logic/Services/FileContentService.cs b/samples/JavaScriptEngineSwitcher.Sample.Logic/Services/FileContentService.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 using System.IO;
-#if NETSTANDARD1_6 || NET451
+#if NETSTANDARD1_6 || NETSTANDARD2_0 || NET451
 using Microsoft.AspNetCore.Hosting;
 #elif NET40
 using System.Web;
@@ -15,12 +15,12 @@ namespace JavaScriptEngineSwitcher.Sample.Logic.Services
 	public sealed class FileContentService
 	{
 		private readonly string _textContentDirectoryPath;
-#if NETSTANDARD1_6 || NET451
+#if NETSTANDARD1_6 || NETSTANDARD2_0 || NET451
 		private readonly IHostingEnvironment _hostingEnvironment;
 #endif
 
 
-#if NETSTANDARD1_6 || NET451
+#if NETSTANDARD1_6 || NETSTANDARD2_0 || NET451
 		public FileContentService(
 			string textContentDirectoryPath,
 			IHostingEnvironment hostingEnvironment
@@ -76,7 +76,7 @@ public string GetFileContent(string filePath)
 
 		private string GetPhysicalFilePath(string filePath)
 		{
-#if NETSTANDARD1_6 || NET451
+#if NETSTANDARD1_6 || NETSTANDARD2_0 || NET451
 			string applicationDirectoryPath = _hostingEnvironment.ContentRootPath;
 #elif NET40
 			HttpContext context = HttpContext.Current;
diff --git a/samples/JavaScriptEngineSwitcher.Sample.Logic/Services/JsEvaluationService.cs b/samples/JavaScriptEngineSwitcher.Sample.Logic/Services/JsEvaluationService.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
-#if NETSTANDARD1_6 || NET451
+#if NETSTANDARD1_6 || NETSTANDARD2_0 || NET451
 using Microsoft.AspNetCore.Mvc.Rendering;
 #elif NET40
 using System.Web.Mvc;
diff --git a/samples/JavaScriptEngineSwitcher.Sample.Resources/JavaScriptEngineSwitcher.Sample.Resources.csproj b/samples/JavaScriptEngineSwitcher.Sample.Resources/JavaScriptEngineSwitcher.Sample.Resources.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<VersionPrefix>3.0.0</VersionPrefix>
 		<VersionSuffix>alpha2</VersionSuffix>
-		<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
+		<TargetFrameworks>netstandard1.3;netstandard2.0;net45</TargetFrameworks>
 		<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
 		<OutputType>Library</OutputType>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj b/src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<VersionPrefix>3.0.0</VersionPrefix>
 		<VersionSuffix>alpha2</VersionSuffix>
-		<TargetFramework>net45</TargetFramework>
+		<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
 		<OutputType>Library</OutputType>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
@@ -23,11 +23,21 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<ProjectReference Include="..\JavaScriptEngineSwitcher.Core\JavaScriptEngineSwitcher.Core.csproj" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+		<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
+
 		<Reference Include="Jurassic">
-			<HintPath>..\..\lib\Jurassic\lib\net40-client\Jurassic.dll</HintPath>
+			<HintPath>..\..\lib\Jurassic\lib\netstandard2.0\Jurassic.dll</HintPath>
 		</Reference>
+	</ItemGroup>
 
-		<ProjectReference Include="..\JavaScriptEngineSwitcher.Core\JavaScriptEngineSwitcher.Core.csproj" />
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+		<Reference Include="Jurassic">
+			<HintPath>..\..\lib\Jurassic\lib\net40-client\Jurassic.dll</HintPath>
+		</Reference>
 	</ItemGroup>
 
 </Project>
diff --git a/src/JavaScriptEngineSwitcher.Jurassic/JurassicJsEngine.cs b/src/JavaScriptEngineSwitcher.Jurassic/JurassicJsEngine.cs
@@ -32,7 +32,7 @@ public sealed class JurassicJsEngine : JsEngineBase
 		/// <summary>
 		/// Version of original JS engine
 		/// </summary>
-		private const string EngineVersion = "Jul 13, 2017";
+		private const string EngineVersion = "Sep 1, 2017";
 
 		/// <summary>
 		/// Jurassic JS engine
@@ -70,7 +70,9 @@ public JurassicJsEngine(JurassicSettings settings)
 			{
 				_jsEngine = new OriginalJsEngine
 				{
+#if !NETSTANDARD2_0
 					EnableDebugging = jurassicSettings.EnableDebugging,
+#endif
 					CompatibilityMode = OriginalCompatibilityMode.Latest,
 					EnableExposedClrTypes = true,
 					EnableILAnalysis = jurassicSettings.EnableIlAnalysis,
@@ -90,14 +92,18 @@ private string GetUniqueDocumentName(string documentName, bool isFile)
 		{
 			string uniqueDocumentName;
 
-			if (!_jsEngine.EnableDebugging)
+#if !NETSTANDARD2_0
+			if (_jsEngine.EnableDebugging)
 			{
-				uniqueDocumentName = _documentNameManager.GetUniqueName(documentName);
+				uniqueDocumentName = isFile ? documentName : null;
 			}
 			else
 			{
-				uniqueDocumentName = isFile ? documentName : null;
+#endif
+				uniqueDocumentName = _documentNameManager.GetUniqueName(documentName);
+#if !NETSTANDARD2_0
 			}
+#endif
 
 			return uniqueDocumentName;
 		}
diff --git a/src/JavaScriptEngineSwitcher.Jurassic/JurassicSettings.cs b/src/JavaScriptEngineSwitcher.Jurassic/JurassicSettings.cs
@@ -5,6 +5,7 @@
 	/// </summary>
 	public sealed class JurassicSettings
 	{
+#if !NETSTANDARD2_0
 		/// <summary>
 		/// Gets or sets a flag for whether to enable script debugging features
 		/// (allows a generation of debug information)
@@ -15,6 +16,7 @@ public bool EnableDebugging
 			set;
 		}
 
+#endif
 		/// <summary>
 		/// Gets or sets a flag for whether to disassemble any generated IL
 		/// and store it in the associated function
@@ -40,7 +42,9 @@ public bool StrictMode
 		/// </summary>
 		public JurassicSettings()
 		{
+#if !NETSTANDARD2_0
 			EnableDebugging = false;
+#endif
 			EnableIlAnalysis = false;
 			StrictMode = false;
 		}
diff --git a/test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj b/test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj
@@ -36,6 +36,8 @@
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
 		<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
+
+		<ProjectReference Include="..\..\src\JavaScriptEngineSwitcher.Jurassic\JavaScriptEngineSwitcher.Jurassic.csproj" />
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' Or '$(TargetFramework)' == 'netcoreapp2.0' ">
diff --git a/test/JavaScriptEngineSwitcher.Tests/JsEngineSwitcherInitializer.cs b/test/JavaScriptEngineSwitcher.Tests/JsEngineSwitcherInitializer.cs
@@ -3,8 +3,10 @@
 using JavaScriptEngineSwitcher.Jint;
 using JavaScriptEngineSwitcher.Msie;
 using JavaScriptEngineSwitcher.Vroom;
-#if !NETCOREAPP1_0 && !NETCOREAPP2_0
+#if !NETCOREAPP1_0
 using JavaScriptEngineSwitcher.Jurassic;
+#endif
+#if !NETCOREAPP1_0 && !NETCOREAPP2_0
 using JavaScriptEngineSwitcher.V8;
 #endif
 
@@ -27,8 +29,10 @@ public static void Initialize()
 						EngineMode = JsEngineMode.ChakraIeJsRt
 					})
 					.AddVroom()
-#if !NETCOREAPP1_0 && !NETCOREAPP2_0
+#if !NETCOREAPP1_0
 					.AddJurassic()
+#endif
+#if !NETCOREAPP1_0 && !NETCOREAPP2_0
 					.AddV8()
 #endif
 					;
diff --git a/test/JavaScriptEngineSwitcher.Tests/Jurassic/CommonTests.cs b/test/JavaScriptEngineSwitcher.Tests/Jurassic/CommonTests.cs
@@ -1,4 +1,4 @@
-﻿#if !NETCOREAPP1_0 && !NETCOREAPP2_0
+﻿#if !NETCOREAPP1_0
 using Xunit;
 
 using JavaScriptEngineSwitcher.Core;
diff --git a/test/JavaScriptEngineSwitcher.Tests/Jurassic/Es5Tests.cs b/test/JavaScriptEngineSwitcher.Tests/Jurassic/Es5Tests.cs
@@ -1,4 +1,4 @@
-﻿#if !NETCOREAPP1_0 && !NETCOREAPP2_0
+﻿#if !NETCOREAPP1_0
 using Xunit;
 
 namespace JavaScriptEngineSwitcher.Tests.Jurassic
diff --git a/test/JavaScriptEngineSwitcher.Tests/Jurassic/InteropTests.cs b/test/JavaScriptEngineSwitcher.Tests/Jurassic/InteropTests.cs
@@ -1,4 +1,4 @@
-﻿#if !NETCOREAPP1_0 && !NETCOREAPP2_0
+﻿#if !NETCOREAPP1_0
 namespace JavaScriptEngineSwitcher.Tests.Jurassic
 {
 	public class InteropTests : InteropTestsBase
