Merge 9f8613f into 149bda0

cefsharp · Dec 16, 2020 · 3ac022a · 3ac022a
2 parents 149bda0 + 9f8613f
commit 3ac022a
Show file tree

Hide file tree

Showing 230 changed files with 7,126 additions and 5,341 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,3 +41,4 @@ x64/Release
 Win32/Release
 .vs/
 /Help
+/tools
diff --git a/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodHandler.cpp b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodHandler.cpp
@@ -4,8 +4,8 @@
 
 #include "stdafx.h"
 #include "JavascriptAsyncMethodHandler.h"
-#include "../CefSharp.Core/Internals/Messaging/Messages.h"
-#include "../CefSharp.Core/Internals/Serialization/Primitives.h"
+#include "../CefSharp.Core.Runtime/Internals/Messaging/Messages.h"
+#include "../CefSharp.Core.Runtime/Internals/Serialization/Primitives.h"
 #include "Serialization/V8Serialization.h"
 #include "CefAppUnmanagedWrapper.h"
 

diff --git a/CefSharp.BrowserSubprocess.Core/BindObjectAsyncHandler.h b/CefSharp.BrowserSubprocess.Core/BindObjectAsyncHandler.h
@@ -6,8 +6,8 @@
 
 #include "include/cef_v8.h"
 #include "RegisterBoundObjectRegistry.h"
-#include "..\CefSharp.Core\Internals\Messaging\Messages.h"
-#include "..\CefSharp.Core\Internals\Serialization\Primitives.h"
+#include "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
+#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
 
 using namespace System;
 using namespace CefSharp::Internals::Messaging;

diff --git a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp
@@ -19,8 +19,8 @@
 #include "Wrapper\V8Context.h"
 #include "Wrapper\Frame.h"
 #include "Wrapper\Browser.h"
-#include "..\CefSharp.Core\Internals\Messaging\Messages.h"
-#include "..\CefSharp.Core\Internals\Serialization\Primitives.h"
+#include "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
+#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
 
 using namespace System;
 using namespace System::Diagnostics;

diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.filters b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.filters
@@ -32,10 +32,10 @@
     <ClInclude Include="JavascriptObjectWrapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CefSharp.Core\Internals\MCefRefPtr.h">
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\MCefRefPtr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CefSharp.Core\Internals\StringUtils.h">
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\StringUtils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="TypeUtils.h">
@@ -56,10 +56,10 @@
     <ClInclude Include="JavascriptCallbackWrapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CefSharp.Core\Internals\ReportUnhandledExceptions.h">
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\ReportUnhandledExceptions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CefSharp.Core\Internals\Serialization\Primitives.h">
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Serialization\V8Serialization.h">
@@ -77,7 +77,7 @@
     <ClInclude Include="Async\JavascriptAsyncMethodCallback.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.h">
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Serialization\JsObjectsSerialization.h">
@@ -148,7 +148,7 @@
     <ClCompile Include="JavascriptCallbackRegistry.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CefSharp.Core\Internals\Serialization\Primitives.cpp">
+    <ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Serialization\V8Serialization.cpp">
@@ -166,7 +166,7 @@
     <ClCompile Include="Async\JavascriptAsyncMethodCallback.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.cpp">
+    <ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Serialization\JsObjectsSerialization.cpp">

diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj
@@ -174,11 +174,11 @@
     </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\CefSharp.Core\Internals\MCefRefPtr.h" />
-    <ClInclude Include="..\CefSharp.Core\Internals\ReportUnhandledExceptions.h" />
-    <ClInclude Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.h" />
-    <ClInclude Include="..\CefSharp.Core\Internals\Serialization\Primitives.h" />
-    <ClInclude Include="..\CefSharp.Core\Internals\StringUtils.h" />
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\MCefRefPtr.h" />
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\ReportUnhandledExceptions.h" />
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.h" />
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h" />
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\StringUtils.h" />
     <ClInclude Include="BindObjectAsyncHandler.h" />
     <ClCompile Include="BrowserSubprocessExecutable.h" />
     <ClInclude Include="Cef.h" />
@@ -207,8 +207,8 @@
     <ClInclude Include="vcclr_local.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.cpp" />
-    <ClCompile Include="..\CefSharp.Core\Internals\Serialization\Primitives.cpp" />
+    <ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.cpp" />
+    <ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.cpp" />
     <ClCompile Include="AssemblyInfo.cpp" />
     <ClCompile Include="Async\JavascriptAsyncMethodCallback.cpp" />
     <ClCompile Include="Async\JavascriptAsyncMethodHandler.cpp" />

diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\cef.sdk.87.1.12\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.87.1.12\build\cef.sdk.props')" />
+  <Import Project="..\packages\GitLink.3.1.0\build\GitLink.props" Condition="Exists('..\packages\GitLink.3.1.0\build\GitLink.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -167,11 +168,11 @@
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\CefSharp.Core\Internals\MCefRefPtr.h" />
-    <ClInclude Include="..\CefSharp.Core\Internals\ReportUnhandledExceptions.h" />
-    <ClInclude Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.h" />
-    <ClInclude Include="..\CefSharp.Core\Internals\Serialization\Primitives.h" />
-    <ClInclude Include="..\CefSharp.Core\Internals\StringUtils.h" />
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\MCefRefPtr.h" />
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\ReportUnhandledExceptions.h" />
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.h" />
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h" />
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\StringUtils.h" />
     <ClInclude Include="BindObjectAsyncHandler.h" />
     <ClCompile Include="BrowserSubprocessExecutable.h" />
     <ClInclude Include="Cef.h" />
@@ -208,8 +209,8 @@
     <ClInclude Include="vcclr_local.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.cpp" />
-    <ClCompile Include="..\CefSharp.Core\Internals\Serialization\Primitives.cpp" />
+    <ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.cpp" />
+    <ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.cpp" />
     <ClCompile Include="AssemblyInfo.cpp" />
     <ClCompile Include="Async\JavascriptAsyncMethodCallback.cpp" />
     <ClCompile Include="Async\JavascriptAsyncMethodHandler.cpp" />
@@ -247,5 +248,7 @@
     <None Include="packages.CefSharp.BrowserSubprocess.Core.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\packages\GitLink.3.1.0\build\GitLink.targets" Condition="Exists('..\packages\GitLink.3.1.0\build\GitLink.targets')" />
+  </ImportGroup>
 </Project>
diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj.filters b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj.filters
@@ -32,10 +32,10 @@
     <ClInclude Include="JavascriptObjectWrapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CefSharp.Core\Internals\MCefRefPtr.h">
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\MCefRefPtr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CefSharp.Core\Internals\StringUtils.h">
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\StringUtils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="TypeUtils.h">
@@ -56,10 +56,10 @@
     <ClInclude Include="JavascriptCallbackWrapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CefSharp.Core\Internals\ReportUnhandledExceptions.h">
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\ReportUnhandledExceptions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CefSharp.Core\Internals\Serialization\Primitives.h">
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Serialization\V8Serialization.h">
@@ -77,7 +77,7 @@
     <ClInclude Include="Async\JavascriptAsyncMethodCallback.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.h">
+    <ClInclude Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Serialization\JsObjectsSerialization.h">
@@ -154,7 +154,7 @@
     <ClCompile Include="JavascriptCallbackRegistry.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CefSharp.Core\Internals\Serialization\Primitives.cpp">
+    <ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Serialization\V8Serialization.cpp">
@@ -172,7 +172,7 @@
     <ClCompile Include="Async\JavascriptAsyncMethodCallback.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CefSharp.Core\Internals\Serialization\ObjectsSerialization.cpp">
+    <ClCompile Include="..\CefSharp.Core.Runtime\Internals\Serialization\ObjectsSerialization.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Serialization\JsObjectsSerialization.cpp">

diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptPostMessageHandler.h b/CefSharp.BrowserSubprocess.Core/JavascriptPostMessageHandler.h
@@ -5,8 +5,8 @@
 #pragma once
 
 #include "include/cef_v8.h"
-#include "..\CefSharp.Core\Internals\Messaging\Messages.h"
-#include "..\CefSharp.Core\Internals\Serialization\Primitives.h"
+#include "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
+#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
 #include "Serialization\V8Serialization.h"
 
 using namespace System;

diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptPromiseHandler.h b/CefSharp.BrowserSubprocess.Core/JavascriptPromiseHandler.h
@@ -5,8 +5,8 @@
 #pragma once
 
 #include "include/cef_v8.h"
-#include "..\CefSharp.Core\Internals\Messaging\Messages.h"
-#include "..\CefSharp.Core\Internals\Serialization\Primitives.h"
+#include "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
+#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
 #include "Serialization\V8Serialization.h"
 
 using namespace System;

diff --git a/CefSharp.BrowserSubprocess.Core/RegisterBoundObjectHandler.h b/CefSharp.BrowserSubprocess.Core/RegisterBoundObjectHandler.h
@@ -6,8 +6,8 @@
 
 #include "include/cef_v8.h"
 #include "RegisterBoundObjectRegistry.h"
