Skip to content

Commit c12b3e7

Browse files
ClearScript 7.0: Added .NET 5.0 targets; unified target-specific code via system packages; converted .NET Framework projects to SDK-style; added support for future runtimes; cleaned up project files; updated build and deployment documentation. Tested with V8 8.7.220.25.
1 parent 4f604e8 commit c12b3e7

85 files changed

Lines changed: 8239 additions & 2830 deletions

File tree

Some content is hidden

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

ClearScript.NoV8.sln

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.29418.71
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript", "ClearScript\ClearScript.csproj", "{D2382D2C-6576-4D96-B6CD-057C4F6BED96}"
7-
EndProject
86
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5488F9BE-286E-459B-8384-E9EDA331BD5B}"
97
ProjectSection(SolutionItems) = preProject
108
ClearScript\doc\FAQtorial.docx = ClearScript\doc\FAQtorial.docx
@@ -17,34 +15,53 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1715
EndProject
1816
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET Core", ".NET Core", "{41FDE4BD-8E1F-406B-A959-C3B2AF52C2E0}"
1917
EndProject
20-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript", "NetCore\ClearScript\ClearScript.csproj", "{CA91CC28-4C73-4ECD-8021-26D66DAE84C2}"
18+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET Framework", ".NET Framework", "{184998F3-5DCC-4463-86CC-469C13A69BA7}"
19+
EndProject
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Core", "NetFramework\ClearScript.Core\ClearScript.Core.csproj", "{FFEB6BB8-A769-4676-8DEA-DB0BF8923D80}"
21+
EndProject
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Windows", "NetFramework\ClearScript.Windows\ClearScript.Windows.csproj", "{2179ABA8-4D87-4CC7-B056-48F770FB446E}"
23+
EndProject
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Core", "NetCore\ClearScript.Core\ClearScript.Core.csproj", "{32DD8677-C243-48BF-8E81-01EA1C14C3E6}"
2125
ProjectSection(ProjectDependencies) = postProject
22-
{D2382D2C-6576-4D96-B6CD-057C4F6BED96} = {D2382D2C-6576-4D96-B6CD-057C4F6BED96}
26+
{FFEB6BB8-A769-4676-8DEA-DB0BF8923D80} = {FFEB6BB8-A769-4676-8DEA-DB0BF8923D80}
2327
EndProjectSection
2428
EndProject
25-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET Framework", ".NET Framework", "{184998F3-5DCC-4463-86CC-469C13A69BA7}"
29+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Windows", "NetCore\ClearScript.Windows\ClearScript.Windows.csproj", "{8D40DCCD-D812-4BF0-9BA2-116A3F127D2A}"
30+
ProjectSection(ProjectDependencies) = postProject
31+
{2179ABA8-4D87-4CC7-B056-48F770FB446E} = {2179ABA8-4D87-4CC7-B056-48F770FB446E}
32+
EndProjectSection
2633
EndProject
2734
Global
2835
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2936
Debug|Any CPU = Debug|Any CPU
3037
Release|Any CPU = Release|Any CPU
3138
EndGlobalSection
3239
GlobalSection(ProjectConfigurationPlatforms) = postSolution
33-
{D2382D2C-6576-4D96-B6CD-057C4F6BED96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34-
{D2382D2C-6576-4D96-B6CD-057C4F6BED96}.Debug|Any CPU.Build.0 = Debug|Any CPU
35-
{D2382D2C-6576-4D96-B6CD-057C4F6BED96}.Release|Any CPU.ActiveCfg = Release|Any CPU
36-
{D2382D2C-6576-4D96-B6CD-057C4F6BED96}.Release|Any CPU.Build.0 = Release|Any CPU
37-
{CA91CC28-4C73-4ECD-8021-26D66DAE84C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{CA91CC28-4C73-4ECD-8021-26D66DAE84C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{CA91CC28-4C73-4ECD-8021-26D66DAE84C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{CA91CC28-4C73-4ECD-8021-26D66DAE84C2}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{FFEB6BB8-A769-4676-8DEA-DB0BF8923D80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{FFEB6BB8-A769-4676-8DEA-DB0BF8923D80}.Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{FFEB6BB8-A769-4676-8DEA-DB0BF8923D80}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{FFEB6BB8-A769-4676-8DEA-DB0BF8923D80}.Release|Any CPU.Build.0 = Release|Any CPU
44+
{2179ABA8-4D87-4CC7-B056-48F770FB446E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45+
{2179ABA8-4D87-4CC7-B056-48F770FB446E}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{2179ABA8-4D87-4CC7-B056-48F770FB446E}.Release|Any CPU.ActiveCfg = Release|Any CPU
47+
{2179ABA8-4D87-4CC7-B056-48F770FB446E}.Release|Any CPU.Build.0 = Release|Any CPU
48+
{32DD8677-C243-48BF-8E81-01EA1C14C3E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49+
{32DD8677-C243-48BF-8E81-01EA1C14C3E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
50+
{32DD8677-C243-48BF-8E81-01EA1C14C3E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
51+
{32DD8677-C243-48BF-8E81-01EA1C14C3E6}.Release|Any CPU.Build.0 = Release|Any CPU
52+
{8D40DCCD-D812-4BF0-9BA2-116A3F127D2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53+
{8D40DCCD-D812-4BF0-9BA2-116A3F127D2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
54+
{8D40DCCD-D812-4BF0-9BA2-116A3F127D2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
55+
{8D40DCCD-D812-4BF0-9BA2-116A3F127D2A}.Release|Any CPU.Build.0 = Release|Any CPU
4156
EndGlobalSection
4257
GlobalSection(SolutionProperties) = preSolution
4358
HideSolutionNode = FALSE
4459
EndGlobalSection
4560
GlobalSection(NestedProjects) = preSolution
46-
{D2382D2C-6576-4D96-B6CD-057C4F6BED96} = {184998F3-5DCC-4463-86CC-469C13A69BA7}
47-
{CA91CC28-4C73-4ECD-8021-26D66DAE84C2} = {41FDE4BD-8E1F-406B-A959-C3B2AF52C2E0}
61+
{FFEB6BB8-A769-4676-8DEA-DB0BF8923D80} = {184998F3-5DCC-4463-86CC-469C13A69BA7}
62+
{2179ABA8-4D87-4CC7-B056-48F770FB446E} = {184998F3-5DCC-4463-86CC-469C13A69BA7}
63+
{32DD8677-C243-48BF-8E81-01EA1C14C3E6} = {41FDE4BD-8E1F-406B-A959-C3B2AF52C2E0}
64+
{8D40DCCD-D812-4BF0-9BA2-116A3F127D2A} = {41FDE4BD-8E1F-406B-A959-C3B2AF52C2E0}
4865
EndGlobalSection
4966
GlobalSection(ExtensibilityGlobals) = postSolution
5067
SolutionGuid = {F006893F-7CAF-443A-8F72-CA3C29A1BABD}

ClearScript.sln

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.29418.71
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScriptTest", "ClearScriptTest\ClearScriptTest.csproj", "{EDC7144E-FDA9-4CC7-B2CD-B5EBFD610A7D}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScriptTest", "NetFramework\ClearScriptTest\ClearScriptTest.csproj", "{EDC7144E-FDA9-4CC7-B2CD-B5EBFD610A7D}"
77
ProjectSection(ProjectDependencies) = postProject
88
{28980C99-77E7-4B62-8484-AF06C5745B8C} = {28980C99-77E7-4B62-8484-AF06C5745B8C}
99
EndProjectSection
1010
EndProject
11-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScriptConsole", "ClearScriptConsole\ClearScriptConsole.csproj", "{28980C99-77E7-4B62-8484-AF06C5745B8C}"
11+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScriptConsole", "NetFramework\ClearScriptConsole\ClearScriptConsole.csproj", "{28980C99-77E7-4B62-8484-AF06C5745B8C}"
1212
EndProject
1313
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5488F9BE-286E-459B-8384-E9EDA331BD5B}"
1414
ProjectSection(SolutionItems) = preProject
@@ -21,7 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2121
Version.tt = Version.tt
2222
EndProjectSection
2323
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScriptBenchmarks", "ClearScriptBenchmarks\ClearScriptBenchmarks.csproj", "{7922A2F5-3585-4A60-98FB-1BDB4D5ECD29}"
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScriptBenchmarks", "NetFramework\ClearScriptBenchmarks\ClearScriptBenchmarks.csproj", "{7922A2F5-3585-4A60-98FB-1BDB4D5ECD29}"
2525
EndProject
2626
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET Core", ".NET Core", "{38987D23-2ED7-473A-9DE5-863E338EF18A}"
2727
EndProject
@@ -52,27 +52,27 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClearScriptV8.win-x86", "Cl
5252
EndProject
5353
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClearScriptV8.win-x64", "ClearScriptV8\win-x64\ClearScriptV8.win-x64.vcxproj", "{CDCF4EEA-1CA4-412E-8C77-78893A67A577}"
5454
EndProject
55-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.Core", "ClearScript\ClearScript.Core.csproj", "{F1022C3F-AFBC-4F23-B4DE-C6C0742AEFF2}"
55+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.Core", "NetFramework\ClearScript.Core\ClearScript.Core.csproj", "{F1022C3F-AFBC-4F23-B4DE-C6C0742AEFF2}"
5656
EndProject
57-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.Windows", "ClearScript\ClearScript.Windows.csproj", "{BC560FF8-AB7A-4DA9-A1FD-99221447D370}"
57+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.Windows", "NetFramework\ClearScript.Windows\ClearScript.Windows.csproj", "{BC560FF8-AB7A-4DA9-A1FD-99221447D370}"
5858
EndProject
59-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.V8", "ClearScript\ClearScript.V8.csproj", "{59CC81A3-3D97-469A-9C8B-533F920085F1}"
59+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.V8", "NetFramework\ClearScript.V8\ClearScript.V8.csproj", "{59CC81A3-3D97-469A-9C8B-533F920085F1}"
6060
ProjectSection(ProjectDependencies) = postProject
6161
{2D63EA35-BA9C-4E77-B5A4-4938DBBFEFA6} = {2D63EA35-BA9C-4E77-B5A4-4938DBBFEFA6}
6262
{CDCF4EEA-1CA4-412E-8C77-78893A67A577} = {CDCF4EEA-1CA4-412E-8C77-78893A67A577}
6363
EndProjectSection
6464
EndProject
65-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Core", "NetCore\ClearScript\ClearScript.Core.csproj", "{7B3EA81F-F60B-46DB-B3F0-22F68E8A8FAD}"
65+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Core", "NetCore\ClearScript.Core\ClearScript.Core.csproj", "{7B3EA81F-F60B-46DB-B3F0-22F68E8A8FAD}"
6666
ProjectSection(ProjectDependencies) = postProject
6767
{F1022C3F-AFBC-4F23-B4DE-C6C0742AEFF2} = {F1022C3F-AFBC-4F23-B4DE-C6C0742AEFF2}
6868
EndProjectSection
6969
EndProject
70-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Windows", "NetCore\ClearScript\ClearScript.Windows.csproj", "{6576FFFD-BA73-4123-8E4B-8589E5163C04}"
70+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Windows", "NetCore\ClearScript.Windows\ClearScript.Windows.csproj", "{6576FFFD-BA73-4123-8E4B-8589E5163C04}"
7171
ProjectSection(ProjectDependencies) = postProject
7272
{BC560FF8-AB7A-4DA9-A1FD-99221447D370} = {BC560FF8-AB7A-4DA9-A1FD-99221447D370}
7373
EndProjectSection
7474
EndProject
75-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.V8", "NetCore\ClearScript\ClearScript.V8.csproj", "{C8AE52BB-BFEE-4816-A9FE-8653CEE36C96}"
75+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.V8", "NetCore\ClearScript.V8\ClearScript.V8.csproj", "{C8AE52BB-BFEE-4816-A9FE-8653CEE36C96}"
7676
ProjectSection(ProjectDependencies) = postProject
7777
{59CC81A3-3D97-469A-9C8B-533F920085F1} = {59CC81A3-3D97-469A-9C8B-533F920085F1}
7878
EndProjectSection

0 commit comments

Comments
 (0)