Skip to content

Commit 8a367fb

Browse files
amaitlandamaitland
authored
Refactor CefSharp.Core into CefSharp.Core.Runtime (#3311)
* Net Core - Rename CefSharp.Core.dll to CefSharp.Core.Runtime.dll Partial rename, only Net Core, folder not renamed * Net Core - Rename CefSharp.Core.RefAssembly to CefSharp.Core.netcore Remove GenApi * Core - Rename CefDragDataWrapper to DragData Move into CefSharp.Core namespace * WinForms/WPF/OffScreen - Migrate from GitLink command line to Nuget package * Net Core - Refactor to have CefSharp.Core.dll contain only public Api * Net Core - Remove CefSharp.Core.RefAssembly * Net Core - Change CefSharp.Core.netcore output folder * Net Core - Restructure nuget packages * Net Core - Add Cefsharp.Core.Runtime.RefAssembly * Net Core - Hide CLI/C++ classes from intellisense Make sure users don't attempt to load them directly * Rename CefSharp.Core to CefSharp.Core.Runtime * Core - Restructure Net 4.5.2 packages to use CefSharp.Core.dll anycpu variant Attempt to load CefSharp.Core.Runtime at runtime rather than having to use msbuild to copy the correct version * Rename CefSharp.Core.netcore to CefSharp.Core * WPF/WinForms/OffScreen - Change from x86/64 to AnyCPU As they are all managed assemblies they can target AnyCPU. Includes CefSharp.dll * Convert RequestContextBuilder from C++ to C# Now part of the CefSharp.Core PublicApi * Update version number to 87.1.11 * Migrate more of the public Api to C# * Net Core - Basic restructure complete * Net Core - ModuleInitializer (Doesn't work yet) * Remove direct references to BrowserSettings * Net Core - ModuleInitializer load CefShar.Core.Runtime.dl * Net Core - Load libcef.dll via CLR Module initializer If no RID is specified then we can load libcef.dll using the module initializer * Add version to CefSharp.Core * Remove dependency on CefSharp.Core.Runtime Rewrite common targets * AnyCPU app.config transform Improve AnyCPU support * Improve Net Core 3 support Only delete CefSharp.Core.Runtime.dll when AnyCPU * Nuget - Add CefSharp.Core.Runtime reference when TargetFramework = NetCore * Fix Typos Based on #3306 * Net Core - Rename CefSharp.Core.Runtime RefAssembly source file * Net Full - Generate CefSharp.Core.Runtime Ref Assembly For now the powershell build script generates the .cs file based on a x86 release build.ps1 It's not possible to directly install GenApi as it requires a Sdk style project * Net Core - Old packages copy files to required folders * Test - Install newer .Net Compiler and set Lang Version to 7.3 * Net Core - Exclude Net 452 Runtime generated reference source * Core - Add Refactoring TODO * Ref Assembly - Generate source as part of build - Move ref assembly source generate into GenerateRefAssemblySource.ps1 - Call before project build Runs locally, see if Appveyor has a problem with the powershell script execution * Core - Add more factory methods to create instances of managed wrappers * Net Core - Make Initialzier properties internal Not quite sure what the public API should look like as yet, so making internal for now.
1 parent 149bda0 commit 8a367fb

File tree

230 files changed

+7126
-5341
lines changed

Some content is hidden

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

230 files changed

+7126
-5341
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,4 @@ x64/Release
4141
Win32/Release
4242
.vs/
4343
/Help
44+
/tools

‎CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodHandler.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
#include "stdafx.h"
66
#include "JavascriptAsyncMethodHandler.h"
7-
#include "../CefSharp.Core/Internals/Messaging/Messages.h"
8-
#include "../CefSharp.Core/Internals/Serialization/Primitives.h"
7+
#include "../CefSharp.Core.Runtime/Internals/Messaging/Messages.h"
8+
#include "../CefSharp.Core.Runtime/Internals/Serialization/Primitives.h"
99
#include "Serialization/V8Serialization.h"
1010
#include "CefAppUnmanagedWrapper.h"
1111

‎CefSharp.BrowserSubprocess.Core/BindObjectAsyncHandler.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
#include "include/cef_v8.h"
88
#include "RegisterBoundObjectRegistry.h"
9-
#include "..\CefSharp.Core\Internals\Messaging\Messages.h"
10-
#include "..\CefSharp.Core\Internals\Serialization\Primitives.h"
9+
#include "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
10+
#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
1111

1212
using namespace System;
1313
using namespace CefSharp::Internals::Messaging;

‎CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include "Wrapper\V8Context.h"
2020
#include "Wrapper\Frame.h"
2121
#include "Wrapper\Browser.h"
22-
#include "..\CefSharp.Core\Internals\Messaging\Messages.h"
23-
#include "..\CefSharp.Core\Internals\Serialization\Primitives.h"
22+
#include "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
23+
#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
2424

