Skip to content

Commit b5e71ff

Browse files
TaritsynTaritsyn
committed
In JavaScriptEngineSwitcher.Core, JavaScriptEngineSwitcher.Extensions.MsDependencyInjection, JavaScriptEngineSwitcher.Msie, JavaScriptEngineSwitcher.Jint, JavaScriptEngineSwitcher.ChakraCore and JavaScriptEngineSwitcher.Vroom added support of .NET Standard 2.0
1 parent e63d2ee commit b5e71ff

File tree

100 files changed

+3070
-72
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+3070
-72
lines changed

‎.nuget/NuGet.exe

1 MB
Binary file not shown.

‎JavaScriptEngineSwitcher.DotNet.sln

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.4
4+
VisualStudioVersion = 15.0.26730.16
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{19575E10-6B8E-4CF0-B7D2-898FFF47E157}"
77
EndProject
@@ -51,6 +51,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sa
5151
EndProject
5252
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1\JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1.csproj", "{5CA92021-B75A-40AF-B5AA-500BAF76B4D6}"
5353
EndProject
54+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2\JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2.csproj", "{0342791E-6390-4F97-9163-5CE02E4CFF07}"
55+
EndProject
5456
Global
5557
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5658
Debug|Any CPU = Debug|Any CPU
@@ -109,6 +111,10 @@ Global
109111
{5CA92021-B75A-40AF-B5AA-500BAF76B4D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
110112
{5CA92021-B75A-40AF-B5AA-500BAF76B4D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
111113
{5CA92021-B75A-40AF-B5AA-500BAF76B4D6}.Release|Any CPU.Build.0 = Release|Any CPU
114+
{0342791E-6390-4F97-9163-5CE02E4CFF07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
115+
{0342791E-6390-4F97-9163-5CE02E4CFF07}.Debug|Any CPU.Build.0 = Debug|Any CPU
116+
{0342791E-6390-4F97-9163-5CE02E4CFF07}.Release|Any CPU.ActiveCfg = Release|Any CPU
117+
{0342791E-6390-4F97-9163-5CE02E4CFF07}.Release|Any CPU.Build.0 = Release|Any CPU
112118
EndGlobalSection
113119
GlobalSection(SolutionProperties) = preSolution
114120
HideSolutionNode = FALSE
@@ -130,5 +136,9 @@ Global
130136
{C434E1B5-0463-4E58-8336-87F822D07B41} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
131137
{C790AD7F-55C6-4106-8D8C-8F901B7FF245} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
132138
{5CA92021-B75A-40AF-B5AA-500BAF76B4D6} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
139+
{0342791E-6390-4F97-9163-5CE02E4CFF07} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
140+
EndGlobalSection
141+
GlobalSection(ExtensibilityGlobals) = postSolution
142+
SolutionGuid = {8184BE59-ACBC-4CD1-9419-D59A0FAC6131}
133143
EndGlobalSection
134144
EndGlobal

‎NuGet/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.nuspec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This package does not contain the native implementations of ChakraCore. Therefor
2020
* JavaScriptEngineSwitcher.ChakraCore.Native.debian-x64
2121
* JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64</description>
2222
<summary>JavaScriptEngineSwitcher.ChakraCore contains adapter `ChakraCoreJsEngine` (wrapper for the ChakraCore).</summary>
23-
<releaseNotes>Prevented an occurrence of the “Host may not have set any promise continuation callback. Promises may not be executed.” error.</releaseNotes>
23+
<releaseNotes>Added support of .NET Standard 2.0.</releaseNotes>
2424
<copyright>Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
2525
<language>en-US</language>
2626
<tags>JavaScriptEngineSwitcher JavaScript ECMAScript ChakraCore</tags>
@@ -37,6 +37,9 @@ This package does not contain the native implementations of ChakraCore. Therefor
3737
<dependency id="System.Threading.Thread" version="4.0.0" />
3838
<dependency id="JavaScriptEngineSwitcher.Core" version="3.0.0-alpha2" />
3939
</group>
40+
<group targetFramework=".NETStandard2.0">
41+
<dependency id="JavaScriptEngineSwitcher.Core" version="3.0.0-alpha2" />
42+
</group>
4043
</dependencies>
4144
<references>
4245
<reference file="JavaScriptEngineSwitcher.ChakraCore.dll" />

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ xcopy "%dotnet_project_bin_dir%\netstandard1.3\%project_name%.dll" lib\netstanda
2929
xcopy "%dotnet_project_bin_dir%\netstandard1.3\%project_name%.xml" lib\netstandard1.3\
3030
xcopy "%dotnet_project_bin_dir%\netstandard1.3\ru-ru\%project_name%.resources.dll" lib\netstandard1.3\ru-ru\
3131

32+
%dotnet_cli% build "%dotnet_project_source_dir%" --framework netstandard2.0 --configuration Release --no-dependencies --no-incremental
33+
xcopy "%dotnet_project_bin_dir%\netstandard2.0\%project_name%.dll" lib\netstandard2.0\
34+
xcopy "%dotnet_project_bin_dir%\netstandard2.0\%project_name%.xml" lib\netstandard2.0\
35+
xcopy "%dotnet_project_bin_dir%\netstandard2.0\ru-ru\%project_name%.resources.dll" lib\netstandard2.0\ru-ru\
36+
3237
copy "%licenses_dir%\chakra-samples-license.txt" chakra-samples-license.txt /Y
3338
copy "%licenses_dir%\jsrt-dotnet-license.txt" jsrt-dotnet-license.txt /Y
3439

‎NuGet/JavaScriptEngineSwitcher.ChakraCore/readme.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
=============
3131
RELEASE NOTES
3232
=============
33-
Prevented an occurrence of the “Host may not have set any promise continuation
34-
callback. Promises may not be executed.” error.
33+
Added support of .NET Standard 2.0.
3534

3635
=============
3736
DOCUMENTATION

‎NuGet/JavaScriptEngineSwitcher.Core/JavaScriptEngineSwitcher.Core.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>JavaScript Engine Switcher determines unified interface for access to the basic features of popular JavaScript engines (MSIE JavaScript Engine for .Net, Microsoft ClearScript.V8, Jurassic, Jint and ChakraCore). This library allows you to quickly and easily switch to using of another JavaScript engine.</description>
1414
<summary>JavaScript Engine Switcher determines unified interface for access to the basic features of popular JavaScript engines (MSIE JavaScript Engine for .Net, Microsoft ClearScript.V8, Jurassic, Jint and ChakraCore).</summary>
15-
<releaseNotes>1. In `JsEngineSwitcher` class `Instance` property was renamed to the `Current` property;
16-
2. Now you can implement your own version of the `JsEngineSwitcher` class.</releaseNotes>
15+
<releaseNotes>Added support of .NET Standard 2.0.</releaseNotes>
1716
<copyright>Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
1817
<language>en-US</language>
1918
<tags>JavaScriptEngineSwitcher JavaScript ECMAScript</tags>
@@ -24,6 +23,7 @@
2423
<dependency id="NETStandard.Library" version="1.6.0" />
2524
<dependency id="System.ComponentModel.TypeConverter" version="4.1.0" />
2625
</group>
26+
<group targetFramework=".NETStandard2.0" />
2727
</dependencies>
2828
<references>
2929
<reference file="JavaScriptEngineSwitcher.Core.dll" />

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,9 @@ xcopy "%dotnet_project_bin_dir%\netstandard1.3\%project_name%.dll" lib\netstanda
2525
xcopy "%dotnet_project_bin_dir%\netstandard1.3\%project_name%.xml" lib\netstandard1.3\
2626
xcopy "%dotnet_project_bin_dir%\netstandard1.3\ru-ru\%project_name%.resources.dll" lib\netstandard1.3\ru-ru\
2727

28+
%dotnet_cli% build "%dotnet_project_source_dir%" --framework netstandard2.0 --configuration Release --no-dependencies --no-incremental
29+
xcopy "%dotnet_project_bin_dir%\netstandard2.0\%project_name%.dll" lib\netstandard2.0\
30+
xcopy "%dotnet_project_bin_dir%\netstandard2.0\%project_name%.xml" lib\netstandard2.0\
31+
xcopy "%dotnet_project_bin_dir%\netstandard2.0\ru-ru\%project_name%.resources.dll" lib\netstandard2.0\ru-ru\
32+
2833
%nuget_package_manager% pack "..\%project_name%\%project_name%.nuspec"

‎NuGet/JavaScriptEngineSwitcher.Core/readme.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
=============
2020
RELEASE NOTES
2121
=============
22-
1. In `JsEngineSwitcher` class `Instance` property was renamed to the `Current`
23-
property;
24-
2. Now you can implement your own version of the `JsEngineSwitcher` class.
22+
Added support of .NET Standard 2.0.
2523

2624
=============
2725
DOCUMENTATION

‎NuGet/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection.nuspec

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>JavaScriptEngineSwitcher.Extensions.MsDependencyInjection contains extension methods for adding the JS engine switcher in an `IServiceCollection`.</description>
1414
<summary>JavaScriptEngineSwitcher.Extensions.MsDependencyInjection contains extension methods for adding the JS engine switcher in an `IServiceCollection`.</summary>
15+
<releaseNotes>Added support of .NET Standard 2.0.</releaseNotes>
1516
<copyright>Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
1617
<language>en-US</language>
1718
<tags>JavaScriptEngineSwitcher JavaScript ECMAScript DI</tags>
@@ -25,6 +26,10 @@
2526
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.2" />
2627
<dependency id="JavaScriptEngineSwitcher.Core" version="3.0.0-alpha2" />
2728
</group>
29+
<group targetFramework=".NETStandard2.0">
30+
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" />
31+
<dependency id="JavaScriptEngineSwitcher.Core" version="3.0.0-alpha2" />
32+
</group>
2833
</dependencies>
2934
<frameworkAssemblies>
3035
<frameworkAssembly assemblyName="System.Runtime" targetFramework=".NETFramework4.5" />

‎NuGet/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection/build-package.cmd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,9 @@ xcopy "%dotnet_project_bin_dir%\netstandard1.3\%project_name%.dll" lib\netstanda
1919
xcopy "%dotnet_project_bin_dir%\netstandard1.3\%project_name%.xml" lib\netstandard1.3\
2020
xcopy "%dotnet_project_bin_dir%\netstandard1.3\ru-ru\%project_name%.resources.dll" lib\netstandard1.3\ru-ru\
2121

22+
%dotnet_cli% build "%dotnet_project_source_dir%" --framework netstandard2.0 --configuration Release --no-dependencies --no-incremental
23+
xcopy "%dotnet_project_bin_dir%\netstandard2.0\%project_name%.dll" lib\netstandard2.0\
24+
xcopy "%dotnet_project_bin_dir%\netstandard2.0\%project_name%.xml" lib\netstandard2.0\
25+
xcopy "%dotnet_project_bin_dir%\netstandard2.0\ru-ru\%project_name%.resources.dll" lib\netstandard2.0\ru-ru\
26+
2227
%nuget_package_manager% pack "..\%project_name%\%project_name%.nuspec"

0 commit comments

Comments
 (0)