Remove Alloy Bootstrap (M128) (continued)

- Fix netcore lib Resolves #4795
cefsharp · Sep 19, 2024 · ab34cf1 · ab34cf1
1 parent 19739ab
commit ab34cf1
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 120 deletions.
diff --git a/CefSharp.Core.Runtime.RefAssembly/CefSharp.Core.Runtime.netcore.cs b/CefSharp.Core.Runtime.RefAssembly/CefSharp.Core.Runtime.netcore.cs
@@ -57,7 +57,7 @@ public Cef() { }
         public static bool CrashReportingEnabled { get { throw null; } }
         public static System.Threading.Tasks.TaskFactory FileThreadTaskFactory { get { throw null; } set { } }
         public static System.Threading.Tasks.TaskFactory IOThreadTaskFactory { get { throw null; } set { } }
-        public static bool IsInitialized { get { throw null; } }
+        public static bool? IsInitialized { get { throw null; } }
         public static bool IsShutdown { get { throw null; } }
         public static System.Threading.Tasks.TaskFactory UIThreadTaskFactory { get { throw null; } set { } }
         public static bool AddCrossOriginWhitelistEntry(string sourceOrigin, string targetProtocol, string targetDomain, bool allowTargetSubdomains) { throw null; }
@@ -103,7 +103,6 @@ public CefSettingsBase() { }
         public string CachePath { get { throw null; } set { } }
         public CefSharp.Internals.CommandLineArgDictionary CefCommandLineArgs { get { throw null; } }
         public System.Collections.Generic.IEnumerable<CefSharp.CefCustomScheme> CefCustomSchemes { get { throw null; } }
-        public bool ChromeRuntime { get { throw null; } set { } }
         public bool CommandLineArgsDisabled { get { throw null; } set { } }
         public bool CookieableSchemesExcludeDefaults { get { throw null; } set { } }
         public string CookieableSchemesList { get { throw null; } set { } }
@@ -114,9 +113,7 @@ public CefSettingsBase() { }
         public string LogFile { get { throw null; } set { } }
         public CefSharp.LogSeverity LogSeverity { get { throw null; } set { } }
         public bool MultiThreadedMessageLoop { get { throw null; } set { } }
-        public bool PackLoadingDisabled { get { throw null; } set { } }
         public bool PersistSessionCookies { get { throw null; } set { } }
-        public bool PersistUserPreferences { get { throw null; } set { } }
         public int RemoteDebuggingPort { get { throw null; } set { } }
         public string ResourcesDirPath { get { throw null; } set { } }
         public string RootCachePath { get { throw null; } set { } }
