From 3ed9dad15339e314c37d9a84842d48580762b0b6 Mon Sep 17 00:00:00 2001 From: amaitland <307872+amaitland@users.noreply.github.com> Date: Sun, 29 Mar 2026 09:29:08 +1000 Subject: [PATCH 1/4] Issue Template - Update for 146 Release --- .github/ISSUE_TEMPLATE/bug_report.yml | 6 +++--- CONTRIBUTING.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 16b2674889..61d10684a4 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -21,8 +21,8 @@ body: id: cefsharp-version attributes: label: CefSharp Version - description: What version are you using? Please only open an issue if you can reproduce the problem with version 140.1.140 or later. - placeholder: 140.1.140 + description: What version are you using? Please only open an issue if you can reproduce the problem with version 145.0.260 or later. + placeholder: 145.0.260 validations: required: true - type: dropdown @@ -122,7 +122,7 @@ body: attributes: value: | To help determine where the problem needs to be fixed please download and test using the `CEF Sample Application(cefclient)`. - 1. Download for [x86](https://cef-builds.spotifycdn.com/cef_binary_143.0.9%2Bge88e818%2Bchromium-143.0.7499.40_windows32_client.tar.bz2) or [x64](https://cef-builds.spotifycdn.com/cef_binary_143.0.9%2Bge88e818%2Bchromium-143.0.7499.40_windows64_client.tar.bz2) or [arm64](https://cef-builds.spotifycdn.com/cef_binary_143.0.9%2Bge88e818%2Bchromium-143.0.7499.40_windowsarm64_client.tar.bz2). + 1. Download for [x86](https://cef-builds.spotifycdn.com/cef_binary_146.0.7%2Bga6b143f%2Bchromium-146.0.7680.165_windows32_client.tar.bz2) or [x64](https://cef-builds.spotifycdn.com/cef_binary_146.0.7%2Bga6b143f%2Bchromium-146.0.7680.165_windows64_client.tar.bz2) or [arm64](https://cef-builds.spotifycdn.com/cef_binary_146.0.7%2Bga6b143f%2Bchromium-146.0.7680.165_windowsarm64_client.tar.bz2). 2. Extract tar.bz2 file 3. Execute cefclient.exe using the **command line args below**: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0b2bf25aeb..281ae9dda1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ The upstream [`CEF` forum](http://magpcss.org/ceforum/) is a valuable resource, It maybe helpful to run the `cefclient` application and compare output with `CefSharp`. The `WinForms` and `WPF` versions use two different rendering modes, `WPF` uses Offscreen Rendering (`OSR`). `OffScreen` also uses `OSR` mode. - Download and run the `CEF Sample Application(cefclient)`: - - Download for [x86](https://cef-builds.spotifycdn.com/cef_binary_143.0.9%2Bge88e818%2Bchromium-143.0.7499.40_windows32_client.tar.bz2) or [x64](https://cef-builds.spotifycdn.com/cef_binary_143.0.9%2Bge88e818%2Bchromium-143.0.7499.40_windows64_client.tar.bz2) or [arm64](https://cef-builds.spotifycdn.com/cef_binary_143.0.9%2Bge88e818%2Bchromium-143.0.7499.40_windowsarm64_client.tar.bz2). + - Download for [x86](https://cef-builds.spotifycdn.com/cef_binary_146.0.7%2Bga6b143f%2Bchromium-146.0.7680.165_windows32_client.tar.bz2) or [x64](https://cef-builds.spotifycdn.com/cef_binary_146.0.7%2Bga6b143f%2Bchromium-146.0.7680.165_windows64_client.tar.bz2) or [arm64](https://cef-builds.spotifycdn.com/cef_binary_146.0.7%2Bga6b143f%2Bchromium-146.0.7680.165_windowsarm64_client.tar.bz2). - Extract and run cefclient.exe - If you are using WPF/OffScreen run ``` From 340a3b209df9fa62c74ed42e98735340ac921160 Mon Sep 17 00:00:00 2001 From: amaitland <307872+amaitland@users.noreply.github.com> Date: Sun, 29 Mar 2026 09:39:39 +1000 Subject: [PATCH 2/4] appveyor.yml - Update as release branch --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 930d3c593c..28cc246b5b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 146.0.70-CI{build} +version: 146.0.70-RCI{build} clone_depth: 10 From 695502cc34d84e9847f8c977741002a85204d374 Mon Sep 17 00:00:00 2001 From: campersau Date: Fri, 10 Apr 2026 10:00:04 +0200 Subject: [PATCH 3/4] Allow JavaScript binding when browser wrapper cannot be found (#5229) * Allow JavaScript binding when browser wrapper cannot be found * Store JavascriptBindingSettings per Browser and never remove them This avoids the issue that sometimes browsers are destroyed but then referenced again without them beeing created * Use dict->Values --- .../CefAppUnmanagedWrapper.cpp | 38 +++++++++++---- .../CefAppUnmanagedWrapper.h | 19 ++++++-- .../CefBrowserWrapper.h | 14 ------ ...arp.BrowserSubprocess.Core.netcore.vcxproj | 1 + .../CefSharp.BrowserSubprocess.Core.vcxproj | 1 + .../JavascriptBindingSettings.h | 47 +++++++++++++++++++ 6 files changed, 93 insertions(+), 27 deletions(-) create mode 100644 CefSharp.BrowserSubprocess.Core/JavascriptBindingSettings.h diff --git a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp index 95d1ae2f7e..91b45bf450 100644 --- a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp +++ b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp @@ -62,7 +62,11 @@ namespace CefSharp _onBrowserCreated->Invoke(wrapper); //Multiple CefBrowserWrappers created when opening popups - _browserWrappers->TryAdd(browser->GetIdentifier(), wrapper); + auto browserId = browser->GetIdentifier(); + _browserWrappers->TryAdd(browserId, wrapper); + + auto javascriptBindingSettings = gcnew JavascriptBindingSettings(); + _browserJavascriptBindingSettings->TryAdd(browserId, javascriptBindingSettings); if (!extraInfo.get()) { @@ -103,19 +107,19 @@ namespace CefSharp if (extraInfo->HasKey("JavascriptBindingApiEnabled")) { - wrapper->JavascriptBindingApiEnabled = extraInfo->GetBool("JavascriptBindingApiEnabled"); + javascriptBindingSettings->JavascriptBindingApiEnabled = extraInfo->GetBool("JavascriptBindingApiEnabled"); } if (extraInfo->HasKey("JavascriptBindingApiHasAllowOrigins")) { - wrapper->JavascriptBindingApiHasAllowOrigins = extraInfo->GetBool("JavascriptBindingApiHasAllowOrigins"); + javascriptBindingSettings->JavascriptBindingApiHasAllowOrigins = extraInfo->GetBool("JavascriptBindingApiHasAllowOrigins"); - if (wrapper->JavascriptBindingApiHasAllowOrigins) + if (javascriptBindingSettings->JavascriptBindingApiHasAllowOrigins) { auto allowOrigins = extraInfo->GetList("JavascriptBindingApiAllowOrigins"); if (allowOrigins.get() && allowOrigins->IsValid()) { - wrapper->JavascriptBindingApiAllowOrigins = allowOrigins->Copy(); + javascriptBindingSettings->JavascriptBindingApiAllowOrigins = allowOrigins->Copy(); } } } @@ -136,6 +140,9 @@ namespace CefSharp _onBrowserDestroyed->Invoke(wrapper); delete wrapper; } + + // Don't remove javascript settings because cef is unreliable in calling OnBrowserCreated/OnBrowserDestroyed consistently: + // https://github.com/cefsharp/CefSharp/issues/5228 }; void CefAppUnmanagedWrapper::OnContextCreated(CefRefPtr browser, CefRefPtr frame, CefRefPtr context) @@ -165,9 +172,10 @@ namespace CefSharp } } - auto browserWrapper = FindBrowserWrapper(browser->GetIdentifier()); + JavascriptBindingSettings^ javascriptBindingSettings = nullptr; + _browserJavascriptBindingSettings->TryGetValue(browser->GetIdentifier(), javascriptBindingSettings); - if (browserWrapper != nullptr && browserWrapper->JavascriptBindingApiEnabled && IsJavascriptBindingApiAllowed(browserWrapper, frame)) + if (IsJavascriptBindingApiAllowed(javascriptBindingSettings, frame)) { //TODO: Look at adding some sort of javascript mapping layer to reduce the code duplication auto global = context->GetGlobal(); @@ -347,14 +355,24 @@ namespace CefSharp return rootObject; } - bool CefAppUnmanagedWrapper::IsJavascriptBindingApiAllowed(CefBrowserWrapper^ browserWrapper, CefRefPtr frame) + bool CefAppUnmanagedWrapper::IsJavascriptBindingApiAllowed(JavascriptBindingSettings^ javascriptBindingSettings, CefRefPtr frame) { - if (browserWrapper == nullptr || !browserWrapper->JavascriptBindingApiHasAllowOrigins) + if (javascriptBindingSettings == nullptr) + { + return false; + } + + if (!javascriptBindingSettings->JavascriptBindingApiEnabled) + { + return false; + } + + if (!javascriptBindingSettings->JavascriptBindingApiHasAllowOrigins) { return true; } - auto allowOrigins = browserWrapper->JavascriptBindingApiAllowOrigins; + auto allowOrigins = javascriptBindingSettings->JavascriptBindingApiAllowOrigins; if (!allowOrigins.get()) { return false; diff --git a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h index 680a48791b..d0e3506d3a 100644 --- a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h +++ b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h @@ -9,6 +9,7 @@ #include "SubProcessApp.h" #include "CefBrowserWrapper.h" +#include "JavascriptBindingSettings.h" #include "RegisterBoundObjectRegistry.h" using namespace System::Collections::Generic; @@ -26,6 +27,7 @@ namespace CefSharp gcroot^> _onBrowserCreated; gcroot^> _onBrowserDestroyed; gcroot^> _browserWrappers; + gcroot^> _browserJavascriptBindingSettings; gcroot^> _jsRootObjectWrappersByFrameId; bool _focusedNodeChangedEnabled; bool _legacyBindingEnabled; @@ -38,7 +40,7 @@ namespace CefSharp gcroot^> _javascriptObjects; gcroot _registerBoundObjectRegistry; - bool IsJavascriptBindingApiAllowed(CefBrowserWrapper^ browserWrapper, CefRefPtr frame); + bool IsJavascriptBindingApiAllowed(JavascriptBindingSettings^ javascriptBindingSettings, CefRefPtr frame); public: static const CefString kPromiseCreatorScript; @@ -49,6 +51,7 @@ namespace CefSharp _onBrowserCreated = onBrowserCreated; _onBrowserDestroyed = onBrowserDestroyed; _browserWrappers = gcnew ConcurrentDictionary(); + _browserJavascriptBindingSettings = gcnew ConcurrentDictionary(); _jsRootObjectWrappersByFrameId = gcnew ConcurrentDictionary(); _focusedNodeChangedEnabled = enableFocusedNodeChanged; _javascriptObjects = gcnew Dictionary(); @@ -62,7 +65,7 @@ namespace CefSharp { if (!Object::ReferenceEquals(_browserWrappers, nullptr)) { - for each (CefBrowserWrapper ^ browser in Enumerable::OfType(_browserWrappers)) + for each (CefBrowserWrapper ^ browser in _browserWrappers->Values) { delete browser; } @@ -70,9 +73,19 @@ namespace CefSharp _browserWrappers = nullptr; } + if (!Object::ReferenceEquals(_browserJavascriptBindingSettings, nullptr)) + { + for each (JavascriptBindingSettings ^ javascriptBindingSettings in _browserJavascriptBindingSettings->Values) + { + delete javascriptBindingSettings; + } + + _browserJavascriptBindingSettings = nullptr; + } + if (!Object::ReferenceEquals(_jsRootObjectWrappersByFrameId, nullptr)) { - for each (JavascriptRootObjectWrapper^ rootObject in Enumerable::OfType(_jsRootObjectWrappersByFrameId)) + for each (JavascriptRootObjectWrapper^ rootObject in _jsRootObjectWrappersByFrameId->Values) { delete rootObject; } diff --git a/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h b/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h index 50b9e304a8..934725eaeb 100644 --- a/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h +++ b/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h @@ -28,7 +28,6 @@ namespace CefSharp { private: MCefRefPtr _cefBrowser; - MCefRefPtr _javascriptBindingApiAllowOrigins; public: CefBrowserWrapper(const CefRefPtr &cefBrowser) @@ -36,17 +35,11 @@ namespace CefSharp _cefBrowser = cefBrowser.get(); BrowserId = cefBrowser->GetIdentifier(); IsPopup = cefBrowser->IsPopup(); - - JavascriptBindingApiEnabled = true; - JavascriptBindingApiHasAllowOrigins = false; - JavascriptBindingApiAllowOrigins = nullptr; } !CefBrowserWrapper() { _cefBrowser = nullptr; - - _javascriptBindingApiAllowOrigins = nullptr; } ~CefBrowserWrapper() @@ -56,13 +49,6 @@ namespace CefSharp property int BrowserId; property bool IsPopup; - property bool JavascriptBindingApiEnabled; - property bool JavascriptBindingApiHasAllowOrigins; - property CefRefPtr JavascriptBindingApiAllowOrigins - { - CefRefPtr get() { return _javascriptBindingApiAllowOrigins.get(); } - void set(CefRefPtr value) { _javascriptBindingApiAllowOrigins = value.get(); } - } #ifndef NETCOREAPP // This allows us to create the WCF proxies back to our parent process. diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj index 7dfe15f578..1c77a92143 100644 --- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj +++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj @@ -278,6 +278,7 @@ + diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj index 188d45921a..60f3493bbc 100644 --- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj +++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj @@ -188,6 +188,7 @@ + diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptBindingSettings.h b/CefSharp.BrowserSubprocess.Core/JavascriptBindingSettings.h new file mode 100644 index 0000000000..8ef2f888bb --- /dev/null +++ b/CefSharp.BrowserSubprocess.Core/JavascriptBindingSettings.h @@ -0,0 +1,47 @@ +// Copyright © 2013 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. + +#pragma once + +#include "include/cef_v8.h" + +#include "Stdafx.h" + +namespace CefSharp +{ + namespace BrowserSubprocess + { + private ref class JavascriptBindingSettings + { + private: + MCefRefPtr _javascriptBindingApiAllowOrigins; + + public: + JavascriptBindingSettings() + { + JavascriptBindingApiEnabled = true; + JavascriptBindingApiHasAllowOrigins = false; + JavascriptBindingApiAllowOrigins = nullptr; + } + + !JavascriptBindingSettings() + { + _javascriptBindingApiAllowOrigins = nullptr; + } + + ~JavascriptBindingSettings() + { + this->!JavascriptBindingSettings(); + } + + property bool JavascriptBindingApiEnabled; + property bool JavascriptBindingApiHasAllowOrigins; + property CefRefPtr JavascriptBindingApiAllowOrigins + { + CefRefPtr get() { return _javascriptBindingApiAllowOrigins.get(); } + void set(CefRefPtr value) { _javascriptBindingApiAllowOrigins = value.get(); } + } + }; + } +} From 16d34481e373884e223138014cdd1eb8dd74d838 Mon Sep 17 00:00:00 2001 From: amaitland <307872+amaitland@users.noreply.github.com> Date: Fri, 10 Apr 2026 21:30:10 +1000 Subject: [PATCH 4/4] Upgrade to 146.0.10+g8219561+chromium-146.0.7680.179 / Chromium 146.0.7680.179 --- .../CefSharp.BrowserSubprocess.Core.netcore.vcxproj | 2 +- .../CefSharp.BrowserSubprocess.Core.vcxproj | 2 +- CefSharp.BrowserSubprocess.Core/Resource.rc | 8 ++++---- .../packages.CefSharp.BrowserSubprocess.Core.config | 2 +- ...es.CefSharp.BrowserSubprocess.Core.netcore.config | 2 +- CefSharp.BrowserSubprocess/app.manifest | 2 +- .../CefSharp.Core.Runtime.netcore.vcxproj | 2 +- CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj | 2 +- CefSharp.Core.Runtime/Resource.rc | 8 ++++---- .../packages.CefSharp.Core.Runtime.config | 2 +- .../packages.CefSharp.Core.Runtime.netcore.config | 2 +- .../CefSharp.OffScreen.Example.csproj | 2 +- .../CefSharp.OffScreen.Example.netcore.csproj | 2 +- CefSharp.OffScreen.Example/app.manifest | 2 +- CefSharp.Test/CefSharp.Test.csproj | 2 +- CefSharp.Test/CefSharp.Test.netcore.csproj | 2 +- .../CefSharp.WinForms.Example.csproj | 2 +- .../CefSharp.WinForms.Example.netcore.csproj | 2 +- CefSharp.WinForms.Example/app.manifest | 2 +- CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj | 2 +- .../CefSharp.Wpf.Example.netcore.csproj | 2 +- CefSharp.Wpf.Example/app.manifest | 2 +- .../CefSharp.Wpf.HwndHost.Example.csproj | 2 +- .../CefSharp.Wpf.HwndHost.Example.netcore.csproj | 2 +- CefSharp.shfbproj | 4 ++-- CefSharp/Properties/AssemblyInfo.cs | 4 ++-- NuGet/CefSharp.Common.app.config.x64.transform | 2 +- NuGet/CefSharp.Common.app.config.x86.transform | 2 +- .../PackageReference/CefSharp.Common.NETCore.targets | 12 ++++++------ UpdateNugetPackages.ps1 | 2 +- build.ps1 | 4 ++-- 31 files changed, 45 insertions(+), 45 deletions(-) diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj index 1c77a92143..fa493b2c34 100644 --- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj +++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj @@ -1,6 +1,6 @@  - + diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj index 60f3493bbc..24a4245ba8 100644 --- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj +++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj @@ -1,6 +1,6 @@  - + diff --git a/CefSharp.BrowserSubprocess.Core/Resource.rc b/CefSharp.BrowserSubprocess.Core/Resource.rc index f9b3f50b04..468e9ae580 100644 --- a/CefSharp.BrowserSubprocess.Core/Resource.rc +++ b/CefSharp.BrowserSubprocess.Core/Resource.rc @@ -1,8 +1,8 @@ #pragma code_page(65001) 1 VERSIONINFO - FILEVERSION 146,0,70 - PRODUCTVERSION 146,0,70 + FILEVERSION 146,0,100 + PRODUCTVERSION 146,0,100 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -18,10 +18,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "CefSharp.BrowserSubprocess.Core" - VALUE "FileVersion", "146.0.70" + VALUE "FileVersion", "146.0.100" VALUE "LegalCopyright", "Copyright © 2023 The CefSharp Authors" VALUE "ProductName", "CefSharp" - VALUE "ProductVersion", "146.0.70" + VALUE "ProductVersion", "146.0.100" END END BLOCK "VarFileInfo" diff --git a/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.config b/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.config index f609ce03fc..3146a76ea4 100644 --- a/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.config +++ b/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.config @@ -1,6 +1,6 @@  - + diff --git a/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.netcore.config b/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.netcore.config index cd08551c12..d349c54ea4 100644 --- a/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.netcore.config +++ b/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.netcore.config @@ -1,6 +1,6 @@  - + diff --git a/CefSharp.BrowserSubprocess/app.manifest b/CefSharp.BrowserSubprocess/app.manifest index f6608469e2..5ae4abdf74 100644 --- 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"> - + diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj index f3c1339796..e49e42a777 100644 --- a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj +++ b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj @@ -1,6 +1,6 @@  - + diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj index 19dea04d37..069b91466d 100644 --- a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj +++ b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj @@ -1,6 +1,6 @@  - + diff --git a/CefSharp.Core.Runtime/Resource.rc b/CefSharp.Core.Runtime/Resource.rc index e21628db0b..0340426f4f 100644 --- a/CefSharp.Core.Runtime/Resource.rc +++ b/CefSharp.Core.Runtime/Resource.rc @@ -1,8 +1,8 @@ #pragma code_page(65001) 1 VERSIONINFO - FILEVERSION 146,0,70 - PRODUCTVERSION 146,0,70 + FILEVERSION 146,0,100 + PRODUCTVERSION 146,0,100 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -18,10 +18,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "CefSharp.Core" - VALUE "FileVersion", "146.0.70" + VALUE "FileVersion", "146.0.100" VALUE "LegalCopyright", "Copyright © 2023 The CefSharp Authors" VALUE "ProductName", "CefSharp" - VALUE "ProductVersion", "146.0.70" + VALUE "ProductVersion", "146.0.100" END END BLOCK "VarFileInfo" diff --git a/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.config b/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.config index f609ce03fc..3146a76ea4 100644 --- a/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.config +++ b/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.config @@ -1,6 +1,6 @@  - + diff --git a/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.netcore.config b/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.netcore.config index cd08551c12..d349c54ea4 100644 --- a/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.netcore.config +++ b/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.netcore.config @@ -1,6 +1,6 @@  - + diff --git a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj index 3fab156e98..6e8f99f875 100644 --- a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj +++ b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj @@ -23,7 +23,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj index 038ebf351b..2510ddb630 100644 --- a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj +++ b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj @@ -38,7 +38,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CefSharp.OffScreen.Example/app.manifest b/CefSharp.OffScreen.Example/app.manifest index 6c6ab4061f..d21303c10d 100644 --- a/CefSharp.OffScreen.Example/app.manifest +++ b/CefSharp.OffScreen.Example/app.manifest @@ -7,7 +7,7 @@ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - + diff --git a/CefSharp.Test/CefSharp.Test.csproj b/CefSharp.Test/CefSharp.Test.csproj index 573f36f5b3..8df15d6b12 100644 --- a/CefSharp.Test/CefSharp.Test.csproj +++ b/CefSharp.Test/CefSharp.Test.csproj @@ -36,7 +36,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CefSharp.Test/CefSharp.Test.netcore.csproj b/CefSharp.Test/CefSharp.Test.netcore.csproj index ba6d40e5a0..d390538b12 100644 --- a/CefSharp.Test/CefSharp.Test.netcore.csproj +++ b/CefSharp.Test/CefSharp.Test.netcore.csproj @@ -35,7 +35,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj index bc2b882656..2898e2545c 100644 --- a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj +++ b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj @@ -32,7 +32,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj index f79757da5b..6aac8bb15e 100644 --- a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj +++ b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj @@ -38,7 +38,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CefSharp.WinForms.Example/app.manifest b/CefSharp.WinForms.Example/app.manifest index 3c86cb606a..e0446bc911 100644 --- a/CefSharp.WinForms.Example/app.manifest +++ b/CefSharp.WinForms.Example/app.manifest @@ -8,7 +8,7 @@ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - + diff --git a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj index 39a551d72a..f49f060a7d 100644 --- a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj +++ b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj @@ -31,7 +31,7 @@ - + all diff --git a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.netcore.csproj b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.netcore.csproj index c26b57eaf7..efd46fe162 100644 --- a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.netcore.csproj +++ b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.netcore.csproj @@ -39,7 +39,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CefSharp.Wpf.Example/app.manifest b/CefSharp.Wpf.Example/app.manifest index a19163334f..a7e1b420d4 100644 --- a/CefSharp.Wpf.Example/app.manifest +++ b/CefSharp.Wpf.Example/app.manifest @@ -7,7 +7,7 @@ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - + diff --git a/CefSharp.Wpf.HwndHost.Example/CefSharp.Wpf.HwndHost.Example.csproj b/CefSharp.Wpf.HwndHost.Example/CefSharp.Wpf.HwndHost.Example.csproj index 01d9314bb0..42e0f6828d 100644 --- a/CefSharp.Wpf.HwndHost.Example/CefSharp.Wpf.HwndHost.Example.csproj +++ b/CefSharp.Wpf.HwndHost.Example/CefSharp.Wpf.HwndHost.Example.csproj @@ -28,7 +28,7 @@ - + diff --git a/CefSharp.Wpf.HwndHost.Example/CefSharp.Wpf.HwndHost.Example.netcore.csproj b/CefSharp.Wpf.HwndHost.Example/CefSharp.Wpf.HwndHost.Example.netcore.csproj index d23f95d281..cb0cc74179 100644 --- a/CefSharp.Wpf.HwndHost.Example/CefSharp.Wpf.HwndHost.Example.netcore.csproj +++ b/CefSharp.Wpf.HwndHost.Example/CefSharp.Wpf.HwndHost.Example.netcore.csproj @@ -40,7 +40,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CefSharp.shfbproj b/CefSharp.shfbproj index c1bde65ac6..943bc31597 100644 --- a/CefSharp.shfbproj +++ b/CefSharp.shfbproj @@ -31,7 +31,7 @@ - 146.0.70 + 146.0.100 2 False C#, Managed C++ @@ -59,7 +59,7 @@ InheritedMembers, InheritedFrameworkMembers, Protected, ProtectedInternalAsProtected, EditorBrowsableNever, NonBrowsable - Version 146.0.70 + Version 146.0.100 https://raw.githubusercontent.com/cefsharp/CefSharp/master/LICENSE Interfaces, enums, structs and classes that make up the core API interface diff --git a/CefSharp/Properties/AssemblyInfo.cs b/CefSharp/Properties/AssemblyInfo.cs index 84be3901b5..1495f48661 100644 --- a/CefSharp/Properties/AssemblyInfo.cs +++ b/CefSharp/Properties/AssemblyInfo.cs @@ -26,8 +26,8 @@ public static class AssemblyInfo public const bool ComVisible = false; public const string AssemblyCompany = "The CefSharp Authors"; public const string AssemblyProduct = "CefSharp"; - public const string AssemblyVersion = "146.0.70"; - public const string AssemblyFileVersion = "146.0.70.0"; + public const string AssemblyVersion = "146.0.100"; + public const string AssemblyFileVersion = "146.0.100.0"; public const string AssemblyCopyright = "Copyright © 2023 The CefSharp Authors"; public const string CefSharpCoreProject = "CefSharp.Core, PublicKey=" + PublicKey; public const string CefSharpBrowserSubprocessProject = "CefSharp.BrowserSubprocess, PublicKey=" + PublicKey; diff --git a/NuGet/CefSharp.Common.app.config.x64.transform b/NuGet/CefSharp.Common.app.config.x64.transform index 991e49b457..4b53d1e55c 100644 --- a/NuGet/CefSharp.Common.app.config.x64.transform +++ b/NuGet/CefSharp.Common.app.config.x64.transform @@ -20,7 +20,7 @@ - + diff --git a/NuGet/CefSharp.Common.app.config.x86.transform b/NuGet/CefSharp.Common.app.config.x86.transform index 6e18a848b7..6691ef85fa 100644 --- a/NuGet/CefSharp.Common.app.config.x86.transform +++ b/NuGet/CefSharp.Common.app.config.x86.transform @@ -20,7 +20,7 @@ - + diff --git a/NuGet/PackageReference/CefSharp.Common.NETCore.targets b/NuGet/PackageReference/CefSharp.Common.NETCore.targets index 3cf53a480e..68e4187fa5 100644 --- a/NuGet/PackageReference/CefSharp.Common.NETCore.targets +++ b/NuGet/PackageReference/CefSharp.Common.NETCore.targets @@ -143,16 +143,16 @@ - - - + + + - - - + + + diff --git a/UpdateNugetPackages.ps1 b/UpdateNugetPackages.ps1 index e48443c2d7..10506949b3 100644 --- a/UpdateNugetPackages.ps1 +++ b/UpdateNugetPackages.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Position = 1)] - [string] $CefVersion = "146.0.7", + [string] $CefVersion = "146.0.10", [Parameter(Position = 2)] [string] $CefSharpVersion = "" ) diff --git a/build.ps1 b/build.ps1 index 7e26f3ba43..ee0f270688 100644 --- a/build.ps1 +++ b/build.ps1 @@ -5,9 +5,9 @@ param( [Parameter(Position = 0)] [string] $Target = "vs2022", [Parameter(Position = 1)] - [string] $Version = "146.0.70", + [string] $Version = "146.0.100", [Parameter(Position = 2)] - [string] $AssemblyVersion = "146.0.70", + [string] $AssemblyVersion = "146.0.100", [Parameter(Position = 3)] [ValidateSet("NetFramework", "NetCore")] [string] $TargetFramework = "NetFramework",