Skip to content

Commit bbb11c4

Browse files
kpreisserkpreisser
authored
Merge 716e614 into 819837f 
2 parents 819837f + 716e614 commit bbb11c4

Some content is hidden

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

44 files changed

+1700
-11
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
_ReSharper*
2222

2323
bin/
24+
bin.netcore/
2425
obj/
26+
obj.netcore/
2527
packages/
2628
Debug/
2729
Release/

‎CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@ namespace CefSharp
6262
property int BrowserId;
6363
property bool IsPopup;
6464

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

6870
// The WCF proxy to the parent process.
6971
property IBrowserProcess^ BrowserProcess;

‎CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.filters‎

Lines changed: 197 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,197 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Header Files">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
11+
</Filter>
12+
</ItemGroup>
13+
<ItemGroup>
14+
<ClInclude Include="Stdafx.h">
15+
<Filter>Header Files</Filter>
16+
</ClInclude>
17+
<ClInclude Include="JavascriptMethodHandler.h">
18+
<Filter>Header Files</Filter>
19+
</ClInclude>
20+
<ClInclude Include="JavascriptPropertyHandler.h">
21+
<Filter>Header Files</Filter>
22+
</ClInclude>
23+
<ClInclude Include="vcclr_local.h">
24+
<Filter>Header Files</Filter>
25+
</ClInclude>
26+
<ClInclude Include="JavascriptPropertyWrapper.h">
27+
<Filter>Header Files</Filter>
28+
</ClInclude>
29+
<ClInclude Include="JavascriptMethodWrapper.h">
30+
<Filter>Header Files</Filter>
31+
</ClInclude>
32+
<ClInclude Include="JavascriptObjectWrapper.h">
33+
<Filter>Header Files</Filter>
34+
</ClInclude>
35+
<ClInclude Include="..\CefSharp.Core\Internals\MCefRefPtr.h">
36+
<Filter>Header Files</Filter>
37+
</ClInclude>
38+
<ClInclude Include="..\CefSharp.Core\Internals\StringUtils.h">
39+
<Filter>Header Files</Filter>
40+
</ClInclude>
41+
<ClInclude Include="TypeUtils.h">
42+
<Filter>Header Files</Filter>
43+
</ClInclude>
44+
<ClInclude Include="JavascriptRootObjectWrapper.h">
45+
<Filter>Header Files</Filter>
46+
</ClInclude>
47+
<ClInclude Include="CefAppUnmanagedWrapper.h">
48+
<Filter>Header Files</Filter>
49+
</ClInclude>
50+
<ClInclude Include="CefBrowserWrapper.h">
51+
<Filter>Header Files</Filter>
52+
</ClInclude>
53+
<ClInclude Include="JavascriptCallbackRegistry.h">
54+
<Filter>Header Files</Filter>
55+
</ClInclude>
56+
<ClInclude Include="JavascriptCallbackWrapper.h">
57+
<Filter>Header Files</Filter>
58+
</ClInclude>
59+
<ClInclude Include="..\CefSharp.Core\Internals\ReportUnhandledExceptions.h">
60+
<Filter>Header Files</Filter>
61+
</ClInclude>
62+
<ClInclude Include="..\CefSharp.Core\Internals\Serialization\Primitives.h">
63+
<Filter>Header Files</Filter>
64+
</ClInclude>
65+
<ClInclude Include="Serialization\V8Serialization.h">
66+
<Filter>Header Files</Filter>
67+
</ClInclude>
68+
<ClInclude Include="Async\JavascriptAsyncObjectWrapper.h">
69+
<Filter>Header Files</Filter>
70+
</ClInclude>
71+
<ClInclude Include="Async\JavascriptAsyncMethodWrapper.h">
72+
<Filter>Header Files</Filter>
73+
</ClInclude>
74+
<ClInclude Include="Async\JavascriptAsyncMethodHandler.h">
75+
<Filter>Header Files</Filter>
76+
</ClInclude>
77+
<ClInclude Include="Async\JavascriptAsyncMethodCallback.h">
78+
<Filter>Header Files</Filter>
79+
</ClInclude>
80+
<ClInclude Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.h">
81+
<Filter>Header Files</Filter>
82+
</ClInclude>
83+
<ClInclude Include="Serialization\JsObjectsSerialization.h">
84+
<Filter>Header Files</Filter>
85+
</ClInclude>
86+
<ClInclude Include="SubProcess.h">
87+
<Filter>Header Files</Filter>
88+
</ClInclude>
89+
<ClInclude Include="WcfEnabledSubProcess.h">
90+
<Filter>Header Files</Filter>
91+
</ClInclude>
92+
<ClInclude Include="resource.h">
93+
<Filter>Header Files</Filter>
94+
</ClInclude>
95+
<ClInclude Include="RegisterBoundObjectHandler.h">
96+
<Filter>Header Files</Filter>
97+
</ClInclude>
98+
<ClInclude Include="RegisterBoundObjectRegistry.h">
99+
<Filter>Header Files</Filter>
100+
</ClInclude>
101+
<ClInclude Include="Wrapper\Frame.h">
102+
<Filter>Header Files</Filter>
103+
</ClInclude>
104+
<ClInclude Include="Wrapper\Browser.h">
105+
<Filter>Header Files</Filter>
106+
</ClInclude>
107+
<ClInclude Include="Wrapper\V8Context.h">
108+
<Filter>Header Files</Filter>
109+
</ClInclude>
110+
<ClInclude Include="JavascriptPostMessageHandler.h">
111+
<Filter>Header Files</Filter>
112+
</ClInclude>
113+
<ClInclude Include="SubProcessApp.h">
114+
<Filter>Header Files</Filter>
115+
</ClInclude>
116+
<ClInclude Include="BindObjectAsyncHandler.h">
117+
<Filter>Header Files</Filter>
118+
</ClInclude>
119+
</ItemGroup>
120+
<ItemGroup>
121+
<ClCompile Include="AssemblyInfo.cpp">
122+
<Filter>Source Files</Filter>
123+
</ClCompile>
124+
<ClCompile Include="Stdafx.cpp">
125+
<Filter>Source Files</Filter>
126+
</ClCompile>
127+
<ClCompile Include="TypeUtils.cpp">
128+
<Filter>Source Files</Filter>
129+
</ClCompile>
130+
<ClCompile Include="JavascriptMethodWrapper.cpp">
131+
<Filter>Source Files</Filter>
132+
</ClCompile>
133+
<ClCompile Include="JavascriptPropertyWrapper.cpp">
134+
<Filter>Source Files</Filter>
135+
</ClCompile>
136+
<ClCompile Include="JavascriptObjectWrapper.cpp">
137+
<Filter>Source Files</Filter>
138+
</ClCompile>
139+
<ClCompile Include="CefAppUnmanagedWrapper.cpp">
140+
<Filter>Source Files</Filter>
141+
</ClCompile>
142+
<ClCompile Include="JavascriptMethodHandler.cpp">
143+
<Filter>Source Files</Filter>
144+
</ClCompile>
145+
<ClCompile Include="JavascriptRootObjectWrapper.cpp">
146+
<Filter>Source Files</Filter>
147+
</ClCompile>
148+
<ClCompile Include="JavascriptCallbackRegistry.cpp">
149+
<Filter>Source Files</Filter>
150+
</ClCompile>
151+
<ClCompile Include="..\CefSharp.Core\Internals\Serialization\Primitives.cpp">
152+
<Filter>Source Files</Filter>
153+
</ClCompile>
154+
<ClCompile Include="Serialization\V8Serialization.cpp">
155+
<Filter>Source Files</Filter>
156+
</ClCompile>
157+
<ClCompile Include="Async\JavascriptAsyncObjectWrapper.cpp">
158+
<Filter>Source Files</Filter>
159+
</ClCompile>
160+
<ClCompile Include="Async\JavascriptAsyncMethodWrapper.cpp">
161+
<Filter>Source Files</Filter>
162+
</ClCompile>
163+
<ClCompile Include="Async\JavascriptAsyncMethodHandler.cpp">
164+
<Filter>Source Files</Filter>
165+
</ClCompile>
166+
<ClCompile Include="Async\JavascriptAsyncMethodCallback.cpp">
167+
<Filter>Source Files</Filter>
168+
</ClCompile>
169+
<ClCompile Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.cpp">
170+
<Filter>Source Files</Filter>
171+
</ClCompile>
172+
<ClCompile Include="Serialization\JsObjectsSerialization.cpp">
173+
<Filter>Source Files</Filter>
174+
</ClCompile>
175+
<ClCompile Include="WcfEnabledSubProcess.cpp">
176+
<Filter>Source Files</Filter>
177+
</ClCompile>
178+
<ClCompile Include="Wrapper\Frame.cpp">
179+
<Filter>Source Files</Filter>
180+
</ClCompile>
181+
<ClCompile Include="Wrapper\Browser.cpp">
182+
<Filter>Source Files</Filter>
183+
</ClCompile>
184+
<ClCompile Include="WcfBrowserSubprocessExecutable.h">
185+
<Filter>Header Files</Filter>
186+
</ClCompile>
187+
<ClCompile Include="BrowserSubprocessExecutable.h">
188+
<Filter>Header Files</Filter>
189+
</ClCompile>
190+
</ItemGroup>
191+
<ItemGroup>
192+
<ResourceCompile Include="Resource.rc" />
193+
</ItemGroup>
194+
<ItemGroup>
195+
<None Include="packages.config" />
196+
</ItemGroup>
197+
</Project>

0 commit comments

Comments
 (0)