From 2ebad4d7688950642be8761003a6515115036bda Mon Sep 17 00:00:00 2001 From: amaitland <307872+amaitland@users.noreply.github.com> Date: Mon, 18 Nov 2024 06:04:33 +1000 Subject: [PATCH] Upgrade to 131.2.3+g023a05b+chromium-131.0.6778.70 / Chromium 131.0.6778.70 - Add popupId to OnBeforePopup (API not mapped yet) --- .../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/Internals/ClientAdapter.cpp | 2 +- CefSharp.Core.Runtime/Internals/ClientAdapter.h | 1 + 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.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 +- appveyor.yml | 2 +- build.ps1 | 4 ++-- 32 files changed, 46 insertions(+), 45 deletions(-) diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj index 3fb0b90441..ae4641ae7a 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 db9c3143d4..9f39960584 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 6e9b996a3e..939aca5054 100644 --- a/CefSharp.BrowserSubprocess.Core/Resource.rc +++ b/CefSharp.BrowserSubprocess.Core/Resource.rc @@ -1,8 +1,8 @@ #pragma code_page(65001) 1 VERSIONINFO - FILEVERSION 130,1,90 - PRODUCTVERSION 130,1,90 + FILEVERSION 131,2,30 + PRODUCTVERSION 131,2,30 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -18,10 +18,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "CefSharp.BrowserSubprocess.Core" - VALUE "FileVersion", "130.1.90" + VALUE "FileVersion", "131.2.30" VALUE "LegalCopyright", "Copyright © 2023 The CefSharp Authors" VALUE "ProductName", "CefSharp" - VALUE "ProductVersion", "130.1.90" + VALUE "ProductVersion", "131.2.30" 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 e7286f7255..e9186d2ed2 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 d5682f1a1b..e03a9f58ce 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 794024a678..1b09880742 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 22b99fc029..57a3c73186 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 3515fe375e..584f7e11b8 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/Internals/ClientAdapter.cpp b/CefSharp.Core.Runtime/Internals/ClientAdapter.cpp index ae0203bfe4..fc315ae0ff 100644 --- a/CefSharp.Core.Runtime/Internals/ClientAdapter.cpp +++ b/CefSharp.Core.Runtime/Internals/ClientAdapter.cpp @@ -148,7 +148,7 @@ namespace CefSharp } } - bool ClientAdapter::OnBeforePopup(CefRefPtr browser, CefRefPtr frame, const CefString& target_url, + bool ClientAdapter::OnBeforePopup(CefRefPtr browser, CefRefPtr frame, int popup_id, const CefString& target_url, const CefString& target_frame_name, CefLifeSpanHandler::WindowOpenDisposition target_disposition, bool user_gesture, const CefPopupFeatures& popupFeatures, CefWindowInfo& windowInfo, CefRefPtr& client, CefBrowserSettings& settings, CefRefPtr& extraInfo, bool* no_javascript_access) diff --git a/CefSharp.Core.Runtime/Internals/ClientAdapter.h b/CefSharp.Core.Runtime/Internals/ClientAdapter.h index 83cac46c08..0586cb0043 100644 --- a/CefSharp.Core.Runtime/Internals/ClientAdapter.h +++ b/CefSharp.Core.Runtime/Internals/ClientAdapter.h @@ -110,6 +110,7 @@ namespace CefSharp // CefLifeSpanHandler virtual DECL bool OnBeforePopup(CefRefPtr browser, CefRefPtr frame, + int popup_id, const CefString& target_url, const CefString& target_frame_name, CefLifeSpanHandler::WindowOpenDisposition target_disposition, bool user_gesture, const CefPopupFeatures& popupFeatures, diff --git a/CefSharp.Core.Runtime/Resource.rc b/CefSharp.Core.Runtime/Resource.rc index ec58b6ce62..3d55a07b19 100644 --- a/CefSharp.Core.Runtime/Resource.rc +++ b/CefSharp.Core.Runtime/Resource.rc @@ -1,8 +1,8 @@ #pragma code_page(65001) 1 VERSIONINFO - FILEVERSION 130,1,90 - PRODUCTVERSION 130,1,90 + FILEVERSION 131,2,30 + PRODUCTVERSION 131,2,30 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -18,10 +18,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "CefSharp.Core" - VALUE "FileVersion", "130.1.90" + VALUE "FileVersion", "131.2.30" VALUE "LegalCopyright", "Copyright © 2023 The CefSharp Authors" VALUE "ProductName", "CefSharp" - VALUE "ProductVersion", "130.1.90" + VALUE "ProductVersion", "131.2.30" 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 e7286f7255..e9186d2ed2 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 d5682f1a1b..e03a9f58ce 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 e33d885e87..32eed91092 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 23416f3692..81ff8ac48e 100644 --- a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj +++ b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj @@ -39,7 +39,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CefSharp.OffScreen.Example/app.manifest b/CefSharp.OffScreen.Example/app.manifest index 540b57c51d..b147b24252 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 6670e5fb77..5833a5e5a2 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 ab69666d1f..b735133564 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 1b52b0f728..952cad554e 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 3a7ffe58e5..669296528a 100644 --- a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj +++ b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj @@ -39,7 +39,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CefSharp.WinForms.Example/app.manifest b/CefSharp.WinForms.Example/app.manifest index 79fbb80bc0..e01e8a56a3 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 71b27d7b2d..8f1b29a4ef 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 3e551a2997..e49a50e832 100644 --- a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.netcore.csproj +++ b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.netcore.csproj @@ -40,7 +40,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CefSharp.Wpf.Example/app.manifest b/CefSharp.Wpf.Example/app.manifest index b946475695..4f23553a51 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.shfbproj b/CefSharp.shfbproj index 75d777352e..f29dc8c78e 100644 --- a/CefSharp.shfbproj +++ b/CefSharp.shfbproj @@ -31,7 +31,7 @@ - 130.1.90 + 131.2.30 2 False C#, Managed C++ @@ -59,7 +59,7 @@ InheritedMembers, InheritedFrameworkMembers, Protected, ProtectedInternalAsProtected, EditorBrowsableNever, NonBrowsable - Version 130.1.90 + Version 131.2.30 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 e93d890b8a..8aa984a855 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 = "130.1.90"; - public const string AssemblyFileVersion = "130.1.90.0"; + public const string AssemblyVersion = "131.2.30"; + public const string AssemblyFileVersion = "131.2.30.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 8f64432098..b757f4deb8 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 6a27b9d5e8..6c4548d045 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 421999563d..5516ed303f 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 818953a2d2..9081beba87 100644 --- a/UpdateNugetPackages.ps1 +++ b/UpdateNugetPackages.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Position = 1)] - [string] $CefVersion = "130.1.9", + [string] $CefVersion = "131.2.3", [Parameter(Position = 2)] [string] $CefSharpVersion = "" ) diff --git a/appveyor.yml b/appveyor.yml index 15bff1bdef..70444b8ea7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 130.1.90-CI{build} +version: 131.2.30-CI{build} clone_depth: 10 diff --git a/build.ps1 b/build.ps1 index 4175ce6547..5b0ea3d219 100644 --- a/build.ps1 +++ b/build.ps1 @@ -5,9 +5,9 @@ param( [Parameter(Position = 0)] [string] $Target = "vs2019", [Parameter(Position = 1)] - [string] $Version = "130.1.90", + [string] $Version = "131.2.30", [Parameter(Position = 2)] - [string] $AssemblyVersion = "130.1.90", + [string] $AssemblyVersion = "131.2.30", [Parameter(Position = 3)] [ValidateSet("NetFramework", "NetCore", "NetFramework452", "NetCore31")] [string] $TargetFramework = "NetFramework",