Merge 7a63da8 into 15cf58c

cefsharp · Oct 9, 2021 · 91d8510 · 91d8510
2 parents 15cf58c + 7a63da8
commit 91d8510
Showing 1 changed file with 30 additions and 3 deletions.
diff --git a/CefSharp/DependencyChecker.cs b/CefSharp/DependencyChecker.cs
@@ -6,6 +6,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+#if NETCOREAPP
+using System.Runtime.InteropServices;
+#endif
 using System.Text;
 
 namespace CefSharp
@@ -52,9 +55,9 @@ public static class DependencyChecker
         };
 
         /// <summary>
-        /// List of Optional CEF Dependencies
+        /// List of Optional CEF Dependencies (x86/x64)
         /// </summary>
-        public static string[] CefOptionalDependencies =
+        public static string[] CefOptionalDependenciesX86X64 =
         {
             // Angle and Direct3D support
             // Note: Without these components HTML5 accelerated content like 2D canvas, 3D CSS and WebGL will not function.
@@ -65,6 +68,21 @@ public static class DependencyChecker
             "chrome_elf.dll"
         };
 
+#if NETCOREAPP
+        /// <summary>
+        /// List of Optional CEF Dependencies (arm64)
+        /// </summary>
+        public static string[] CefOptionalDependenciesArm64 =
+        {
+            // Angle support
+            // Note: Without these components HTML5 accelerated content like 2D canvas, 3D CSS and WebGL will not function.
+            "libEGL.dll",
+            "libGLESv2.dll",
+            //Crashpad support
+            "chrome_elf.dll"
+        };
+#endif
+
         /// <summary>
         /// List of CefSharp Managed Dependencies (Those that are AnyCPU written in c#)
         /// </summary>
@@ -140,7 +158,16 @@ public static List<string> CheckDependencies(bool checkOptional, bool packLoadin
 
             if (checkOptional)
             {
-                missingDependencies.AddRange(CheckDependencyList(nativeLibPath, CefOptionalDependencies));
+                var optionalDependencies = CefOptionalDependenciesX86X64;
+
+#if NETCOREAPP
+                if (RuntimeInformation.ProcessArchitecture is Architecture.Arm64)
+                {
+                    optionalDependencies = CefOptionalDependenciesArm64;
+                }
+#endif
+
+                missingDependencies.AddRange(CheckDependencyList(nativeLibPath, optionalDependencies));
             }
 
 #if NETCOREAPP