Skip to content

Commit d682113

Browse files
TaritsynTaritsyn
committed
In JavaScriptEngineSwitcher.Jurassic added support of .NET Framework 4.5.2
1 parent 8887db5 commit d682113

File tree

12 files changed

+149
-15
lines changed

12 files changed

+149
-15
lines changed

‎JavaScriptEngineSwitcher.DotNet.sln

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
44
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "precompiled", "precompiled", "{D36F06D5-6CE7-4295-B035-513A99013A26}"
7+
EndProject
68
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0C281F46-F1D2-4A1C-8560-375EDA65D680}"
79
EndProject
810
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{53B43213-2E66-42C2-8476-600A2FD2DA75}"
911
EndProject
12+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JurassicPrecompiled", "precompiled\JurassicPrecompiled\JurassicPrecompiled.xproj", "{6108205A-FDC7-4B5B-AB57-33E03B2E418A}"
13+
EndProject
1014
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JavaScriptEngineSwitcher.Core", "src\JavaScriptEngineSwitcher.Core\JavaScriptEngineSwitcher.Core.xproj", "{13559975-F99D-4B93-BF46-227C0B6E0DFB}"
1115
EndProject
1216
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JavaScriptEngineSwitcher.Msie", "src\JavaScriptEngineSwitcher.Msie\JavaScriptEngineSwitcher.Msie.xproj", "{B3C4AA95-2227-47DD-B58C-22FA589CB28D}"
1317
EndProject
18+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JavaScriptEngineSwitcher.Jurassic", "src\JavaScriptEngineSwitcher.Jurassic\JavaScriptEngineSwitcher.Jurassic.xproj", "{D31B5A77-8018-4D76-B372-325564385B2D}"
19+
EndProject
1420
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JavaScriptEngineSwitcher.Jint", "src\JavaScriptEngineSwitcher.Jint\JavaScriptEngineSwitcher.Jint.xproj", "{22D73C6E-5F35-497B-A93B-F9EAAAE4DDAA}"
1521
EndProject
1622
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JavaScriptEngineSwitcher.ChakraCore", "src\JavaScriptEngineSwitcher.ChakraCore\JavaScriptEngineSwitcher.ChakraCore.xproj", "{2EFFFC6B-E642-477F-B537-4241EBD93410}"
@@ -27,31 +33,41 @@ Global
2733
{13559975-F99D-4B93-BF46-227C0B6E0DFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
2834
{13559975-F99D-4B93-BF46-227C0B6E0DFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
2935
{13559975-F99D-4B93-BF46-227C0B6E0DFB}.Release|Any CPU.Build.0 = Release|Any CPU
30-
{2EFFFC6B-E642-477F-B537-4241EBD93410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31-
{2EFFFC6B-E642-477F-B537-4241EBD93410}.Debug|Any CPU.Build.0 = Debug|Any CPU
32-
{2EFFFC6B-E642-477F-B537-4241EBD93410}.Release|Any CPU.ActiveCfg = Release|Any CPU
33-
{2EFFFC6B-E642-477F-B537-4241EBD93410}.Release|Any CPU.Build.0 = Release|Any CPU
34-
{22D73C6E-5F35-497B-A93B-F9EAAAE4DDAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35-
{22D73C6E-5F35-497B-A93B-F9EAAAE4DDAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
36-
{22D73C6E-5F35-497B-A93B-F9EAAAE4DDAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
37-
{22D73C6E-5F35-497B-A93B-F9EAAAE4DDAA}.Release|Any CPU.Build.0 = Release|Any CPU
3836
{B3C4AA95-2227-47DD-B58C-22FA589CB28D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3937
{B3C4AA95-2227-47DD-B58C-22FA589CB28D}.Debug|Any CPU.Build.0 = Debug|Any CPU
4038
{B3C4AA95-2227-47DD-B58C-22FA589CB28D}.Release|Any CPU.ActiveCfg = Release|Any CPU
4139
{B3C4AA95-2227-47DD-B58C-22FA589CB28D}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{22D73C6E-5F35-497B-A93B-F9EAAAE4DDAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{22D73C6E-5F35-497B-A93B-F9EAAAE4DDAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{22D73C6E-5F35-497B-A93B-F9EAAAE4DDAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{22D73C6E-5F35-497B-A93B-F9EAAAE4DDAA}.Release|Any CPU.Build.0 = Release|Any CPU
44+
{2EFFFC6B-E642-477F-B537-4241EBD93410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45+
{2EFFFC6B-E642-477F-B537-4241EBD93410}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{2EFFFC6B-E642-477F-B537-4241EBD93410}.Release|Any CPU.ActiveCfg = Release|Any CPU
47+
{2EFFFC6B-E642-477F-B537-4241EBD93410}.Release|Any CPU.Build.0 = Release|Any CPU
4248
{E95FDEF6-18A0-4E26-8FDF-B4B590E6EDAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4349
{E95FDEF6-18A0-4E26-8FDF-B4B590E6EDAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
4450
{E95FDEF6-18A0-4E26-8FDF-B4B590E6EDAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
4551
{E95FDEF6-18A0-4E26-8FDF-B4B590E6EDAF}.Release|Any CPU.Build.0 = Release|Any CPU
52+
{D31B5A77-8018-4D76-B372-325564385B2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53+
{D31B5A77-8018-4D76-B372-325564385B2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
54+
{D31B5A77-8018-4D76-B372-325564385B2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
55+
{D31B5A77-8018-4D76-B372-325564385B2D}.Release|Any CPU.Build.0 = Release|Any CPU
56+
{6108205A-FDC7-4B5B-AB57-33E03B2E418A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
57+
{6108205A-FDC7-4B5B-AB57-33E03B2E418A}.Debug|Any CPU.Build.0 = Debug|Any CPU
58+
{6108205A-FDC7-4B5B-AB57-33E03B2E418A}.Release|Any CPU.ActiveCfg = Release|Any CPU
59+
{6108205A-FDC7-4B5B-AB57-33E03B2E418A}.Release|Any CPU.Build.0 = Release|Any CPU
4660
EndGlobalSection
4761
GlobalSection(SolutionProperties) = preSolution
4862
HideSolutionNode = FALSE
4963
EndGlobalSection
5064
GlobalSection(NestedProjects) = preSolution
5165
{13559975-F99D-4B93-BF46-227C0B6E0DFB} = {0C281F46-F1D2-4A1C-8560-375EDA65D680}
52-
{2EFFFC6B-E642-477F-B537-4241EBD93410} = {0C281F46-F1D2-4A1C-8560-375EDA65D680}
53-
{22D73C6E-5F35-497B-A93B-F9EAAAE4DDAA} = {0C281F46-F1D2-4A1C-8560-375EDA65D680}
5466
{B3C4AA95-2227-47DD-B58C-22FA589CB28D} = {0C281F46-F1D2-4A1C-8560-375EDA65D680}
67+
{22D73C6E-5F35-497B-A93B-F9EAAAE4DDAA} = {0C281F46-F1D2-4A1C-8560-375EDA65D680}
68+
{2EFFFC6B-E642-477F-B537-4241EBD93410} = {0C281F46-F1D2-4A1C-8560-375EDA65D680}
5569
{E95FDEF6-18A0-4E26-8FDF-B4B590E6EDAF} = {53B43213-2E66-42C2-8476-600A2FD2DA75}
70+
{D31B5A77-8018-4D76-B372-325564385B2D} = {0C281F46-F1D2-4A1C-8560-375EDA65D680}
71+
{6108205A-FDC7-4B5B-AB57-33E03B2E418A} = {D36F06D5-6CE7-4295-B035-513A99013A26}
5672
EndGlobalSection
5773
EndGlobal

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
<group targetFramework=".NETFramework4.0-Client">
2121
<dependency id="JavaScriptEngineSwitcher.Core" version="2.0.0-alpha1" />
2222
</group>
23+
<group targetFramework=".NETFramework4.5.2">
24+
<dependency id="JavaScriptEngineSwitcher.Core" version="2.0.0-alpha1" />
25+
</group>
2326
</dependencies>
2427
<references>
2528
<reference file="JavaScriptEngineSwitcher.Jurassic.dll" />

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ xcopy "%project_bin_dir%\%project_name%.dll" lib\net40-client\
1515
xcopy "%project_bin_dir%\ru-ru\%project_name%.resources.dll" lib\net40-client\ru-ru\
1616
xcopy "%binaries_dir%\Jurassic.dll" lib\net40-client\
1717

18+
%dotnet_cli% build "%project_source_dir%" --framework net452 --configuration Release --no-dependencies --no-incremental
19+
xcopy "%project_bin_dir%\net452\%project_name%.dll" lib\net452\
20+
xcopy "%project_bin_dir%\net452\%project_name%.xml" lib\net452\
21+
xcopy "%project_bin_dir%\net452\ru-ru\%project_name%.resources.dll" lib\net452\ru-ru\
22+
xcopy "%binaries_dir%\Jurassic.dll" lib\net452\
23+
1824
copy "%licenses_dir%\jurassic-license.txt" jurassic-license.txt /Y
1925

2026
%nuget_package_manager% pack "..\%project_name%\%project_name%.nuspec"

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"projects": [ "src", "test" ],
2+
"projects": [ "precompiled", "src", "test" ],
33
"sdk": {
44
"version": "1.0.0-preview2-003121"
55
}

‎precompiled/JurassicPrecompiled/JurassicPrecompiled.xproj

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
8+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
9+
<PropertyGroup Label="Globals">
10+
<ProjectGuid>6108205a-fdc7-4b5b-ab57-33e03b2e418a</ProjectGuid>
11+
<RootNamespace>JurassicPrecompiled</RootNamespace>
12+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
13+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
14+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
15+
</PropertyGroup>
16+
17+
<PropertyGroup>
18+
<SchemaVersion>2.0</SchemaVersion>
19+
</PropertyGroup>
20+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
21+
</Project>

‎precompiled/JurassicPrecompiled/Properties/AssemblyInfo.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
using System.Reflection;
2+
using System.Runtime.InteropServices;
3+
4+
[assembly: AssemblyTitle("JurassicPrecompiled")]
5+
[assembly: AssemblyDescription("")]
6+
[assembly: AssemblyConfiguration("")]
7+
[assembly: AssemblyCompany("Paul Bartrum")]
8+
[assembly: AssemblyProduct("Jurassic Precompiled")]
9+
[assembly: AssemblyCopyright("Copyright © Paul Bartrum 2016")]
10+
[assembly: AssemblyTrademark("")]
11+
[assembly: AssemblyCulture("")]
12+
13+
[assembly: ComVisible(false)]
14+
[assembly: Guid("1e4eb77e-0771-4109-832f-20e3475315ed")]
15+
16+
[assembly: AssemblyVersion("2016.7.15.0")]
17+
[assembly: AssemblyFileVersion("2016.7.15.0")]

‎precompiled/JurassicPrecompiled/project.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"version": "2016.7.15",
3+
4+
"frameworks": {
5+
"net452": {
6+
"bin": {
7+
"assembly": "../../Binaries/Jurassic/Jurassic.dll"
8+
}
9+
}
10+
}
11+
}

‎src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.xproj

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
8+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
9+
<PropertyGroup Label="Globals">
10+
<ProjectGuid>d31b5a77-8018-4d76-b372-325564385b2d</ProjectGuid>
11+
<RootNamespace>JavaScriptEngineSwitcher.Jurassic</RootNamespace>
12+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
13+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
14+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
15+
</PropertyGroup>
16+
17+
<PropertyGroup>
18+
<SchemaVersion>2.0</SchemaVersion>
19+
</PropertyGroup>
20+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
21+
</Project>

‎src/JavaScriptEngineSwitcher.Jurassic/project.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"version": "2.0.0-alpha1",
3+
4+
"dependencies": {
5+
"JurassicPrecompiled": "2016.7.15",
6+
"JavaScriptEngineSwitcher.Core": "2.0.0-alpha1"
7+
},
8+
9+
"frameworks": {
10+
"net452": {}
11+
},
12+
13+
"buildOptions": {
14+
"warningsAsErrors": true,
15+
"keyFile": "../../tools/Key.snk",
16+
"nowarn": [
17+
"CS1591"
18+
],
19+
"xmlDoc": true
20+
}
21+
}

‎test/JavaScriptEngineSwitcher.Tests/JsEngineSwitcherInitializer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
using JavaScriptEngineSwitcher.Core;
33
#if !NETCOREAPP1_0
44
using JavaScriptEngineSwitcher.Jint;
5+
using JavaScriptEngineSwitcher.Jurassic;
56
using JavaScriptEngineSwitcher.Msie;
67
#endif
78
#if NET40
8-
using JavaScriptEngineSwitcher.Jurassic;
99
using JavaScriptEngineSwitcher.V8;
1010
#endif
1111

@@ -29,10 +29,10 @@ public static void Initialize()
2929
.AddChakraCore()
3030
#if !NETCOREAPP1_0
3131
.AddJint()
32+
.AddJurassic()
3233
.AddMsie()
3334
#endif
3435
#if NET40
35-
.AddJurassic()
3636
.AddV8()
3737
#endif
3838
;

0 commit comments

Comments
 (0)