Skip to content

Commit

Permalink
ClearScript 7.0: Added .NET 5.0 targets; unified target-specific code…
Browse files Browse the repository at this point in the history 
… 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.
  • Loading branch information
@ClearScriptLib
ClearScriptLib committed Nov 18, 2020
1 parent 4f604e8 commit c12b3e7
Show file tree
Hide file tree
Showing 85 changed files with 8,239 additions and 2,830 deletions.
47 changes: 32 additions & 15 deletions ClearScript.NoV8.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29418.71
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript", "ClearScript\ClearScript.csproj", "{D2382D2C-6576-4D96-B6CD-057C4F6BED96}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5488F9BE-286E-459B-8384-E9EDA331BD5B}"
ProjectSection(SolutionItems) = preProject
ClearScript\doc\FAQtorial.docx = ClearScript\doc\FAQtorial.docx
Expand All @@ -17,34 +15,53 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET Core", ".NET Core", "{41FDE4BD-8E1F-406B-A959-C3B2AF52C2E0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript", "NetCore\ClearScript\ClearScript.csproj", "{CA91CC28-4C73-4ECD-8021-26D66DAE84C2}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET Framework", ".NET Framework", "{184998F3-5DCC-4463-86CC-469C13A69BA7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Core", "NetFramework\ClearScript.Core\ClearScript.Core.csproj", "{FFEB6BB8-A769-4676-8DEA-DB0BF8923D80}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Windows", "NetFramework\ClearScript.Windows\ClearScript.Windows.csproj", "{2179ABA8-4D87-4CC7-B056-48F770FB446E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Core", "NetCore\ClearScript.Core\ClearScript.Core.csproj", "{32DD8677-C243-48BF-8E81-01EA1C14C3E6}"
ProjectSection(ProjectDependencies) = postProject
{D2382D2C-6576-4D96-B6CD-057C4F6BED96} = {D2382D2C-6576-4D96-B6CD-057C4F6BED96}
{FFEB6BB8-A769-4676-8DEA-DB0BF8923D80} = {FFEB6BB8-A769-4676-8DEA-DB0BF8923D80}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET Framework", ".NET Framework", "{184998F3-5DCC-4463-86CC-469C13A69BA7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Windows", "NetCore\ClearScript.Windows\ClearScript.Windows.csproj", "{8D40DCCD-D812-4BF0-9BA2-116A3F127D2A}"
ProjectSection(ProjectDependencies) = postProject
{2179ABA8-4D87-4CC7-B056-48F770FB446E} = {2179ABA8-4D87-4CC7-B056-48F770FB446E}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D2382D2C-6576-4D96-B6CD-057C4F6BED96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D2382D2C-6576-4D96-B6CD-057C4F6BED96}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D2382D2C-6576-4D96-B6CD-057C4F6BED96}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D2382D2C-6576-4D96-B6CD-057C4F6BED96}.Release|Any CPU.Build.0 = Release|Any CPU
{CA91CC28-4C73-4ECD-8021-26D66DAE84C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CA91CC28-4C73-4ECD-8021-26D66DAE84C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CA91CC28-4C73-4ECD-8021-26D66DAE84C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CA91CC28-4C73-4ECD-8021-26D66DAE84C2}.Release|Any CPU.Build.0 = Release|Any CPU
{FFEB6BB8-A769-4676-8DEA-DB0BF8923D80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FFEB6BB8-A769-4676-8DEA-DB0BF8923D80}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FFEB6BB8-A769-4676-8DEA-DB0BF8923D80}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FFEB6BB8-A769-4676-8DEA-DB0BF8923D80}.Release|Any CPU.Build.0 = Release|Any CPU
{2179ABA8-4D87-4CC7-B056-48F770FB446E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2179ABA8-4D87-4CC7-B056-48F770FB446E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2179ABA8-4D87-4CC7-B056-48F770FB446E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2179ABA8-4D87-4CC7-B056-48F770FB446E}.Release|Any CPU.Build.0 = Release|Any CPU
{32DD8677-C243-48BF-8E81-01EA1C14C3E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{32DD8677-C243-48BF-8E81-01EA1C14C3E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{32DD8677-C243-48BF-8E81-01EA1C14C3E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{32DD8677-C243-48BF-8E81-01EA1C14C3E6}.Release|Any CPU.Build.0 = Release|Any CPU
{8D40DCCD-D812-4BF0-9BA2-116A3F127D2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D40DCCD-D812-4BF0-9BA2-116A3F127D2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D40DCCD-D812-4BF0-9BA2-116A3F127D2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D40DCCD-D812-4BF0-9BA2-116A3F127D2A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{D2382D2C-6576-4D96-B6CD-057C4F6BED96} = {184998F3-5DCC-4463-86CC-469C13A69BA7}
{CA91CC28-4C73-4ECD-8021-26D66DAE84C2} = {41FDE4BD-8E1F-406B-A959-C3B2AF52C2E0}
{FFEB6BB8-A769-4676-8DEA-DB0BF8923D80} = {184998F3-5DCC-4463-86CC-469C13A69BA7}
{2179ABA8-4D87-4CC7-B056-48F770FB446E} = {184998F3-5DCC-4463-86CC-469C13A69BA7}
{32DD8677-C243-48BF-8E81-01EA1C14C3E6} = {41FDE4BD-8E1F-406B-A959-C3B2AF52C2E0}
{8D40DCCD-D812-4BF0-9BA2-116A3F127D2A} = {41FDE4BD-8E1F-406B-A959-C3B2AF52C2E0}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F006893F-7CAF-443A-8F72-CA3C29A1BABD}
Expand Down
18 changes: 9 additions & 9 deletions ClearScript.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29418.71
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScriptTest", "ClearScriptTest\ClearScriptTest.csproj", "{EDC7144E-FDA9-4CC7-B2CD-B5EBFD610A7D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScriptTest", "NetFramework\ClearScriptTest\ClearScriptTest.csproj", "{EDC7144E-FDA9-4CC7-B2CD-B5EBFD610A7D}"
ProjectSection(ProjectDependencies) = postProject
{28980C99-77E7-4B62-8484-AF06C5745B8C} = {28980C99-77E7-4B62-8484-AF06C5745B8C}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScriptConsole", "ClearScriptConsole\ClearScriptConsole.csproj", "{28980C99-77E7-4B62-8484-AF06C5745B8C}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScriptConsole", "NetFramework\ClearScriptConsole\ClearScriptConsole.csproj", "{28980C99-77E7-4B62-8484-AF06C5745B8C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5488F9BE-286E-459B-8384-E9EDA331BD5B}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -21,7 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Version.tt = Version.tt
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScriptBenchmarks", "ClearScriptBenchmarks\ClearScriptBenchmarks.csproj", "{7922A2F5-3585-4A60-98FB-1BDB4D5ECD29}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScriptBenchmarks", "NetFramework\ClearScriptBenchmarks\ClearScriptBenchmarks.csproj", "{7922A2F5-3585-4A60-98FB-1BDB4D5ECD29}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET Core", ".NET Core", "{38987D23-2ED7-473A-9DE5-863E338EF18A}"
EndProject
Expand Down Expand Up @@ -52,27 +52,27 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClearScriptV8.win-x86", "Cl
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClearScriptV8.win-x64", "ClearScriptV8\win-x64\ClearScriptV8.win-x64.vcxproj", "{CDCF4EEA-1CA4-412E-8C77-78893A67A577}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.Core", "ClearScript\ClearScript.Core.csproj", "{F1022C3F-AFBC-4F23-B4DE-C6C0742AEFF2}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.Core", "NetFramework\ClearScript.Core\ClearScript.Core.csproj", "{F1022C3F-AFBC-4F23-B4DE-C6C0742AEFF2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.Windows", "ClearScript\ClearScript.Windows.csproj", "{BC560FF8-AB7A-4DA9-A1FD-99221447D370}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.Windows", "NetFramework\ClearScript.Windows\ClearScript.Windows.csproj", "{BC560FF8-AB7A-4DA9-A1FD-99221447D370}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.V8", "ClearScript\ClearScript.V8.csproj", "{59CC81A3-3D97-469A-9C8B-533F920085F1}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.V8", "NetFramework\ClearScript.V8\ClearScript.V8.csproj", "{59CC81A3-3D97-469A-9C8B-533F920085F1}"
ProjectSection(ProjectDependencies) = postProject
{2D63EA35-BA9C-4E77-B5A4-4938DBBFEFA6} = {2D63EA35-BA9C-4E77-B5A4-4938DBBFEFA6}
{CDCF4EEA-1CA4-412E-8C77-78893A67A577} = {CDCF4EEA-1CA4-412E-8C77-78893A67A577}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Core", "NetCore\ClearScript\ClearScript.Core.csproj", "{7B3EA81F-F60B-46DB-B3F0-22F68E8A8FAD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Core", "NetCore\ClearScript.Core\ClearScript.Core.csproj", "{7B3EA81F-F60B-46DB-B3F0-22F68E8A8FAD}"
ProjectSection(ProjectDependencies) = postProject
{F1022C3F-AFBC-4F23-B4DE-C6C0742AEFF2} = {F1022C3F-AFBC-4F23-B4DE-C6C0742AEFF2}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Windows", "NetCore\ClearScript\ClearScript.Windows.csproj", "{6576FFFD-BA73-4123-8E4B-8589E5163C04}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Windows", "NetCore\ClearScript.Windows\ClearScript.Windows.csproj", "{6576FFFD-BA73-4123-8E4B-8589E5163C04}"
ProjectSection(ProjectDependencies) = postProject
{BC560FF8-AB7A-4DA9-A1FD-99221447D370} = {BC560FF8-AB7A-4DA9-A1FD-99221447D370}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.V8", "NetCore\ClearScript\ClearScript.V8.csproj", "{C8AE52BB-BFEE-4816-A9FE-8653CEE36C96}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.V8", "NetCore\ClearScript.V8\ClearScript.V8.csproj", "{C8AE52BB-BFEE-4816-A9FE-8653CEE36C96}"
ProjectSection(ProjectDependencies) = postProject
{59CC81A3-3D97-469A-9C8B-533F920085F1} = {59CC81A3-3D97-469A-9C8B-533F920085F1}
EndProjectSection
Expand Down
Loading

0 comments on commit c12b3e7

Please sign in to comment.