Skip to content

Commit c687c67

Browse files
TaritsynTaritsyn
committed
.NET 4.0 projects have been moved into separate directories
1 parent 40cb4da commit c687c67

File tree

31 files changed

+645
-331
lines changed

31 files changed

+645
-331
lines changed

‎MsieJavaScriptEngine.Net4.sln‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedFiles", "SharedFiles"
1818
test\SharedFiles\square.js = test\SharedFiles\square.js
1919
EndProjectSection
2020
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Net40", "src\MsieJavaScriptEngine\MsieJavaScriptEngine.Net40.csproj", "{D672BC49-C454-4975-BD25-A555B9BDD793}"
21+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Net40", "src\MsieJavaScriptEngine.Net4\MsieJavaScriptEngine.Net40.csproj", "{D672BC49-C454-4975-BD25-A555B9BDD793}"
2222
EndProject
23-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Test.Common.Net40", "test\MsieJavaScriptEngine.Test.Common\MsieJavaScriptEngine.Test.Common.Net40.csproj", "{A4085B9E-A5D3-4749-BD07-6D1EB7C23820}"
23+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Test.Common.Net40", "test\MsieJavaScriptEngine.Test.Common.Net4\MsieJavaScriptEngine.Test.Common.Net40.csproj", "{A4085B9E-A5D3-4749-BD07-6D1EB7C23820}"
2424
EndProject
25-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Test.Auto.Net40", "test\MsieJavaScriptEngine.Test.Auto\MsieJavaScriptEngine.Test.Auto.Net40.csproj", "{A4874C43-2097-4FDB-882A-0D74E5508BBD}"
25+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Test.Auto.Net40", "test\MsieJavaScriptEngine.Test.Auto.Net4\MsieJavaScriptEngine.Test.Auto.Net40.csproj", "{A4874C43-2097-4FDB-882A-0D74E5508BBD}"
2626
EndProject
27-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Test.ChakraEdgeJsRt.Net40", "test\MsieJavaScriptEngine.Test.ChakraEdgeJsRt\MsieJavaScriptEngine.Test.ChakraEdgeJsRt.Net40.csproj", "{16DBAC89-4FFB-40AC-B437-FE5C8D6B6731}"
27+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Test.ChakraEdgeJsRt.Net40", "test\MsieJavaScriptEngine.Test.ChakraEdgeJsRt.Net4\MsieJavaScriptEngine.Test.ChakraEdgeJsRt.Net40.csproj", "{16DBAC89-4FFB-40AC-B437-FE5C8D6B6731}"
2828
EndProject
29-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Test.ChakraIeJsRt.Net40", "test\MsieJavaScriptEngine.Test.ChakraIeJsRt\MsieJavaScriptEngine.Test.ChakraIeJsRt.Net40.csproj", "{7064E0DB-0B73-4534-84D0-1C96DA7E5AD1}"
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Test.ChakraIeJsRt.Net40", "test\MsieJavaScriptEngine.Test.ChakraIeJsRt.Net4\MsieJavaScriptEngine.Test.ChakraIeJsRt.Net40.csproj", "{7064E0DB-0B73-4534-84D0-1C96DA7E5AD1}"
3030
EndProject
31-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Test.ChakraActiveScript.Net40", "test\MsieJavaScriptEngine.Test.ChakraActiveScript\MsieJavaScriptEngine.Test.ChakraActiveScript.Net40.csproj", "{21EA96CC-71E2-4CDD-B95A-C75EBD4AF2FA}"
31+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Test.ChakraActiveScript.Net40", "test\MsieJavaScriptEngine.Test.ChakraActiveScript.Net4\MsieJavaScriptEngine.Test.ChakraActiveScript.Net40.csproj", "{21EA96CC-71E2-4CDD-B95A-C75EBD4AF2FA}"
3232
EndProject
33-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Test.Classic.Net40", "test\MsieJavaScriptEngine.Test.Classic\MsieJavaScriptEngine.Test.Classic.Net40.csproj", "{50453B82-ACBF-4E25-9582-1113F274D53E}"
33+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsieJavaScriptEngine.Test.Classic.Net40", "test\MsieJavaScriptEngine.Test.Classic.Net4\MsieJavaScriptEngine.Test.Classic.Net40.csproj", "{50453B82-ACBF-4E25-9582-1113F274D53E}"
3434
EndProject
3535
Global
3636
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎NuGet/build-package.cmd‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
set project_name=MsieJavaScriptEngine
2-
set project_source_dir=..\src\%project_name%
3-
set project_bin_dir=%project_source_dir%\bin\Release
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=%project_source_dir%\bin\Release
46
set licenses_dir=..\Licenses
57
set net40_msbuild="\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
68
set dotnet_cli="%ProgramFiles%\dotnet\dotnet.exe"
@@ -14,19 +16,19 @@ del jsrt-dotnet-license.txt /Q/S
1416
del cross-browser-split-license.txt /Q/S
1517
del bundler-and-minifier-license.txt /Q/S
1618

17-
%net40_msbuild% "%project_source_dir%\%project_name%.Net40.csproj" /p:Configuration=Release
18-
xcopy "%project_bin_dir%\%project_name%.dll" lib\net40-client\
19-
xcopy "%project_bin_dir%\ru-ru\%project_name%.resources.dll" lib\net40-client\ru-ru\
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\
2022

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

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\
28+
%dotnet_cli% build "%dotnet_project_source_dir%" --framework netstandard1.3 --configuration Release --no-dependencies --no-incremental
29+
xcopy "%dotnet_project_bin_dir%\netstandard1.3\%project_name%.dll" lib\netstandard1.3\
30+
xcopy "%dotnet_project_bin_dir%\netstandard1.3\%project_name%.xml" lib\netstandard1.3\
31+
xcopy "%dotnet_project_bin_dir%\netstandard1.3\ru-ru\%project_name%.resources.dll" lib\netstandard1.3\ru-ru\
3032

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

‎makefile.shade‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ use-standard-lifecycle
7474

7575
Log.Info('Run unit tests for .NET 4.0 version:');
7676
Log.Info('');
77-
Exec(nunitConsolePath, 'MsieJavaScriptEngine.Test.nunit --verbose', testDirPath);
77+
Exec(nunitConsolePath, 'MsieJavaScriptEngine.Test.Net4.nunit --verbose', testDirPath);
7878
Log.Info('');
7979
}
8080

0 commit comments

Comments
 (0)