Skip to content

Commit 50e46e0

Browse files
committed
MsieJavaScriptEngine.Net4.sln and MsieJavaScriptEngine.DotNet.sln solutions have been combined into one solution - MsieJavaScriptEngine.sln
1 parent ab224d5 commit 50e46e0

File tree

39 files changed

+151
-1462
lines changed

39 files changed

+151
-1462
lines changed

MsieJavaScriptEngine.Net4.sln

-83
This file was deleted.
File renamed without changes.

NuGet/build-package.cmd

+15-17
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
set project_name=MsieJavaScriptEngine
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
7-
set net40_msbuild="\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
85
set dotnet_cli="%ProgramFiles%\dotnet\dotnet.exe"
96
set nuget_package_manager=..\.nuget\nuget.exe
107

@@ -16,21 +13,22 @@ del jsrt-dotnet-license.txt /Q/S
1613
del cross-browser-split-license.txt /Q/S
1714
del bundler-and-minifier-license.txt /Q/S
1815

19-
%net40_msbuild% "%net4_project_source_dir%\%project_name%.Net40.csproj" /p:Configuration=Release
20-
xcopy "%net4_project_bin_dir%\%project_name%.dll" lib\net40-client\
21-
xcopy "%net4_project_bin_dir%\ru-ru\%project_name%.resources.dll" lib\net40-client\ru-ru\
16+
%dotnet_cli% restore "%project_source_dir%"
2217

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

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

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

3533
copy "%licenses_dir%\sass-and-coffee-license.txt" sass-and-coffee-license.txt /Y
3634
copy "%licenses_dir%\chakra-host-license.txt" chakra-host-license.txt /Y

0 commit comments

Comments
 (0)