@@ -270,20 +267,15 @@ public virtual void ClearHttpAuthCredentials(CefSharp.ICompletionCallback callba
         public virtual bool ClearSchemeHandlerFactories() { throw null; }
         public virtual void CloseAllConnections(CefSharp.ICompletionCallback callback) { }
         public static CefSharp.IRequestContext CreateContext(CefSharp.IRequestContext other, CefSharp.IRequestContextHandler requestContextHandler) { throw null; }
-        public virtual bool DidLoadExtension(string extensionId) { throw null; }
         public void Dispose() { }
         protected virtual void Dispose(bool A_0) { }
         ~RequestContext() { }
         public virtual System.Collections.Generic.IDictionary<string, object> GetAllPreferences(bool includeDefaults) { throw null; }
         public virtual CefSharp.ICookieManager GetCookieManager(CefSharp.ICompletionCallback callback) { throw null; }
-        public virtual CefSharp.IExtension GetExtension(string extensionId) { throw null; }
-        public virtual bool GetExtensions(out System.Collections.Generic.IList<string> extensionIds) { throw null; }
         public virtual object GetPreference(string name) { throw null; }
-        public virtual bool HasExtension(string extensionId) { throw null; }
         public virtual bool HasPreference(string name) { throw null; }
         public virtual bool IsSame(CefSharp.IRequestContext context) { throw null; }
         public virtual bool IsSharingWith(CefSharp.IRequestContext context) { throw null; }
-        public virtual void LoadExtension(string rootDirectory, string manifestJson, CefSharp.IExtensionHandler handler) { }
         public virtual bool RegisterSchemeHandlerFactory(string schemeName, string domainName, CefSharp.ISchemeHandlerFactory factory) { throw null; }
         public virtual System.Threading.Tasks.Task<CefSharp.ResolveCallbackResult> ResolveHostAsync(System.Uri origin) { throw null; }
         public virtual bool SetPreference(string name, object value, out string error) { throw null; }
@@ -298,7 +290,6 @@ public RequestContextSettings() { }
         public bool CookieableSchemesExcludeDefaults { get { throw null; } set { } }
         public string CookieableSchemesList { get { throw null; } set { } }
         public bool PersistSessionCookies { get { throw null; } set { } }
-        public bool PersistUserPreferences { get { throw null; } set { } }
         public void Dispose() { }
         protected virtual void Dispose(bool A_0) { }
         ~RequestContextSettings() { }

diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj
@@ -335,7 +335,6 @@
     <ClCompile Include="CookieManager.cpp" />
     <ClCompile Include="Internals\CefBrowserHostWrapper.cpp" />
     <ClCompile Include="Internals\CefContextMenuParamsWrapper.cpp" />
-    <ClCompile Include="Internals\CefExtensionWrapper.cpp" />
     <ClCompile Include="Internals\CefFrameWrapper.cpp" />
     <ClCompile Include="Internals\CefBrowserWrapper.cpp" />
     <ClCompile Include="Internals\CefRefCountManaged.cpp" />
@@ -374,9 +373,6 @@
     <ClInclude Include="Internals\CefRegistrationWrapper.h" />
     <ClInclude Include="Internals\CefResourceReadCallbackWrapper.h" />
     <ClInclude Include="Internals\CefCookieAccessFilterAdapter.h" />
-    <ClInclude Include="Internals\CefExtensionHandlerAdapter.h" />
-    <ClInclude Include="Internals\CefExtensionWrapper.h" />
-    <ClInclude Include="Internals\CefGetExtensionResourceCallbackWrapper.h" />
     <ClInclude Include="Internals\CefResourceRequestHandlerAdapter.h" />
     <ClInclude Include="Internals\CefResourceSkipCallbackWrapper.h" />
     <ClInclude Include="Internals\CefRunFileDialogCallbackAdapter.h" />

diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj.filters b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj.filters
@@ -62,9 +62,6 @@
     <ClCompile Include="Internals\CefValueWrapper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Internals\CefExtensionWrapper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="RequestContext.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -124,7 +121,7 @@
     <ClInclude Include="Internals\CefTaskScheduler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-	<ClInclude Include="Internals\CefPermissionPromptCallbackWrapper.h">
+    <ClInclude Include="Internals\CefPermissionPromptCallbackWrapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Internals\CefMediaAccessCallbackWrapper.h">
@@ -262,15 +259,6 @@
     <ClInclude Include="Internals\CefValueWrapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Internals\CefGetExtensionResourceCallbackWrapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Internals\CefExtensionWrapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Internals\CefExtensionHandlerAdapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Internals\CefRunFileDialogCallbackAdapter.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj
@@ -276,7 +276,6 @@
     <ClInclude Include="Internals\CefRegistrationWrapper.h" />
     <ClInclude Include="Internals\CefResourceReadCallbackWrapper.h" />
     <ClInclude Include="Internals\CefCookieAccessFilterAdapter.h" />
-    <ClInclude Include="Internals\CefGetExtensionResourceCallbackWrapper.h" />
     <ClInclude Include="Internals\CefResourceRequestHandlerAdapter.h" />
     <ClInclude Include="Internals\CefResourceSkipCallbackWrapper.h" />
     <ClInclude Include="Internals\CefRunFileDialogCallbackAdapter.h" />

diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj.filters b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj.filters
@@ -253,9 +253,6 @@
     <ClInclude Include="Internals\CefValueWrapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Internals\CefGetExtensionResourceCallbackWrapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Internals\CefRunFileDialogCallbackAdapter.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/CefSharp.Core.Runtime/Internals/CefGetExtensionResourceCallbackWrapper.h b/CefSharp.Core.Runtime/Internals/CefGetExtensionResourceCallbackWrapper.h
diff --git a/CefSharp.Core/RequestContext.netcore.cs b/CefSharp.Core/RequestContext.netcore.cs
@@ -41,21 +41,6 @@ public RequestContext(CefSharp.RequestContextSettings settings, CefSharp.IReques
         {
         }
 
-        public override void LoadExtension(string rootDirectory, string manifestJson, IExtensionHandler handler)
-        {
-            if (Cef.CurrentlyOnThread(CefThreadIds.TID_UI))
-            {
-                base.LoadExtension(rootDirectory, manifestJson, handler);
-            }
-            else
-            {
-                Cef.UIThreadTaskFactory.StartNew(() =>
-                {
-                    base.LoadExtension(rootDirectory, manifestJson, handler);
-                });
-            }
-        }
-
         /// <summary>
         /// Creates a new RequestContextBuilder which can be used to fluently set
         /// preferences