Skip to content

Commit be0de00

Browse files
ClearScriptLibClearScriptLib
committed
ClearScript 7.0 RC5: ClearScript.dll has been split into ClearScript.Core.dll, ClearScript.Windows.dll, and ClearScript.V8.dll; the project no longer builds distinct .NET Core libraries for non-Windows platforms; the name of each V8 native assembly now includes its Runtime Identifier; enhanced support for cross-platform deployment of web projects; overhauled NuGet packaging according to Andrey Taritsyn's recommended taxonomy (GitHub Issue ClearFoundry#209). Tested with V8 8.7.220.16.
1 parent 6ce0ef7 commit be0de00

658 files changed

Lines changed: 14332 additions & 6402 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.sln‎

Lines changed: 81 additions & 57 deletions
Large diffs are not rendered by default.

ClearScript/ClearScript.csproj renamed to ClearScript/ClearScript.Core.csproj

Lines changed: 111 additions & 186 deletions
Large diffs are not rendered by default.

‎ClearScript/ClearScript.V8.csproj‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{59CC81A3-3D97-469A-9C8B-533F920085F1}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Microsoft.ClearScript</RootNamespace>
11+
<AssemblyName>ClearScript.V8</AssemblyName>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<Deterministic>true</Deterministic>
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17+
<DebugSymbols>true</DebugSymbols>
18+
<DebugType>full</DebugType>
19+
<Optimize>false</Optimize>
20+
<OutputPath>..\bin\Debug\</OutputPath>
21+
<DefineConstants>TRACE;DEBUG;NETFRAMEWORK</DefineConstants>
22+
<ErrorReport>prompt</ErrorReport>
23+
<WarningLevel>4</WarningLevel>
24+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
25+
<DocumentationFile>..\bin\Debug\ClearScript.V8.xml</DocumentationFile>
26+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<DebugType>pdbonly</DebugType>
30+
<Optimize>true</Optimize>
31+
<OutputPath>..\bin\Release\</OutputPath>
32+
<DefineConstants>TRACE;NETFRAMEWORK</DefineConstants>
33+
<ErrorReport>prompt</ErrorReport>
34+
<WarningLevel>4</WarningLevel>
35+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
36+
<DocumentationFile>..\bin\Release\ClearScript.V8.xml</DocumentationFile>
37+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
38+
</PropertyGroup>
39+
<PropertyGroup Condition="Exists('$(SolutionDir)ClearScript.snk')">
40+
<SignAssembly>true</SignAssembly>
41+
<AssemblyOriginatorKeyFile>$(SolutionDir)ClearScript.snk</AssemblyOriginatorKeyFile>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="!Exists('$(SolutionDir)ClearScript.snk') And Exists('$(SolutionDir)ClearScript.DelaySign.snk')">
44+
<SignAssembly>true</SignAssembly>
45+
<AssemblyOriginatorKeyFile>$(SolutionDir)ClearScript.DelaySign.snk</AssemblyOriginatorKeyFile>
46+
<DelaySign>true</DelaySign>
47+
</PropertyGroup>
48+
<ItemGroup>
49+
<Reference Include="System" />
50+
<Reference Include="System.Core" />
51+
<Reference Include="Microsoft.CSharp" />
52+
<Reference Include="System.Numerics" />
53+
</ItemGroup>
54+
<ItemGroup>
55+
<ProjectReference Include="ClearScript.Core.csproj">
56+
<Project>{f1022c3f-afbc-4f23-b4de-c6c0742aeff2}</Project>
57+
<Name>ClearScript.Core</Name>
58+
</ProjectReference>
59+
</ItemGroup>
60+
<ItemGroup />
61+
<ItemGroup>
62+
<Compile Include="Properties\AssemblyInfo.V8.cs">
63+
<AutoGen>True</AutoGen>
64+
<DesignTime>True</DesignTime>
65+
<DependentUpon>AssemblyInfo.V8.tt</DependentUpon>
66+
</Compile>
67+
<Compile Include="V8\IV8DebugListener.cs" />
68+
<Compile Include="V8\IV8Object.cs" />
69+
<Compile Include="V8\SplitProxy\IV8SplitProxyNative.cs" />
70+
<Compile Include="V8\SplitProxy\NativeCallbackImpl.cs" />
71+
<Compile Include="V8\SplitProxy\V8ContextProxyImpl.cs" />
72+
<Compile Include="V8\SplitProxy\V8DebugListenerImpl.cs" />
73+
<Compile Include="V8\SplitProxy\V8EntityHolder.cs" />
74+
<Compile Include="V8\SplitProxy\V8IsolateProxyImpl.cs" />
75+
<Compile Include="V8\SplitProxy\V8ObjectImpl.cs" />
76+
<Compile Include="V8\SplitProxy\V8ScriptImpl.cs" />
77+
<Compile Include="V8\SplitProxy\V8SplitProxyHelpers.cs" />
78+
<Compile Include="V8\SplitProxy\V8SplitProxyManaged.cs" />
79+
<Compile Include="V8\SplitProxy\V8SplitProxyNative.cs" />
80+
<Compile Include="V8\SplitProxy\V8SplitProxyNative.Generated.cs">
81+
<AutoGen>True</AutoGen>
82+
<DesignTime>True</DesignTime>
83+
<DependentUpon>V8SplitProxyNative.tt</DependentUpon>
84+
</Compile>
85+
<Compile Include="V8\SplitProxy\V8SplitProxyNative.NetFramework.cs" />
86+
<Compile Include="V8\SplitProxy\V8TestProxyImpl.cs" />
87+
<Compile Include="V8\V8ArrayBufferOrViewInfo.cs" />
88+
<Compile Include="V8\V8ArrayBufferOrViewKind.cs" />
89+
<Compile Include="V8\V8CacheKind.cs" />
90+
<Compile Include="V8\V8ContextProxy.cs" />
91+
<Compile Include="V8\V8CpuProfile.cs" />
92+
<Compile Include="V8\V8CpuProfileFlags.cs" />
93+
<Compile Include="V8\V8DebugAgent.cs" />
94+
<Compile Include="V8\V8DebugClient.cs" />
95+
<Compile Include="V8\V8IsolateProxy.cs" />
96+
<Compile Include="V8\V8Proxy.cs" />
97+
<Compile Include="V8\V8Proxy.NetFramework.cs" />
98+
<Compile Include="V8\V8ProxyHelpers.cs" />
99+
<Compile Include="V8\V8Runtime.cs" />
100+
<Compile Include="V8\V8RuntimeConstraints.cs" />
101+
<Compile Include="V8\V8RuntimeFlags.cs" />
102+
<Compile Include="V8\V8RuntimeHeapInfo.cs" />
103+
<Compile Include="V8\V8Script.cs" />
104+
<Compile Include="V8\V8ScriptEngine.cs" />
105+
<Compile Include="V8\V8ScriptEngineFlags.cs" />
106+
<Compile Include="V8\V8ScriptItem.cs" />
107+
<Compile Include="V8\V8TestProxy.cs" />
108+
</ItemGroup>
109+
<ItemGroup>
110+
<Content Include="Properties\AssemblyInfo.V8.tt">
111+
<Generator>TextTemplatingFileGenerator</Generator>
112+
<LastGenOutput>AssemblyInfo.V8.cs</LastGenOutput>
113+
</Content>
114+
<Content Include="V8\SplitProxy\V8SplitProxyNative.tt">
115+
<Generator>TextTemplatingFileGenerator</Generator>
116+
<LastGenOutput>V8SplitProxyNative.Generated.cs</LastGenOutput>
117+
</Content>
118+
</ItemGroup>
119+
<ItemGroup>
120+
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
121+
</ItemGroup>
122+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
123+
</Project>