2525
using namespace System;
2626
using namespace System::Diagnostics;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
<ClInclude Include="JavascriptObjectWrapper.h">
3333
<Filter>Header Files</Filter>
3434
</ClInclude>
35-
<ClInclude Include="..\CefSharp.Core\Internals\MCefRefPtr.h">
35+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\MCefRefPtr.h">
3636
<Filter>Header Files</Filter>
3737
</ClInclude>
38-
<ClInclude Include="..\CefSharp.Core\Internals\StringUtils.h">
38+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\StringUtils.h">
3939
<Filter>Header Files</Filter>
4040
</ClInclude>
4141
<ClInclude Include="TypeUtils.h">
@@ -56,10 +56,10 @@
5656
<ClInclude Include="JavascriptCallbackWrapper.h">
5757
<Filter>Header Files</Filter>
5858
</ClInclude>
59-
<ClInclude Include="..\CefSharp.Core\Internals\ReportUnhandledExceptions.h">
59+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\ReportUnhandledExceptions.h">
6060
<Filter>Header Files</Filter>
6161
</ClInclude>
62-
<ClInclude Include="..\CefSharp.Core\Internals\Serialization\Primitives.h">
62+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h">
6363
<Filter>Header Files</Filter>
6464
</ClInclude>
6565
<ClInclude Include="Serialization\V8Serialization.h">
@@ -77,7 +77,7 @@
7777
<ClInclude Include="Async\JavascriptAsyncMethodCallback.h">
7878
<Filter>Header Files</Filter>
7979
</ClInclude>
80-
<ClInclude Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.h">
80+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.h">
8181
<Filter>Header Files</Filter>
8282
</ClInclude>
8383
<ClInclude Include="Serialization\JsObjectsSerialization.h">
@@ -148,7 +148,7 @@
148148
<ClCompile Include="JavascriptCallbackRegistry.cpp">
149149
<Filter>Source Files</Filter>
150150
</ClCompile>
151-
<ClCompile Include="..\CefSharp.Core\Internals\Serialization\Primitives.cpp">
151+
<ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.cpp">
152152
<Filter>Source Files</Filter>
153153
</ClCompile>
154154
<ClCompile Include="Serialization\V8Serialization.cpp">
@@ -166,7 +166,7 @@
166166
<ClCompile Include="Async\JavascriptAsyncMethodCallback.cpp">
167167
<Filter>Source Files</Filter>
168168
</ClCompile>
169-
<ClCompile Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.cpp">
169+
<ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.cpp">
170170
<Filter>Source Files</Filter>
171171
</ClCompile>
172172
<ClCompile Include="Serialization\JsObjectsSerialization.cpp">

‎CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,11 @@
174174
</Manifest>
175175
</ItemDefinitionGroup>
176176
<ItemGroup>
177-
<ClInclude Include="..\CefSharp.Core\Internals\MCefRefPtr.h" />
178-
<ClInclude Include="..\CefSharp.Core\Internals\ReportUnhandledExceptions.h" />
179-
<ClInclude Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.h" />
180-
<ClInclude Include="..\CefSharp.Core\Internals\Serialization\Primitives.h" />
181-
<ClInclude Include="..\CefSharp.Core\Internals\StringUtils.h" />
177+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\MCefRefPtr.h" />
178+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\ReportUnhandledExceptions.h" />
179+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.h" />
180+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h" />
181+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\StringUtils.h" />
182182
<ClInclude Include="BindObjectAsyncHandler.h" />
183183
<ClCompile Include="BrowserSubprocessExecutable.h" />
184184
<ClInclude Include="Cef.h" />
@@ -207,8 +207,8 @@
207207
<ClInclude Include="vcclr_local.h" />
208208
</ItemGroup>
209209
<ItemGroup>
210-
<ClCompile Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.cpp" />
211-
<ClCompile Include="..\CefSharp.Core\Internals\Serialization\Primitives.cpp" />
210+
<ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.cpp" />
211+
<ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.cpp" />
212212
<ClCompile Include="AssemblyInfo.cpp" />
213213
<ClCompile Include="Async\JavascriptAsyncMethodCallback.cpp" />
214214
<ClCompile Include="Async\JavascriptAsyncMethodHandler.cpp" />

