diff --git a/src/Chromely.CefSharp.Integration.TestApp/Chromely.CefSharp.Integration.TestApp.csproj b/src/Chromely.CefSharp.Integration.TestApp/Chromely.CefSharp.Integration.TestApp.csproj index 67c92a0..885c4f2 100644 --- a/src/Chromely.CefSharp.Integration.TestApp/Chromely.CefSharp.Integration.TestApp.csproj +++ b/src/Chromely.CefSharp.Integration.TestApp/Chromely.CefSharp.Integration.TestApp.csproj @@ -5,16 +5,21 @@ netcoreapp3.1 true false - x64 chromely.ico + + $(NETCoreSdkRuntimeIdentifier) + false - + - + diff --git a/src/Chromely.CefSharp/Browser/ChromiumBrowser.Dispose.cs b/src/Chromely.CefSharp/Browser/ChromiumBrowser.Dispose.cs index eb2fde9..b2673a1 100644 --- a/src/Chromely.CefSharp/Browser/ChromiumBrowser.Dispose.cs +++ b/src/Chromely.CefSharp/Browser/ChromiumBrowser.Dispose.cs @@ -104,7 +104,7 @@ private void InternalDispose(bool disposing) } //Dispose of BrowserSettings if we created it, if user created then they're responsible - if (_browserSettings != null && _browserSettings.FrameworkCreated) + if (_browserSettings != null && _browserSettings.AutoDispose) { _browserSettings.Dispose(); } diff --git a/src/Chromely.CefSharp/Browser/ChromiumBrowser.cs b/src/Chromely.CefSharp/Browser/ChromiumBrowser.cs index 5007f4d..33e627f 100644 --- a/src/Chromely.CefSharp/Browser/ChromiumBrowser.cs +++ b/src/Chromely.CefSharp/Browser/ChromiumBrowser.cs @@ -29,7 +29,7 @@ public abstract partial class ChromiumBrowser : IWebBrowserInternal /// /// The managed cef browser adapter /// - protected ManagedCefBrowserAdapter _managedCefBrowserAdapter; + protected IBrowserAdapter _managedCefBrowserAdapter; /// /// The browser /// @@ -82,7 +82,6 @@ public ChromiumBrowser(IChromelyNativeHost nativeHost, IChromelyConfiguration co { NativeHost = nativeHost; _config = config; - CefSharpSettings.LegacyJavascriptBindingEnabled = false; } public IChromelyNativeHost NativeHost { get; private set; } @@ -404,7 +403,7 @@ private void InitializeFieldsAndCefIfRequired() _browserSettings = new BrowserSettings(); } - _managedCefBrowserAdapter = new ManagedCefBrowserAdapter(this, false); + _managedCefBrowserAdapter = ManagedCefBrowserAdapter.Create(this, false); _initialized = true; } diff --git a/src/Chromely.CefSharp/Chromely.CefSharp.csproj b/src/Chromely.CefSharp/Chromely.CefSharp.csproj index e21ce46..cdd65e9 100644 --- a/src/Chromely.CefSharp/Chromely.CefSharp.csproj +++ b/src/Chromely.CefSharp/Chromely.CefSharp.csproj @@ -1,31 +1,31 @@  - netstandard2.0;netstandard2.1 - true + net462;netcoreapp3.1;net5.0-windows + NoAction false None - 5.1.86.0 - 5.1.86.0 - 5.1.86.0 - 5.1.86.0 + 5.1.88.0 + 5.1.88.0 + 5.1.88.0 + 5.1.88.0 Chromely Projects Chromely Projects - Chromely CefSharp implementation - this is in NetStandard as it can be used in both .NET Framework, .NET Core 3 and .NET 5 (Windows Only). Chromely.CefSharp version naming is based Chromely and Chromium versions implemented- major.minor.chromuim version.patch e.g 1.0.71.0. - Copyright © 2017-2020 Chromely Projects + Chromely CefSharp implementation - can be used in .Net 4.6.2, .NET Core 3.1 and .NET 5 (Windows Only) projects. Chromely.CefSharp version naming is based Chromely and Chromium versions implemented- major.minor.chromuim version.patch e.g 1.0.71.0. + Copyright © 2017-2021 Chromely Projects https://github.com/chromelyapps/Chromely/blob/master/LICENSE.md https://github.com/chromelyapps/CefSharp https://github.com/chromelyapps/Chromely/blob/master/nugets/chromely.ico?raw=true CEF Chromium HTML5 Desktop Chromely CefSharp NetStandard .NET Core 3 .NET 5 true - - Breaking changes. - - Fixes for frameless window - https://github.com/chromelyapps/Chromely/issues/266 - - Upgraded to CefSharp/Chromium v86. + - Upgraded to CefSharp/Chromium v88. + - Can no longer target .Net Standard, must target .Net 4.6.2 or .Net Core 3.1 or .Net 5.0 + - Update to System.Text.Json 5.0.0 (Required by CefSharp). Github Repository https://github.com/chromelyapps/CefSharp - Debug;Release;ReleaseLinux;DebugLinux + Debug;Release; AnyCPU @@ -42,13 +42,32 @@ true + + $(DefineConstants);NET462 + + + + $(DefineConstants);NETCOREAPP + + + + + buildTransitive + + + + + + buildTransitive + + + - - + diff --git a/src/Chromely.CefSharp/Window.Services.cs b/src/Chromely.CefSharp/Window.Services.cs index 0c8fde4..a025a14 100644 --- a/src/Chromely.CefSharp/Window.Services.cs +++ b/src/Chromely.CefSharp/Window.Services.cs @@ -188,7 +188,12 @@ protected virtual void RegisterJsHandlers() { var bindingOptions = handler.BindingOptions as BindingOptions; bindingOptions = bindingOptions ?? BindingOptions.DefaultBinder; +#if NET462 repo.Register(name: handler.ObjectName, objectToBind: handler.BoundObject, isAsync: true, options: bindingOptions); +#else + repo.Register(name: handler.ObjectName, objectToBind: handler.BoundObject, options: bindingOptions); +#endif + } else { diff --git a/src/ChromelyCefSharp.sln b/src/ChromelyCefSharp.sln index afd751d..dec9698 100644 --- a/src/ChromelyCefSharp.sln +++ b/src/ChromelyCefSharp.sln @@ -17,91 +17,35 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 DebugLinux|Any CPU = DebugLinux|Any CPU - DebugLinux|x64 = DebugLinux|x64 - DebugLinux|x86 = DebugLinux|x86 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 ReleaseLinux|Any CPU = ReleaseLinux|Any CPU - ReleaseLinux|x64 = ReleaseLinux|x64 - ReleaseLinux|x86 = ReleaseLinux|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {D13B0961-3627-4428-BB9B-72F8E7023EAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D13B0961-3627-4428-BB9B-72F8E7023EAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.Debug|x64.ActiveCfg = Debug|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.Debug|x64.Build.0 = Debug|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.Debug|x86.ActiveCfg = Debug|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.Debug|x86.Build.0 = Debug|Any CPU {D13B0961-3627-4428-BB9B-72F8E7023EAE}.DebugLinux|Any CPU.ActiveCfg = DebugLinux|Any CPU {D13B0961-3627-4428-BB9B-72F8E7023EAE}.DebugLinux|Any CPU.Build.0 = DebugLinux|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.DebugLinux|x64.ActiveCfg = DebugLinux|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.DebugLinux|x64.Build.0 = DebugLinux|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.DebugLinux|x86.ActiveCfg = DebugLinux|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.DebugLinux|x86.Build.0 = DebugLinux|Any CPU {D13B0961-3627-4428-BB9B-72F8E7023EAE}.Release|Any CPU.ActiveCfg = Release|Any CPU {D13B0961-3627-4428-BB9B-72F8E7023EAE}.Release|Any CPU.Build.0 = Release|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.Release|x64.ActiveCfg = Release|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.Release|x64.Build.0 = Release|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.Release|x86.ActiveCfg = Release|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.Release|x86.Build.0 = Release|Any CPU {D13B0961-3627-4428-BB9B-72F8E7023EAE}.ReleaseLinux|Any CPU.ActiveCfg = ReleaseLinux|Any CPU {D13B0961-3627-4428-BB9B-72F8E7023EAE}.ReleaseLinux|Any CPU.Build.0 = ReleaseLinux|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.ReleaseLinux|x64.Build.0 = ReleaseLinux|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|Any CPU - {D13B0961-3627-4428-BB9B-72F8E7023EAE}.ReleaseLinux|x86.Build.0 = ReleaseLinux|Any CPU {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.Debug|x64.ActiveCfg = Debug|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.Debug|x64.Build.0 = Debug|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.Debug|x86.ActiveCfg = Debug|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.Debug|x86.Build.0 = Debug|Any CPU {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.DebugLinux|Any CPU.ActiveCfg = Debug|Any CPU {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.DebugLinux|Any CPU.Build.0 = Debug|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.DebugLinux|x64.ActiveCfg = Debug|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.DebugLinux|x64.Build.0 = Debug|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.DebugLinux|x86.ActiveCfg = Debug|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.DebugLinux|x86.Build.0 = Debug|Any CPU {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.Release|Any CPU.ActiveCfg = Release|Any CPU {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.Release|Any CPU.Build.0 = Release|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.Release|x64.ActiveCfg = Release|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.Release|x64.Build.0 = Release|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.Release|x86.ActiveCfg = Release|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.Release|x86.Build.0 = Release|Any CPU {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.ReleaseLinux|Any CPU.ActiveCfg = Release|Any CPU {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.ReleaseLinux|Any CPU.Build.0 = Release|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.ReleaseLinux|x64.ActiveCfg = Release|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.ReleaseLinux|x64.Build.0 = Release|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.ReleaseLinux|x86.ActiveCfg = Release|Any CPU - {49A3A157-59CB-48E4-9DF8-BA1FF5F86A39}.ReleaseLinux|x86.Build.0 = Release|Any CPU - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.Debug|Any CPU.ActiveCfg = Debug|x64 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.Debug|Any CPU.Build.0 = Debug|x64 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.Debug|x64.ActiveCfg = Debug|x64 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.Debug|x64.Build.0 = Debug|x64 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.Debug|x86.ActiveCfg = Debug|x86 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.Debug|x86.Build.0 = Debug|x86 + {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.DebugLinux|Any CPU.ActiveCfg = Release|x86 {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.DebugLinux|Any CPU.Build.0 = Release|x86 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.DebugLinux|x64.ActiveCfg = Debug|x64 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.DebugLinux|x64.Build.0 = Debug|x64 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.DebugLinux|x86.ActiveCfg = Debug|x86 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.DebugLinux|x86.Build.0 = Debug|x86 {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.Release|Any CPU.ActiveCfg = Release|x86 {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.Release|Any CPU.Build.0 = Release|x86 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.Release|x64.ActiveCfg = Release|x64 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.Release|x64.Build.0 = Release|x64 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.Release|x86.ActiveCfg = Release|x86 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.Release|x86.Build.0 = Release|x86 {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.ReleaseLinux|Any CPU.ActiveCfg = Release|x86 {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.ReleaseLinux|Any CPU.Build.0 = Release|x86 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.ReleaseLinux|x64.ActiveCfg = Release|x64 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.ReleaseLinux|x64.Build.0 = Release|x64 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.ReleaseLinux|x86.ActiveCfg = Release|x86 - {5DD9EF52-6E7E-4818-99CB-3FC40B2FE4E0}.ReleaseLinux|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE