Skip to content

Commit

Permalink
Follow-up: Remove properties from the example projects that are also …
Browse files Browse the repository at this point in the history 
…not used in the corresponding .NET Framework projects.

Add CefSharp.Example.netcore and CefSharp.WinForms.Example.netcore.

Output documentation files.

Use "bin.netcore" and "obj.netcore" as [intermediate] output path for the .NET Core projects, to allow side-by-side builds with the .NET Framework projects.

Remove WindowsTargetPlatformVersion property as that is declared in CefSharp.props.

Switch project CefSharp.netcore.csproj to AnyCPU as it doesn't require different builds for each platform.

- Remove dependencies to "opengl32.lib" and "glu32.lib" which aren't available for ARM64 and don't seem to be needed.
- Clean up project files.

Add .NET Core 3.1 projects for CefSharp, CefSharp.Core, CefSharp.BrowserSubprocess.Core, CefSharp.WinForms, CefSharp.Wpf, CefSharp.OffScreen.

Contributes to cefsharp#2796
  • Loading branch information
@kpreisser @amaitland
kpreisser authored and amaitland committed Jul 23, 2020
1 parent 7f832af commit a6f718a
Show file tree
Hide file tree
Showing 44 changed files with 1,700 additions and 11 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
_ReSharper*

bin/
bin.netcore/
obj/
obj.netcore/
packages/
Debug/
Release/
Expand Down
2 changes: 2 additions & 0 deletions CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,10 @@ namespace CefSharp
property int BrowserId;
property bool IsPopup;

#ifndef NETCOREAPP
// This allows us to create the WCF proxies back to our parent process.
property ChannelFactory<IBrowserProcess^>^ ChannelFactory;
#endif

// The WCF proxy to the parent process.
property IBrowserProcess^ BrowserProcess;
Expand Down
197 changes: 197 additions & 0 deletions CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.filters
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="JavascriptMethodHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="JavascriptPropertyHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="vcclr_local.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="JavascriptPropertyWrapper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="JavascriptMethodWrapper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="JavascriptObjectWrapper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CefSharp.Core\Internals\MCefRefPtr.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CefSharp.Core\Internals\StringUtils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="TypeUtils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="JavascriptRootObjectWrapper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="CefAppUnmanagedWrapper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="CefBrowserWrapper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="JavascriptCallbackRegistry.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="JavascriptCallbackWrapper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CefSharp.Core\Internals\ReportUnhandledExceptions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CefSharp.Core\Internals\Serialization\Primitives.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Serialization\V8Serialization.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Async\JavascriptAsyncObjectWrapper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Async\JavascriptAsyncMethodWrapper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Async\JavascriptAsyncMethodHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Async\JavascriptAsyncMethodCallback.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Serialization\JsObjectsSerialization.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="SubProcess.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="WcfEnabledSubProcess.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="RegisterBoundObjectHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="RegisterBoundObjectRegistry.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Wrapper\Frame.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Wrapper\Browser.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Wrapper\V8Context.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="JavascriptPostMessageHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="SubProcessApp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="BindObjectAsyncHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="AssemblyInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TypeUtils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="JavascriptMethodWrapper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="JavascriptPropertyWrapper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="JavascriptObjectWrapper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="CefAppUnmanagedWrapper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="JavascriptMethodHandler.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="JavascriptRootObjectWrapper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="JavascriptCallbackRegistry.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CefSharp.Core\Internals\Serialization\Primitives.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Serialization\V8Serialization.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Async\JavascriptAsyncObjectWrapper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Async\JavascriptAsyncMethodWrapper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Async\JavascriptAsyncMethodHandler.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Async\JavascriptAsyncMethodCallback.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Serialization\JsObjectsSerialization.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="WcfEnabledSubProcess.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Wrapper\Frame.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Wrapper\Browser.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="WcfBrowserSubprocessExecutable.h">
<Filter>Header Files</Filter>
</ClCompile>
<ClCompile Include="BrowserSubprocessExecutable.h">
<Filter>Header Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Resource.rc" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
</Project>
Loading

0 comments on commit a6f718a

Please sign in to comment.