‎ClearScript/ClearScript.Windows.csproj‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{BC560FF8-AB7A-4DA9-A1FD-99221447D370}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Microsoft.ClearScript</RootNamespace>
11+
<AssemblyName>ClearScript.Windows</AssemblyName>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<Deterministic>true</Deterministic>
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17+
<DebugSymbols>true</DebugSymbols>
18+
<DebugType>full</DebugType>
19+
<Optimize>false</Optimize>
20+
<OutputPath>..\bin\Debug\</OutputPath>
21+
<DefineConstants>TRACE;DEBUG;NETFRAMEWORK</DefineConstants>
22+
<ErrorReport>prompt</ErrorReport>
23+
<WarningLevel>4</WarningLevel>
24+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
25+
<DocumentationFile>..\bin\Debug\ClearScript.Windows.xml</DocumentationFile>
26+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<DebugType>pdbonly</DebugType>
30+
<Optimize>true</Optimize>
31+
<OutputPath>..\bin\Release\</OutputPath>
32+
<DefineConstants>TRACE;NETFRAMEWORK</DefineConstants>
33+
<ErrorReport>prompt</ErrorReport>
34+
<WarningLevel>4</WarningLevel>
35+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
36+
<DocumentationFile>..\bin\Release\ClearScript.Windows.xml</DocumentationFile>
37+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
38+
</PropertyGroup>
39+
<PropertyGroup Condition="Exists('$(SolutionDir)ClearScript.snk')">
40+
<SignAssembly>true</SignAssembly>
41+
<AssemblyOriginatorKeyFile>$(SolutionDir)ClearScript.snk</AssemblyOriginatorKeyFile>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="!Exists('$(SolutionDir)ClearScript.snk') And Exists('$(SolutionDir)ClearScript.DelaySign.snk')">
44+
<SignAssembly>true</SignAssembly>
45+
<AssemblyOriginatorKeyFile>$(SolutionDir)ClearScript.DelaySign.snk</AssemblyOriginatorKeyFile>
46+
<DelaySign>true</DelaySign>
47+
</PropertyGroup>
48+
<ItemGroup>
49+
<Reference Include="System" />
50+
<Reference Include="System.Core" />
51+
<Reference Include="Microsoft.CSharp" />
52+
<Reference Include="WindowsBase" />
53+
</ItemGroup>
54+
<ItemGroup>
55+
<ProjectReference Include="ClearScript.Core.csproj">
56+
<Project>{f1022c3f-afbc-4f23-b4de-c6c0742aeff2}</Project>
57+
<Name>ClearScript.Core</Name>
58+
</ProjectReference>
59+
</ItemGroup>
60+
<ItemGroup />
61+
<ItemGroup>
62+
<Compile Include="Properties\AssemblyInfo.Windows.cs">
63+
<AutoGen>True</AutoGen>
64+
<DesignTime>True</DesignTime>
65+
<DependentUpon>AssemblyInfo.Windows.tt</DependentUpon>
66+
</Compile>
67+
<Compile Include="Windows\ActiveXDebugging.cs" />
68+
<Compile Include="Windows\ActiveXScripting.cs" />
69+
<Compile Include="Windows\ActiveXWrappers.cs" />
70+
<Compile Include="Windows\IHostWindow.cs" />
71+
<Compile Include="Windows\IWindowsScriptObject.cs" />
72+
<Compile Include="Windows\JScriptEngine.cs" />
73+
<Compile Include="Windows\Nothing.cs" />
74+
<Compile Include="Windows\VBScriptEngine.cs" />
75+
<Compile Include="Windows\WindowsScriptEngine.cs" />
76+
<Compile Include="Windows\WindowsScriptEngine.Debug.cs" />
77+
<Compile Include="Windows\WindowsScriptEngine.Site.cs" />
78+
<Compile Include="Windows\WindowsScriptEngineFlags.cs" />
79+
<Compile Include="Windows\WindowsScriptItem.cs" />
80+
</ItemGroup>
81+
<ItemGroup>
82+
<Content Include="Properties\AssemblyInfo.Windows.tt">
83+
<Generator>TextTemplatingFileGenerator</Generator>
84+
<LastGenOutput>AssemblyInfo.Windows.cs</LastGenOutput>
85+
</Content>
86+
</ItemGroup>
87+
<ItemGroup>
88+
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
89+
</ItemGroup>
90+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
91+
</Project>