‎CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\packages\cef.sdk.87.1.12\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.87.1.12\build\cef.sdk.props')" />
4+
<Import Project="..\packages\GitLink.3.1.0\build\GitLink.props" Condition="Exists('..\packages\GitLink.3.1.0\build\GitLink.props')" />
45
<ItemGroup Label="ProjectConfigurations">
56
<ProjectConfiguration Include="Debug|Win32">
67
<Configuration>Debug</Configuration>
@@ -167,11 +168,11 @@
167168
<Reference Include="System.ServiceModel" />
168169
</ItemGroup>
169170
<ItemGroup>
170-
<ClInclude Include="..\CefSharp.Core\Internals\MCefRefPtr.h" />
171-
<ClInclude Include="..\CefSharp.Core\Internals\ReportUnhandledExceptions.h" />
172-
<ClInclude Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.h" />
173-
<ClInclude Include="..\CefSharp.Core\Internals\Serialization\Primitives.h" />
174-
<ClInclude Include="..\CefSharp.Core\Internals\StringUtils.h" />
171+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\MCefRefPtr.h" />
172+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\ReportUnhandledExceptions.h" />
173+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.h" />
174+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h" />
175+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\StringUtils.h" />
175176
<ClInclude Include="BindObjectAsyncHandler.h" />
176177
<ClCompile Include="BrowserSubprocessExecutable.h" />
177178
<ClInclude Include="Cef.h" />
@@ -208,8 +209,8 @@
208209
<ClInclude Include="vcclr_local.h" />
209210
</ItemGroup>
210211
<ItemGroup>
211-
<ClCompile Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.cpp" />
212-
<ClCompile Include="..\CefSharp.Core\Internals\Serialization\Primitives.cpp" />
212+
<ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.cpp" />
213+
<ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.cpp" />
213214
<ClCompile Include="AssemblyInfo.cpp" />
214215
<ClCompile Include="Async\JavascriptAsyncMethodCallback.cpp" />
215216
<ClCompile Include="Async\JavascriptAsyncMethodHandler.cpp" />
@@ -247,5 +248,7 @@
247248
<None Include="packages.CefSharp.BrowserSubprocess.Core.config" />
248249
</ItemGroup>
249250
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
250-
<ImportGroup Label="ExtensionTargets" />
251+
<ImportGroup Label="ExtensionTargets">
252+
<Import Project="..\packages\GitLink.3.1.0\build\GitLink.targets" Condition="Exists('..\packages\GitLink.3.1.0\build\GitLink.targets')" />
253+
</ImportGroup>
251254
</Project>

‎CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj.filters‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
<ClInclude Include="JavascriptObjectWrapper.h">
3333
<Filter>Header Files</Filter>
3434
</ClInclude>
35-
<ClInclude Include="..\CefSharp.Core\Internals\MCefRefPtr.h">
35+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\MCefRefPtr.h">
3636
<Filter>Header Files</Filter>
3737
</ClInclude>
38-
<ClInclude Include="..\CefSharp.Core\Internals\StringUtils.h">
38+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\StringUtils.h">
3939
<Filter>Header Files</Filter>
4040
</ClInclude>
4141
<ClInclude Include="TypeUtils.h">
@@ -56,10 +56,10 @@
5656
<ClInclude Include="JavascriptCallbackWrapper.h">
5757
<Filter>Header Files</Filter>
5858
</ClInclude>
59-
<ClInclude Include="..\CefSharp.Core\Internals\ReportUnhandledExceptions.h">
59+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\ReportUnhandledExceptions.h">
6060
<Filter>Header Files</Filter>
6161
</ClInclude>
62-
<ClInclude Include="..\CefSharp.Core\Internals\Serialization\Primitives.h">
62+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h">
6363
<Filter>Header Files</Filter>
6464
</ClInclude>
6565
<ClInclude Include="Serialization\V8Serialization.h">
@@ -77,7 +77,7 @@
7777
<ClInclude Include="Async\JavascriptAsyncMethodCallback.h">
7878
<Filter>Header Files</Filter>
7979
</ClInclude>
80-
<ClInclude Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.h">
80+
<ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.h">
8181
<Filter>Header Files</Filter>
8282
</ClInclude>
8383
<ClInclude Include="Serialization\JsObjectsSerialization.h">
@@ -154,7 +154,7 @@
154154
<ClCompile Include="JavascriptCallbackRegistry.cpp">
155155
<Filter>Source Files</Filter>
156156
</ClCompile>
157-
<ClCompile Include="..\CefSharp.Core\Internals\Serialization\Primitives.cpp">
157+
<ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.cpp">
158158
<Filter>Source Files</Filter>
159159
</ClCompile>
160160
<ClCompile Include="Serialization\V8Serialization.cpp">
@@ -172,7 +172,7 @@
172172
<ClCompile Include="Async\JavascriptAsyncMethodCallback.cpp">
173173
<Filter>Source Files</Filter>
174174
</ClCompile>
175-
<ClCompile Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.cpp">
175+
<ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.cpp">
176176
<Filter>Source Files</Filter>
177177
</ClCompile>
178178
<ClCompile Include="Serialization\JsObjectsSerialization.cpp">

‎CefSharp.BrowserSubprocess.Core/JavascriptPostMessageHandler.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#pragma once
66

77
#include "include/cef_v8.h"
8-
#include "..\CefSharp.Core\Internals\Messaging\Messages.h"
9-
#include "..\CefSharp.Core\Internals\Serialization\Primitives.h"
8+
#include "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
9+
#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
1010
#include "Serialization\V8Serialization.h"
1111

1212
using namespace System;

‎CefSharp.BrowserSubprocess.Core/JavascriptPromiseHandler.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#pragma once
66

77
#include "include/cef_v8.h"
8-
#include "..\CefSharp.Core\Internals\Messaging\Messages.h"
9-
#include "..\CefSharp.Core\Internals\Serialization\Primitives.h"
8+
#include "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
9+
#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
1010
#include "Serialization\V8Serialization.h"
1111

1212
using namespace System;

0 commit comments

Comments
 (0)