Skip to content

Commit

Permalink
ClearScript 7.0 RC5: ClearScript.dll has been split into ClearScript.…
Browse files Browse the repository at this point in the history
…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 #209). Tested with V8 8.7.220.16.
  • Loading branch information
ClearScriptLib committed Nov 5, 2020
1 parent 6ce0ef7 commit be0de00
Show file tree
Hide file tree
Showing 658 changed files with 14,332 additions and 6,402 deletions.
138 changes: 81 additions & 57 deletions ClearScript.sln

Large diffs are not rendered by default.

297 changes: 111 additions & 186 deletions ClearScript/ClearScript.csproj → ClearScript/ClearScript.Core.csproj

Large diffs are not rendered by default.

123 changes: 123 additions & 0 deletions ClearScript/ClearScript.V8.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{59CC81A3-3D97-469A-9C8B-533F920085F1}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.ClearScript</RootNamespace>
<AssemblyName>ClearScript.V8</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NETFRAMEWORK</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DocumentationFile>..\bin\Debug\ClearScript.V8.xml</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\bin\Release\</OutputPath>
<DefineConstants>TRACE;NETFRAMEWORK</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DocumentationFile>..\bin\Release\ClearScript.V8.xml</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="Exists('$(SolutionDir)ClearScript.snk')">
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(SolutionDir)ClearScript.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition="!Exists('$(SolutionDir)ClearScript.snk') And Exists('$(SolutionDir)ClearScript.DelaySign.snk')">
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(SolutionDir)ClearScript.DelaySign.snk</AssemblyOriginatorKeyFile>
<DelaySign>true</DelaySign>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Numerics" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="ClearScript.Core.csproj">
<Project>{f1022c3f-afbc-4f23-b4de-c6c0742aeff2}</Project>
<Name>ClearScript.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.V8.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>AssemblyInfo.V8.tt</DependentUpon>
</Compile>
<Compile Include="V8\IV8DebugListener.cs" />
<Compile Include="V8\IV8Object.cs" />
<Compile Include="V8\SplitProxy\IV8SplitProxyNative.cs" />
<Compile Include="V8\SplitProxy\NativeCallbackImpl.cs" />
<Compile Include="V8\SplitProxy\V8ContextProxyImpl.cs" />
<Compile Include="V8\SplitProxy\V8DebugListenerImpl.cs" />
<Compile Include="V8\SplitProxy\V8EntityHolder.cs" />
<Compile Include="V8\SplitProxy\V8IsolateProxyImpl.cs" />
<Compile Include="V8\SplitProxy\V8ObjectImpl.cs" />
<Compile Include="V8\SplitProxy\V8ScriptImpl.cs" />
<Compile Include="V8\SplitProxy\V8SplitProxyHelpers.cs" />
<Compile Include="V8\SplitProxy\V8SplitProxyManaged.cs" />
<Compile Include="V8\SplitProxy\V8SplitProxyNative.cs" />
<Compile Include="V8\SplitProxy\V8SplitProxyNative.Generated.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>V8SplitProxyNative.tt</DependentUpon>
</Compile>
<Compile Include="V8\SplitProxy\V8SplitProxyNative.NetFramework.cs" />
<Compile Include="V8\SplitProxy\V8TestProxyImpl.cs" />
<Compile Include="V8\V8ArrayBufferOrViewInfo.cs" />
<Compile Include="V8\V8ArrayBufferOrViewKind.cs" />
<Compile Include="V8\V8CacheKind.cs" />
<Compile Include="V8\V8ContextProxy.cs" />
<Compile Include="V8\V8CpuProfile.cs" />
<Compile Include="V8\V8CpuProfileFlags.cs" />
<Compile Include="V8\V8DebugAgent.cs" />
<Compile Include="V8\V8DebugClient.cs" />
<Compile Include="V8\V8IsolateProxy.cs" />
<Compile Include="V8\V8Proxy.cs" />
<Compile Include="V8\V8Proxy.NetFramework.cs" />
<Compile Include="V8\V8ProxyHelpers.cs" />
<Compile Include="V8\V8Runtime.cs" />
<Compile Include="V8\V8RuntimeConstraints.cs" />
<Compile Include="V8\V8RuntimeFlags.cs" />
<Compile Include="V8\V8RuntimeHeapInfo.cs" />
<Compile Include="V8\V8Script.cs" />
<Compile Include="V8\V8ScriptEngine.cs" />
<Compile Include="V8\V8ScriptEngineFlags.cs" />
<Compile Include="V8\V8ScriptItem.cs" />
<Compile Include="V8\V8TestProxy.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Properties\AssemblyInfo.V8.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>AssemblyInfo.V8.cs</LastGenOutput>
</Content>
<Content Include="V8\SplitProxy\V8SplitProxyNative.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>V8SplitProxyNative.Generated.cs</LastGenOutput>
</Content>
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
91 changes: 91 additions & 0 deletions ClearScript/ClearScript.Windows.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{BC560FF8-AB7A-4DA9-A1FD-99221447D370}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.ClearScript</RootNamespace>
<AssemblyName>ClearScript.Windows</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NETFRAMEWORK</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DocumentationFile>..\bin\Debug\ClearScript.Windows.xml</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\bin\Release\</OutputPath>
<DefineConstants>TRACE;NETFRAMEWORK</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DocumentationFile>..\bin\Release\ClearScript.Windows.xml</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="Exists('$(SolutionDir)ClearScript.snk')">
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(SolutionDir)ClearScript.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition="!Exists('$(SolutionDir)ClearScript.snk') And Exists('$(SolutionDir)ClearScript.DelaySign.snk')">
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(SolutionDir)ClearScript.DelaySign.snk</AssemblyOriginatorKeyFile>
<DelaySign>true</DelaySign>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="ClearScript.Core.csproj">
<Project>{f1022c3f-afbc-4f23-b4de-c6c0742aeff2}</Project>
<Name>ClearScript.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.Windows.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>AssemblyInfo.Windows.tt</DependentUpon>
</Compile>
<Compile Include="Windows\ActiveXDebugging.cs" />
<Compile Include="Windows\ActiveXScripting.cs" />
<Compile Include="Windows\ActiveXWrappers.cs" />
<Compile Include="Windows\IHostWindow.cs" />
<Compile Include="Windows\IWindowsScriptObject.cs" />
<Compile Include="Windows\JScriptEngine.cs" />
<Compile Include="Windows\Nothing.cs" />
<Compile Include="Windows\VBScriptEngine.cs" />
<Compile Include="Windows\WindowsScriptEngine.cs" />
<Compile Include="Windows\WindowsScriptEngine.Debug.cs" />
<Compile Include="Windows\WindowsScriptEngine.Site.cs" />
<Compile Include="Windows\WindowsScriptEngineFlags.cs" />
<Compile Include="Windows\WindowsScriptItem.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Properties\AssemblyInfo.Windows.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>AssemblyInfo.Windows.cs</LastGenOutput>
</Content>
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
2 changes: 1 addition & 1 deletion ClearScript/Exports/VersionSymbols.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@

#define CLEARSCRIPT_VERSION_STRING "7.0.0"
#define CLEARSCRIPT_VERSION_COMMA_SEPARATED 7,0,0
#define CLEARSCRIPT_VERSION_STRING_INFORMATIONAL "7.0.0-rc4"
#define CLEARSCRIPT_VERSION_STRING_INFORMATIONAL "7.0.0-rc5"
#define CLEARSCRIPT_FILE_FLAGS VS_FF_PRERELEASE
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ internal partial class HostItem

private static HostItem Create(ScriptEngine engine, HostTarget target, HostItemFlags flags)
{
if (!MiscHelpers.PlatformIsWindows())
{
return new HostItem(engine, target, flags);
}

return TargetSupportsExpandoMembers(target, flags) ? new DispatchExHostItem(engine, target, flags) : new HostItem(engine, target, flags);
}

Expand Down
File renamed without changes.
30 changes: 0 additions & 30 deletions ClearScript/HostItem.Unix.cs

This file was deleted.

Loading

0 comments on commit be0de00

Please sign in to comment.