‎ClearScript/Exports/VersionSymbols.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77

88
#define CLEARSCRIPT_VERSION_STRING "7.0.0"
99
#define CLEARSCRIPT_VERSION_COMMA_SEPARATED 7,0,0
10-
#define CLEARSCRIPT_VERSION_STRING_INFORMATIONAL "7.0.0-rc4"
10+
#define CLEARSCRIPT_VERSION_STRING_INFORMATIONAL "7.0.0-rc5"
1111
#define CLEARSCRIPT_FILE_FLAGS VS_FF_PRERELEASE

ClearScript/HostItem.Windows.NetCore.cs renamed to ClearScript/HostItem.NetCore.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ internal partial class HostItem
1818

1919
private static HostItem Create(ScriptEngine engine, HostTarget target, HostItemFlags flags)
2020
{
21+
if (!MiscHelpers.PlatformIsWindows())
22+
{
23+
return new HostItem(engine, target, flags);
24+
}
25+
2126
return TargetSupportsExpandoMembers(target, flags) ? new DispatchExHostItem(engine, target, flags) : new HostItem(engine, target, flags);
2227
}
2328

ClearScript/HostItem.Windows.NetFramework.cs renamed to ClearScript/HostItem.NetFramework.cs

File renamed without changes.

‎ClearScript/HostItem.Unix.cs‎

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

0 commit comments

Comments
 (0)