-#include "..\CefSharp.Core\Internals\Messaging\Messages.h"
-#include "..\CefSharp.Core\Internals\Serialization\Primitives.h"
+#include "..\CefSharp.Core.Runtime\Internals\Messaging\Messages.h"
+#include "..\CefSharp.Core.Runtime\Internals\Serialization\Primitives.h"
 
 using namespace System;
 using namespace CefSharp::Internals::Messaging;

diff --git a/CefSharp.BrowserSubprocess.Core/Resource.rc b/CefSharp.BrowserSubprocess.Core/Resource.rc
@@ -1,6 +1,6 @@
 1 VERSIONINFO
- FILEVERSION 86,0,20
- PRODUCTVERSION 86,0,20
+ FILEVERSION 87,1,11
+ PRODUCTVERSION 87,1,11
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -16,10 +16,10 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "CefSharp.BrowserSubprocess.Core"
-            VALUE "FileVersion", "86.0.20"
+            VALUE "FileVersion", "87.1.11"
             VALUE "LegalCopyright", "Copyright © 2020 The CefSharp Authors"
             VALUE "ProductName", "CefSharp"
-            VALUE "ProductVersion", "86.0.20"
+            VALUE "ProductVersion", "87.1.11"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/CefSharp.BrowserSubprocess.Core/Serialization/JsObjectsSerialization.cpp b/CefSharp.BrowserSubprocess.Core/Serialization/JsObjectsSerialization.cpp
@@ -4,8 +4,8 @@
 
 #include "stdafx.h"
 #include "JsObjectsSerialization.h"
-#include "../CefSharp.Core/Internals/Serialization/Primitives.h"
-#include "../CefSharp.Core/Internals/Serialization/ObjectsSerialization.h"
+#include "../CefSharp.Core.Runtime/Internals/Serialization/Primitives.h"
+#include "../CefSharp.Core.Runtime/Internals/Serialization/ObjectsSerialization.h"
 
 namespace CefSharp
 {

diff --git a/CefSharp.BrowserSubprocess.Core/Serialization/V8Serialization.cpp b/CefSharp.BrowserSubprocess.Core/Serialization/V8Serialization.cpp
@@ -1,11 +1,11 @@
-// Copyright © 2015 The CefSharp Authors. All rights reserved.
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
 //
 // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 
 #include "Stdafx.h"
 #include "V8Serialization.h"
 #include "JavascriptCallbackRegistry.h"
-#include "../CefSharp.Core/Internals/Serialization/Primitives.h"
+#include "../CefSharp.Core.Runtime/Internals/Serialization/Primitives.h"
 
 #include <deque>
 
@@ -185,4 +185,4 @@ namespace CefSharp
             template CefRefPtr<CefV8Value> DeserializeV8Object(const CefRefPtr<CefDictionaryValue>& list, const CefString& index);
         }
     }
-}
+}
diff --git a/CefSharp.BrowserSubprocess.Core/Stdafx.h b/CefSharp.BrowserSubprocess.Core/Stdafx.h
@@ -14,10 +14,10 @@
 
 #include <include/cef_base.h>
 
-#include ".\..\CefSharp.Core\Internals\MCefRefPtr.h"
-#include ".\..\CefSharp.Core\Internals\StringUtils.h"
+#include ".\..\CefSharp.Core.Runtime\Internals\MCefRefPtr.h"
+#include ".\..\CefSharp.Core.Runtime\Internals\StringUtils.h"
 #include "vcclr_local.h"
 
 using namespace System;
 using namespace CefSharp;
-using namespace CefSharp::Internals;
+using namespace CefSharp::Internals;
diff --git a/CefSharp.BrowserSubprocess.Core/TypeUtils.cpp b/CefSharp.BrowserSubprocess.Core/TypeUtils.cpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "Stdafx.h"
-#include ".\..\CefSharp.Core\Internals\StringUtils.h"
+#include ".\..\CefSharp.Core.Runtime\Internals\StringUtils.h"
 #include "TypeUtils.h"
 
 using namespace System::Collections::Generic;

diff --git a/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.config b/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="cef.sdk" version="87.1.12" targetFramework="native" />
+  <package id="GitLink" version="3.1.0" targetFramework="native" developmentDependency="true" />
 </packages>
diff --git a/CefSharp.BrowserSubprocess/app.manifest b/CefSharp.BrowserSubprocess/app.manifest
@@ -8,7 +8,7 @@
     xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <assemblyIdentity version="86.0.20.0" name="CefSharp.BrowserSubprocess.app" />
+  <assemblyIdentity version="87.1.11.0" name="CefSharp.BrowserSubprocess.app" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,3 +41,4 @@ x64/Release @@
     Win32/Release
     .vs/
     /Help
+    /tools