From 55bcee859aeedca969b2b15578bf940535247b2e Mon Sep 17 00:00:00 2001 From: Alex Maitland Date: Wed, 7 Apr 2021 15:39:45 +1000 Subject: [PATCH] Upgrade to 89.0.170 (#132) * Upgrade to 89.0.140-pre - Dependency Check is currently disabled * Upgrade to 89.0.170 --- .../CefSharp.MinimalExample.OffScreen.csproj | 20 +++++++++---------- ...rp.MinimalExample.OffScreen.netcore.csproj | 2 +- CefSharp.MinimalExample.OffScreen/Program.cs | 9 +-------- .../packages.config | 8 ++++---- .../CefSharp.MinimalExample.WinForms.csproj | 20 +++++++++---------- ...harp.MinimalExample.WinForms.net472.csproj | 6 +++--- ...arp.MinimalExample.WinForms.netcore.csproj | 2 +- CefSharp.MinimalExample.WinForms/Program.cs | 9 +-------- .../packages.config | 8 ++++---- CefSharp.MinimalExample.Wpf/App.xaml.cs | 9 +-------- .../CefSharp.MinimalExample.Wpf.csproj | 20 +++++++++---------- ...CefSharp.MinimalExample.Wpf.netcore.csproj | 2 +- CefSharp.MinimalExample.Wpf/packages.config | 8 ++++---- UpdateNugetPackages.bat | 2 +- 14 files changed, 52 insertions(+), 73 deletions(-) diff --git a/CefSharp.MinimalExample.OffScreen/CefSharp.MinimalExample.OffScreen.csproj b/CefSharp.MinimalExample.OffScreen/CefSharp.MinimalExample.OffScreen.csproj index c3d3247..76706db 100644 --- a/CefSharp.MinimalExample.OffScreen/CefSharp.MinimalExample.OffScreen.csproj +++ b/CefSharp.MinimalExample.OffScreen/CefSharp.MinimalExample.OffScreen.csproj @@ -1,8 +1,8 @@  - - - + + + Debug @@ -87,16 +87,16 @@ app.manifest - - ..\packages\CefSharp.Common.88.2.90\lib\net452\CefSharp.dll + + ..\packages\CefSharp.Common.89.0.170\lib\net452\CefSharp.dll True - - ..\packages\CefSharp.Common.88.2.90\lib\net452\CefSharp.Core.dll + + ..\packages\CefSharp.Common.89.0.170\lib\net452\CefSharp.Core.dll True - - ..\packages\CefSharp.OffScreen.88.2.90\lib\net452\CefSharp.OffScreen.dll + + ..\packages\CefSharp.OffScreen.89.0.170\lib\net452\CefSharp.OffScreen.dll True @@ -120,5 +120,5 @@ - + \ No newline at end of file diff --git a/CefSharp.MinimalExample.OffScreen/CefSharp.MinimalExample.OffScreen.netcore.csproj b/CefSharp.MinimalExample.OffScreen/CefSharp.MinimalExample.OffScreen.netcore.csproj index f807d12..b61f01e 100644 --- a/CefSharp.MinimalExample.OffScreen/CefSharp.MinimalExample.OffScreen.netcore.csproj +++ b/CefSharp.MinimalExample.OffScreen/CefSharp.MinimalExample.OffScreen.netcore.csproj @@ -47,7 +47,7 @@ - + diff --git a/CefSharp.MinimalExample.OffScreen/Program.cs b/CefSharp.MinimalExample.OffScreen/Program.cs index 79d3e25..3b41e97 100644 --- a/CefSharp.MinimalExample.OffScreen/Program.cs +++ b/CefSharp.MinimalExample.OffScreen/Program.cs @@ -34,15 +34,8 @@ namespace CefSharp.MinimalExample.OffScreen CachePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "CefSharp\\Cache") }; - var dependencyCheck = true; - -#if NETCOREAPP || ANYCPU - //For .Net Core/.Net 5 this should be fixed as part of https://github.com/cefsharp/CefSharp/issues/3388 - dependencyCheck = false; -#endif - //Perform dependency check to make sure all relevant resources are in our output directory. - Cef.Initialize(settings, performDependencyCheck: dependencyCheck, browserProcessHandler: null); + Cef.Initialize(settings, performDependencyCheck: false, browserProcessHandler: null); // Create the offscreen Chromium browser. browser = new ChromiumWebBrowser(testUrl); diff --git a/CefSharp.MinimalExample.OffScreen/packages.config b/CefSharp.MinimalExample.OffScreen/packages.config index be62928..c904284 100644 --- a/CefSharp.MinimalExample.OffScreen/packages.config +++ b/CefSharp.MinimalExample.OffScreen/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.csproj b/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.csproj index c35f97c..e3d30e9 100644 --- a/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.csproj +++ b/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.csproj @@ -1,8 +1,8 @@  - - - + + + Debug AnyCPU @@ -72,16 +72,16 @@ app.manifest - - ..\packages\CefSharp.Common.88.2.90\lib\net452\CefSharp.dll + + ..\packages\CefSharp.Common.89.0.170\lib\net452\CefSharp.dll True - - ..\packages\CefSharp.Common.88.2.90\lib\net452\CefSharp.Core.dll + + ..\packages\CefSharp.Common.89.0.170\lib\net452\CefSharp.Core.dll True - - ..\packages\CefSharp.WinForms.88.2.90\lib\net452\CefSharp.WinForms.dll + + ..\packages\CefSharp.WinForms.89.0.170\lib\net452\CefSharp.WinForms.dll True @@ -144,5 +144,5 @@ - + \ No newline at end of file diff --git a/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.net472.csproj b/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.net472.csproj index b70a6ff..7fbfd12 100644 --- a/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.net472.csproj +++ b/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.net472.csproj @@ -27,8 +27,8 @@ For versions 87 and 88 specify CefSharpPlatformTargetOverride when using AnyCPU. For versions 89 and above use PlatformTarget (CefSharpPlatformTargetOverride will also still work) --> - - AnyCPU + AnyCPU + @@ -41,7 +41,7 @@ - + diff --git a/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.netcore.csproj b/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.netcore.csproj index 98ec41c..ec33a4f 100644 --- a/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.netcore.csproj +++ b/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.netcore.csproj @@ -62,7 +62,7 @@ - + diff --git a/CefSharp.MinimalExample.WinForms/Program.cs b/CefSharp.MinimalExample.WinForms/Program.cs index 560ee5b..d59f00d 100644 --- a/CefSharp.MinimalExample.WinForms/Program.cs +++ b/CefSharp.MinimalExample.WinForms/Program.cs @@ -41,15 +41,8 @@ namespace CefSharp.MinimalExample.WinForms //For screen sharing add (see https://bitbucket.org/chromiumembedded/cef/issues/2582/allow-run-time-handling-of-media-access#comment-58677180) settings.CefCommandLineArgs.Add("enable-usermedia-screen-capturing"); - var dependencyCheck = true; - -#if NETCOREAPP || ANYCPU - //For .Net Core/.Net 5 this should be fixed as part of https://github.com/cefsharp/CefSharp/issues/3388 - dependencyCheck = false; -#endif - //Perform dependency check to make sure all relevant resources are in our output directory. - Cef.Initialize(settings, performDependencyCheck: dependencyCheck, browserProcessHandler: null); + Cef.Initialize(settings, performDependencyCheck: false, browserProcessHandler: null); var browser = new BrowserForm(); Application.Run(browser); diff --git a/CefSharp.MinimalExample.WinForms/packages.config b/CefSharp.MinimalExample.WinForms/packages.config index 6f52e8c..2c71c4b 100644 --- a/CefSharp.MinimalExample.WinForms/packages.config +++ b/CefSharp.MinimalExample.WinForms/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/CefSharp.MinimalExample.Wpf/App.xaml.cs b/CefSharp.MinimalExample.Wpf/App.xaml.cs index 24ea986..671b49c 100644 --- a/CefSharp.MinimalExample.Wpf/App.xaml.cs +++ b/CefSharp.MinimalExample.Wpf/App.xaml.cs @@ -31,20 +31,13 @@ namespace CefSharp.MinimalExample.Wpf //For screen sharing add (see https://bitbucket.org/chromiumembedded/cef/issues/2582/allow-run-time-handling-of-media-access#comment-58677180) settings.CefCommandLineArgs.Add("enable-usermedia-screen-capturing"); - var dependencyCheck = true; - -#if NETCOREAPP || ANYCPU - //For .Net Core/.Net 5 this should be fixed as part of https://github.com/cefsharp/CefSharp/issues/3388 - dependencyCheck = false; -#endif - //Example of checking if a call to Cef.Initialize has already been made, we require this for //our .Net 5.0 Single File Publish example, you don't typically need to perform this check //if you call Cef.Initialze within your WPF App constructor. if (!Cef.IsInitialized) { //Perform dependency check to make sure all relevant resources are in our output directory. - Cef.Initialize(settings, performDependencyCheck: dependencyCheck, browserProcessHandler: null); + Cef.Initialize(settings, performDependencyCheck: false, browserProcessHandler: null); } } diff --git a/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj b/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj index 1544d1a..024a0eb 100644 --- a/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj +++ b/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj @@ -1,8 +1,8 @@  - - - + + + Debug @@ -93,16 +93,16 @@ app.manifest - - ..\packages\CefSharp.Common.88.2.90\lib\net452\CefSharp.dll + + ..\packages\CefSharp.Common.89.0.170\lib\net452\CefSharp.dll True - - ..\packages\CefSharp.Common.88.2.90\lib\net452\CefSharp.Core.dll + + ..\packages\CefSharp.Common.89.0.170\lib\net452\CefSharp.Core.dll True - - ..\packages\CefSharp.Wpf.88.2.90\lib\net452\CefSharp.Wpf.dll + + ..\packages\CefSharp.Wpf.89.0.170\lib\net452\CefSharp.Wpf.dll True @@ -181,5 +181,5 @@ - + \ No newline at end of file diff --git a/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.netcore.csproj b/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.netcore.csproj index 344fe39..b00087e 100644 --- a/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.netcore.csproj +++ b/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.netcore.csproj @@ -65,7 +65,7 @@ - + diff --git a/CefSharp.MinimalExample.Wpf/packages.config b/CefSharp.MinimalExample.Wpf/packages.config index 2600ad9..adde98b 100644 --- a/CefSharp.MinimalExample.Wpf/packages.config +++ b/CefSharp.MinimalExample.Wpf/packages.config @@ -1,8 +1,8 @@  - - - - + + + + \ No newline at end of file diff --git a/UpdateNugetPackages.bat b/UpdateNugetPackages.bat index 1749b62..fdb9ca9 100644 --- a/UpdateNugetPackages.bat +++ b/UpdateNugetPackages.bat @@ -1,4 +1,4 @@ -SET cefsharpversion=88.2.90 +SET cefsharpversion=89.0.170 ..\nuget restore CefSharp.MinimalExample.sln