Skip to content

Commit 5504487

Browse files
TaritsynTaritsyn
committed
JavaScriptEngineSwitcher.Net4.sln and JavaScriptEngineSwitcher.DotNet.sln solutions have been combined into one solution - JavaScriptEngineSwitcher.sln 
1 parent 5c85d34 commit 5504487

File tree

43 files changed

+243
-1714
lines changed

Some content is hidden

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

43 files changed

+243
-1714
lines changed

‎JavaScriptEngineSwitcher.Net4.sln

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

‎JavaScriptEngineSwitcher.DotNet.sln renamed to ‎JavaScriptEngineSwitcher.sln

Lines changed: 9 additions & 2 deletions
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.26730.16
4+
VisualStudioVersion = 15.0.27004.2008
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{19575E10-6B8E-4CF0-B7D2-898FFF47E157}"
77
EndProject
@@ -47,11 +47,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sa
4747
EndProject
4848
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sample.Logic", "samples\JavaScriptEngineSwitcher.Sample.Logic\JavaScriptEngineSwitcher.Sample.Logic.csproj", "{C434E1B5-0463-4E58-8336-87F822D07B41}"
4949
EndProject
50+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4", "samples\JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4\JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4.csproj", "{8124DF18-4A0B-4648-8B90-4A6D3E4EF2F3}"
51+
EndProject
5052
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1\JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1.csproj", "{C790AD7F-55C6-4106-8D8C-8F901B7FF245}"
5153
EndProject
5254
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}"
5355
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}"
56+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2\JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2.csproj", "{0342791E-6390-4F97-9163-5CE02E4CFF07}"
5557
EndProject
5658
Global
5759
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -115,6 +117,10 @@ Global
115117
{0342791E-6390-4F97-9163-5CE02E4CFF07}.Debug|Any CPU.Build.0 = Debug|Any CPU
116118
{0342791E-6390-4F97-9163-5CE02E4CFF07}.Release|Any CPU.ActiveCfg = Release|Any CPU
117119
{0342791E-6390-4F97-9163-5CE02E4CFF07}.Release|Any CPU.Build.0 = Release|Any CPU
120+
{8124DF18-4A0B-4648-8B90-4A6D3E4EF2F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
121+
{8124DF18-4A0B-4648-8B90-4A6D3E4EF2F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
122+
{8124DF18-4A0B-4648-8B90-4A6D3E4EF2F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
123+
{8124DF18-4A0B-4648-8B90-4A6D3E4EF2F3}.Release|Any CPU.Build.0 = Release|Any CPU
118124
EndGlobalSection
119125
GlobalSection(SolutionProperties) = preSolution
120126
HideSolutionNode = FALSE
@@ -137,6 +143,7 @@ Global
137143
{C790AD7F-55C6-4106-8D8C-8F901B7FF245} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
138144
{5CA92021-B75A-40AF-B5AA-500BAF76B4D6} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
139145
{0342791E-6390-4F97-9163-5CE02E4CFF07} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
146+
{8124DF18-4A0B-4648-8B90-4A6D3E4EF2F3} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
140147
EndGlobalSection
141148
GlobalSection(ExtensibilityGlobals) = postSolution
142149
SolutionGuid = {8184BE59-ACBC-4CD1-9419-D59A0FAC6131}

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

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
set project_name=JavaScriptEngineSwitcher.ChakraCore
2-
set net4_project_source_dir=..\..\src\%project_name%.Net4
3-
set net4_project_bin_dir=%net4_project_source_dir%\bin\Release
4-
set dotnet_project_source_dir=..\..\src\%project_name%
5-
set dotnet_project_bin_dir=%dotnet_project_source_dir%\bin\Release
2+
set project_source_dir=..\..\src\%project_name%
3+
set project_bin_dir=%project_source_dir%\bin\Release
64
set licenses_dir=..\..\Licenses
75
set nuget_package_manager=..\..\.nuget\nuget.exe
86

@@ -13,26 +11,27 @@ rmdir lib /Q/S
1311
del chakra-samples-license.txt /Q/S
1412
del jsrt-dotnet-license.txt /Q/S
1513

16-
%net40_msbuild% "%net4_project_source_dir%\%project_name%.Net40.csproj" /p:Configuration=Release
17-
xcopy "%net4_project_bin_dir%\%project_name%.dll" lib\net40-client\
18-
xcopy "%net4_project_bin_dir%\ru-ru\%project_name%.resources.dll" lib\net40-client\ru-ru\
14+
%dotnet_cli% restore "%project_source_dir%"
1915

20-
%dotnet_cli% restore "%dotnet_project_source_dir%"
16+
%dotnet_cli% build "%project_source_dir%" --framework net40-client --configuration Release --no-dependencies --no-incremental
17+
xcopy "%project_bin_dir%\net40-client\%project_name%.dll" lib\net40-client\
18+
xcopy "%project_bin_dir%\net40-client\%project_name%.xml" lib\net40-client\
19+
xcopy "%project_bin_dir%\net40-client\ru-ru\%project_name%.resources.dll" lib\net40-client\ru-ru\
2120

22-
%dotnet_cli% build "%dotnet_project_source_dir%" --framework net45 --configuration Release --no-dependencies --no-incremental
23-
xcopy "%dotnet_project_bin_dir%\net45\%project_name%.dll" lib\net45\
24-
xcopy "%dotnet_project_bin_dir%\net45\%project_name%.xml" lib\net45\
25-
xcopy "%dotnet_project_bin_dir%\net45\ru-ru\%project_name%.resources.dll" lib\net45\ru-ru\
21+
%dotnet_cli% build "%project_source_dir%" --framework net45 --configuration Release --no-dependencies --no-incremental
22+
xcopy "%project_bin_dir%\net45\%project_name%.dll" lib\net45\
23+
xcopy "%project_bin_dir%\net45\%project_name%.xml" lib\net45\
24+
xcopy "%project_bin_dir%\net45\ru-ru\%project_name%.resources.dll" lib\net45\ru-ru\
2625

27-
%dotnet_cli% build "%dotnet_project_source_dir%" --framework netstandard1.3 --configuration Release --no-dependencies --no-incremental
28-
xcopy "%dotnet_project_bin_dir%\netstandard1.3\%project_name%.dll" lib\netstandard1.3\
29-
xcopy "%dotnet_project_bin_dir%\netstandard1.3\%project_name%.xml" lib\netstandard1.3\
30-
xcopy "%dotnet_project_bin_dir%\netstandard1.3\ru-ru\%project_name%.resources.dll" lib\netstandard1.3\ru-ru\
26+
%dotnet_cli% build "%project_source_dir%" --framework netstandard1.3 --configuration Release --no-dependencies --no-incremental
27+
xcopy "%project_bin_dir%\netstandard1.3\%project_name%.dll" lib\netstandard1.3\
28+
xcopy "%project_bin_dir%\netstandard1.3\%project_name%.xml" lib\netstandard1.3\
29+
xcopy "%project_bin_dir%\netstandard1.3\ru-ru\%project_name%.resources.dll" lib\netstandard1.3\ru-ru\
3130

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\
31+
%dotnet_cli% build "%project_source_dir%" --framework netstandard2.0 --configuration Release --no-dependencies --no-incremental
32+
xcopy "%project_bin_dir%\netstandard2.0\%project_name%.dll" lib\netstandard2.0\
33+
xcopy "%project_bin_dir%\netstandard2.0\%project_name%.xml" lib\netstandard2.0\
34+
xcopy "%project_bin_dir%\netstandard2.0\ru-ru\%project_name%.resources.dll" lib\netstandard2.0\ru-ru\
3635

3736
copy "%licenses_dir%\chakra-samples-license.txt" chakra-samples-license.txt /Y
3837
copy "%licenses_dir%\jsrt-dotnet-license.txt" jsrt-dotnet-license.txt /Y

0 commit comments

Comments
 (0)