From cf2cd04a5a027ac372cbb222d8779ebde08d70a9 Mon Sep 17 00:00:00 2001 From: amaitland <307872+amaitland@users.noreply.github.com> Date: Sun, 16 Mar 2025 08:38:06 +1000 Subject: [PATCH 1/5] 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 0840121f3..edbed7a2e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 134.3.10-CI{build} +version: 134.3.10-RCI{build} clone_depth: 10 From 59214a67af81e8202444b955a3b442ca4a37932e Mon Sep 17 00:00:00 2001 From: amaitland <307872+amaitland@users.noreply.github.com> Date: Sun, 16 Mar 2025 11:35:19 +1000 Subject: [PATCH 2/5] DevTools Client - Upgrade to 134.0.6998.89 --- .../DevTools/DevToolsClient.Generated.cs | 678 +++++++++--------- .../DevToolsClient.Generated.netcore.cs | 622 ++++++++-------- 2 files changed, 670 insertions(+), 630 deletions(-) diff --git a/CefSharp.Core/DevTools/DevToolsClient.Generated.cs b/CefSharp.Core/DevTools/DevToolsClient.Generated.cs index 681f08f35..7f779ac59 100644 --- a/CefSharp.Core/DevTools/DevToolsClient.Generated.cs +++ b/CefSharp.Core/DevTools/DevToolsClient.Generated.cs @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. // // **This code was generated by a tool, do not change directly** -// CHROMIUM VERSION 133.0.6943.99 +// CHROMIUM VERSION 134.0.6998.89 using System.Runtime.Serialization; namespace CefSharp.DevTools.Accessibility @@ -3673,7 +3673,12 @@ public enum FederatedAuthRequestIssueReason /// TypeNotMatching /// [EnumMember(Value = ("TypeNotMatching"))] - TypeNotMatching + TypeNotMatching, + /// + /// UiDismissedNoEmbargo + /// + [EnumMember(Value = ("UiDismissedNoEmbargo"))] + UiDismissedNoEmbargo } /// @@ -3877,7 +3882,7 @@ public enum SelectElementAccessibilityIssueReason } /// - /// This isue warns about errors in the select element content model. + /// This issue warns about errors in the select element content model. /// [System.Runtime.Serialization.DataContractAttribute] public partial class SelectElementAccessibilityIssueDetails : CefSharp.DevTools.DevToolsDomainEntityBase @@ -11020,100 +11025,6 @@ public CefSharp.DevTools.DOMStorage.StorageId StorageId } } -namespace CefSharp.DevTools.Database -{ - /// - /// Database object. - /// - [System.Runtime.Serialization.DataContractAttribute] - public partial class Database : CefSharp.DevTools.DevToolsDomainEntityBase - { - /// - /// Database ID. - /// - [DataMember(Name = ("id"), IsRequired = (true))] - public string Id - { - get; - set; - } - - /// - /// Database domain. - /// - [DataMember(Name = ("domain"), IsRequired = (true))] - public string Domain - { - get; - set; - } - - /// - /// Database name. - /// - [DataMember(Name = ("name"), IsRequired = (true))] - public string Name - { - get; - set; - } - - /// - /// Database version. - /// - [DataMember(Name = ("version"), IsRequired = (true))] - public string Version - { - get; - set; - } - } - - /// - /// Database error. - /// - [System.Runtime.Serialization.DataContractAttribute] - public partial class Error : CefSharp.DevTools.DevToolsDomainEntityBase - { - /// - /// Error message. - /// - [DataMember(Name = ("message"), IsRequired = (true))] - public string Message - { - get; - set; - } - - /// - /// Error code. - /// - [DataMember(Name = ("code"), IsRequired = (true))] - public int Code - { - get; - set; - } - } - - /// - /// addDatabase - /// - [System.Runtime.Serialization.DataContractAttribute] - public class AddDatabaseEventArgs : CefSharp.DevTools.DevToolsDomainEventArgsBase - { - /// - /// Database - /// - [DataMember(Name = ("database"), IsRequired = (true))] - public CefSharp.DevTools.Database.Database Database - { - get; - private set; - } - } -} - namespace CefSharp.DevTools.Emulation { /// @@ -16423,7 +16334,12 @@ public enum CookieExemptionReason /// Scheme /// [EnumMember(Value = ("Scheme"))] - Scheme + Scheme, + /// + /// SameSiteNoneCookiesInSandbox + /// + [EnumMember(Value = ("SameSiteNoneCookiesInSandbox"))] + SameSiteNoneCookiesInSandbox } /// @@ -21313,6 +21229,11 @@ public enum PermissionsPolicyFeature [EnumMember(Value = ("ch-ua-bitness"))] ChUaBitness, /// + /// ch-ua-high-entropy-values + /// + [EnumMember(Value = ("ch-ua-high-entropy-values"))] + ChUaHighEntropyValues, + /// /// ch-ua-platform /// [EnumMember(Value = ("ch-ua-platform"))] @@ -25122,6 +25043,125 @@ public CefSharp.DevTools.Page.Frame Frame } } + /// + /// FrameStartedNavigatingNavigationType + /// + public enum FrameStartedNavigatingNavigationType + { + /// + /// reload + /// + [EnumMember(Value = ("reload"))] + Reload, + /// + /// reloadBypassingCache + /// + [EnumMember(Value = ("reloadBypassingCache"))] + ReloadBypassingCache, + /// + /// restore + /// + [EnumMember(Value = ("restore"))] + Restore, + /// + /// restoreWithPost + /// + [EnumMember(Value = ("restoreWithPost"))] + RestoreWithPost, + /// + /// historySameDocument + /// + [EnumMember(Value = ("historySameDocument"))] + HistorySameDocument, + /// + /// historyDifferentDocument + /// + [EnumMember(Value = ("historyDifferentDocument"))] + HistoryDifferentDocument, + /// + /// sameDocument + /// + [EnumMember(Value = ("sameDocument"))] + SameDocument, + /// + /// differentDocument + /// + [EnumMember(Value = ("differentDocument"))] + DifferentDocument + } + + /// + /// Fired when a navigation starts. This event is fired for both + /// renderer-initiated and browser-initiated navigations. For renderer-initiated + /// navigations, the event is fired after `frameRequestedNavigation`. + /// Navigation may still be cancelled after the event is issued. Multiple events + /// can be fired for a single navigation, for example, when a same-document + /// navigation becomes a cross-document navigation (such as in the case of a + /// frameset). + /// + [System.Runtime.Serialization.DataContractAttribute] + public class FrameStartedNavigatingEventArgs : CefSharp.DevTools.DevToolsDomainEventArgsBase + { + /// + /// ID of the frame that is being navigated. + /// + [DataMember(Name = ("frameId"), IsRequired = (true))] + public string FrameId + { + get; + private set; + } + + /// + /// The URL the navigation started with. The final URL can be different. + /// + [DataMember(Name = ("url"), IsRequired = (true))] + public string Url + { + get; + private set; + } + + /// + /// Loader identifier. Even though it is present in case of same-document + /// navigation, the previously committed loaderId would not change unless + /// the navigation changes from a same-document to a cross-document + /// navigation. + /// + [DataMember(Name = ("loaderId"), IsRequired = (true))] + public string LoaderId + { + get; + private set; + } + + /// + /// NavigationType + /// + public CefSharp.DevTools.Page.FrameStartedNavigatingNavigationType NavigationType + { + get + { + return (CefSharp.DevTools.Page.FrameStartedNavigatingNavigationType)(StringToEnum(typeof(CefSharp.DevTools.Page.FrameStartedNavigatingNavigationType), navigationType)); + } + + set + { + this.navigationType = (EnumToString(value)); + } + } + + /// + /// NavigationType + /// + [DataMember(Name = ("navigationType"), IsRequired = (true))] + internal string navigationType + { + get; + private set; + } + } + /// /// Fired when a renderer-initiated navigation is requested. /// Navigation may still be cancelled after the event is issued. @@ -27274,11 +27314,6 @@ namespace CefSharp.DevTools.Storage /// public enum StorageType { - /// - /// appcache - /// - [EnumMember(Value = ("appcache"))] - Appcache, /// /// cookies /// @@ -30438,6 +30473,33 @@ public int Port } } + /// + /// The state of the target window. + /// + public enum WindowState + { + /// + /// normal + /// + [EnumMember(Value = ("normal"))] + Normal, + /// + /// minimized + /// + [EnumMember(Value = ("minimized"))] + Minimized, + /// + /// maximized + /// + [EnumMember(Value = ("maximized"))] + Maximized, + /// + /// fullscreen + /// + [EnumMember(Value = ("fullscreen"))] + Fullscreen + } + /// /// Issued when attached to target because of auto-attach or `attachToTarget` command. /// @@ -35710,8 +35772,36 @@ public string ExternalURL } } + /// + /// ResolvedBreakpoint + /// + [System.Runtime.Serialization.DataContractAttribute] + public partial class ResolvedBreakpoint : CefSharp.DevTools.DevToolsDomainEntityBase + { + /// + /// Breakpoint unique identifier. + /// + [DataMember(Name = ("breakpointId"), IsRequired = (true))] + public string BreakpointId + { + get; + set; + } + + /// + /// Actual breakpoint location. + /// + [DataMember(Name = ("location"), IsRequired = (true))] + public CefSharp.DevTools.Debugger.Location Location + { + get; + set; + } + } + /// /// Fired when breakpoint is resolved to an actual script and location. + /// Deprecated in favor of `resolvedBreakpoints` in the `scriptParsed` event. /// [System.Runtime.Serialization.DataContractAttribute] public class BreakpointResolvedEventArgs : CefSharp.DevTools.DevToolsDomainEventArgsBase @@ -36327,6 +36417,18 @@ public string EmbedderName get; private set; } + + /// + /// The list of set breakpoints in this script if calls to `setBreakpointByUrl` + /// matches this script's URL or hash. Clients that use this list can ignore the + /// `breakpointResolved` event. They are equivalent. + /// + [DataMember(Name = ("resolvedBreakpoints"), IsRequired = (false))] + public System.Collections.Generic.IList ResolvedBreakpoints + { + get; + private set; + } } } @@ -39987,6 +40089,22 @@ public System.Threading.Tasks.Task LoadUnpackedAsync(strin return _client.ExecuteDevToolsMethodAsync("Extensions.loadUnpacked", dict); } + partial void ValidateUninstall(string id); + /// + /// Uninstalls an unpacked extension (others not supported) from the profile. + /// Available if the client is connected using the --remote-debugging-pipe flag + /// and the --enable-unsafe-extension-debugging. + /// + /// Extension id. + /// returns System.Threading.Tasks.Task<DevToolsMethodResponse> + public System.Threading.Tasks.Task UninstallAsync(string id) + { + ValidateUninstall(id); + var dict = new System.Collections.Generic.Dictionary(); + dict.Add("id", id); + return _client.ExecuteDevToolsMethodAsync("Extensions.uninstall", dict); + } + partial void ValidateGetStorageItems(string id, CefSharp.DevTools.Extensions.StorageArea storageArea, string[] keys = null); /// /// Gets data from extension storage in the given `storageArea`. If `keys` is @@ -42172,17 +42290,23 @@ public System.Threading.Tasks.Task CollectClassNamesA return _client.ExecuteDevToolsMethodAsync("CSS.collectClassNames", dict); } - partial void ValidateCreateStyleSheet(string frameId); + partial void ValidateCreateStyleSheet(string frameId, bool? force = null); /// /// Creates a new special "via-inspector" stylesheet in the frame with given `frameId`. /// /// Identifier of the frame where "via-inspector" stylesheet should be created. + /// If true, creates a new stylesheet for every call. If false,returns a stylesheet previously created by a call with force=falsefor the frame's document if it exists or creates a new stylesheet(default: false). /// returns System.Threading.Tasks.Task<CreateStyleSheetResponse> - public System.Threading.Tasks.Task CreateStyleSheetAsync(string frameId) + public System.Threading.Tasks.Task CreateStyleSheetAsync(string frameId, bool? force = null) { - ValidateCreateStyleSheet(frameId); + ValidateCreateStyleSheet(frameId, force); var dict = new System.Collections.Generic.Dictionary(); dict.Add("frameId", frameId); + if (force.HasValue) + { + dict.Add("force", force.Value); + } + return _client.ExecuteDevToolsMethodAsync("CSS.createStyleSheet", dict); } @@ -45883,185 +46007,6 @@ public System.Threading.Tasks.Task SetDOMStorageItemAsyn } } -namespace CefSharp.DevTools.Database -{ - /// - /// ExecuteSQLResponse - /// - [DataContract] - public class ExecuteSQLResponse : DevToolsDomainResponseBase - { - [DataMember] - internal string[] columnNames - { - get; - set; - } - - /// - /// columnNames - /// - public string[] ColumnNames - { - get - { - return columnNames; - } - } - - [DataMember] - internal object[] values - { - get; - set; - } - - /// - /// values - /// - public object[] Values - { - get - { - return values; - } - } - - [DataMember] - internal CefSharp.DevTools.Database.Error sqlError - { - get; - set; - } - - /// - /// sqlError - /// - public CefSharp.DevTools.Database.Error SqlError - { - get - { - return sqlError; - } - } - } -} - -namespace CefSharp.DevTools.Database -{ - /// - /// GetDatabaseTableNamesResponse - /// - [DataContract] - public class GetDatabaseTableNamesResponse : DevToolsDomainResponseBase - { - [DataMember] - internal string[] tableNames - { - get; - set; - } - - /// - /// tableNames - /// - public string[] TableNames - { - get - { - return tableNames; - } - } - } -} - -namespace CefSharp.DevTools.Database -{ - using System.Linq; - - /// - /// Database - /// - public partial class DatabaseClient : DevToolsDomainBase - { - private CefSharp.DevTools.IDevToolsClient _client; - /// - /// Database - /// - /// DevToolsClient - public DatabaseClient(CefSharp.DevTools.IDevToolsClient client) - { - _client = (client); - } - - /// - /// AddDatabase - /// - public event System.EventHandler AddDatabase - { - add - { - _client.AddEventHandler("Database.addDatabase", value); - } - - remove - { - _client.RemoveEventHandler("Database.addDatabase", value); - } - } - - /// - /// Disables database tracking, prevents database events from being sent to the client. - /// - /// returns System.Threading.Tasks.Task<DevToolsMethodResponse> - public System.Threading.Tasks.Task DisableAsync() - { - System.Collections.Generic.Dictionary dict = null; - return _client.ExecuteDevToolsMethodAsync("Database.disable", dict); - } - - /// - /// Enables database tracking, database events will now be delivered to the client. - /// - /// returns System.Threading.Tasks.Task<DevToolsMethodResponse> - public System.Threading.Tasks.Task EnableAsync() - { - System.Collections.Generic.Dictionary dict = null; - return _client.ExecuteDevToolsMethodAsync("Database.enable", dict); - } - - partial void ValidateExecuteSQL(string databaseId, string query); - /// - /// ExecuteSQL - /// - /// databaseId - /// query - /// returns System.Threading.Tasks.Task<ExecuteSQLResponse> - public System.Threading.Tasks.Task ExecuteSQLAsync(string databaseId, string query) - { - ValidateExecuteSQL(databaseId, query); - var dict = new System.Collections.Generic.Dictionary(); - dict.Add("databaseId", databaseId); - dict.Add("query", query); - return _client.ExecuteDevToolsMethodAsync("Database.executeSQL", dict); - } - - partial void ValidateGetDatabaseTableNames(string databaseId); - /// - /// GetDatabaseTableNames - /// - /// databaseId - /// returns System.Threading.Tasks.Task<GetDatabaseTableNamesResponse> - public System.Threading.Tasks.Task GetDatabaseTableNamesAsync(string databaseId) - { - ValidateGetDatabaseTableNames(databaseId); - var dict = new System.Collections.Generic.Dictionary(); - dict.Add("databaseId", databaseId); - return _client.ExecuteDevToolsMethodAsync("Database.getDatabaseTableNames", dict); - } - } -} - namespace CefSharp.DevTools.DeviceOrientation { using System.Linq; @@ -52407,6 +52352,28 @@ public event System.EventHandler FrameResized } } + /// + /// Fired when a navigation starts. This event is fired for both + /// renderer-initiated and browser-initiated navigations. For renderer-initiated + /// navigations, the event is fired after `frameRequestedNavigation`. + /// Navigation may still be cancelled after the event is issued. Multiple events + /// can be fired for a single navigation, for example, when a same-document + /// navigation becomes a cross-document navigation (such as in the case of a + /// frameset). + /// + public event System.EventHandler FrameStartedNavigating + { + add + { + _client.AddEventHandler("Page.frameStartedNavigating", value); + } + + remove + { + _client.RemoveEventHandler("Page.frameStartedNavigating", value); + } + } + /// /// Fired when a renderer-initiated navigation is requested. /// Navigation may still be cancelled after the event is issued. @@ -54429,6 +54396,34 @@ public System.Collections.Generic.IList + /// GetAffectedUrlsForThirdPartyCookieMetadataResponse + /// + [DataContract] + public class GetAffectedUrlsForThirdPartyCookieMetadataResponse : DevToolsDomainResponseBase + { + [DataMember] + internal string[] matchedUrls + { + get; + set; + } + + /// + /// matchedUrls + /// + public string[] MatchedUrls + { + get + { + return matchedUrls; + } + } + } +} + namespace CefSharp.DevTools.Storage { using System.Linq; @@ -55164,6 +55159,24 @@ public System.Threading.Tasks.Task GetRelatedWebs System.Collections.Generic.Dictionary dict = null; return _client.ExecuteDevToolsMethodAsync("Storage.getRelatedWebsiteSets", dict); } + + partial void ValidateGetAffectedUrlsForThirdPartyCookieMetadata(string firstPartyUrl, string[] thirdPartyUrls); + /// + /// Returns the list of URLs from a page and its embedded resources that match + /// existing grace period URL pattern rules. + /// https://developers.google.com/privacy-sandbox/cookies/temporary-exceptions/grace-period + /// + /// The URL of the page currently being visited. + /// The list of embedded resource URLs from the page. + /// returns System.Threading.Tasks.Task<GetAffectedUrlsForThirdPartyCookieMetadataResponse> + public System.Threading.Tasks.Task GetAffectedUrlsForThirdPartyCookieMetadataAsync(string firstPartyUrl, string[] thirdPartyUrls) + { + ValidateGetAffectedUrlsForThirdPartyCookieMetadata(firstPartyUrl, thirdPartyUrls); + var dict = new System.Collections.Generic.Dictionary(); + dict.Add("firstPartyUrl", firstPartyUrl); + dict.Add("thirdPartyUrls", thirdPartyUrls); + return _client.ExecuteDevToolsMethodAsync("Storage.getAffectedUrlsForThirdPartyCookieMetadata", dict); + } } } @@ -55850,24 +55863,25 @@ public System.Threading.Tasks.Task GetBrowserContext return _client.ExecuteDevToolsMethodAsync("Target.getBrowserContexts", dict); } - partial void ValidateCreateTarget(string url, int? left = null, int? top = null, int? width = null, int? height = null, string browserContextId = null, bool? enableBeginFrameControl = null, bool? newWindow = null, bool? background = null, bool? forTab = null); + partial void ValidateCreateTarget(string url, int? left = null, int? top = null, int? width = null, int? height = null, CefSharp.DevTools.Target.WindowState? windowState = null, string browserContextId = null, bool? enableBeginFrameControl = null, bool? newWindow = null, bool? background = null, bool? forTab = null); /// /// Creates a new page. /// /// The initial URL the page will be navigated to. An empty string indicates about:blank. - /// Frame left origin in DIP (headless chrome only). - /// Frame top origin in DIP (headless chrome only). - /// Frame width in DIP (headless chrome only). - /// Frame height in DIP (headless chrome only). + /// Frame left origin in DIP (requires newWindow to be true or headless shell). + /// Frame top origin in DIP (requires newWindow to be true or headless shell). + /// Frame width in DIP (requires newWindow to be true or headless shell). + /// Frame height in DIP (requires newWindow to be true or headless shell). + /// Frame window state (requires newWindow to be true or headless shell).Default is normal. /// The browser context to create the page in. - /// Whether BeginFrames for this target will be controlled via DevTools (headless chrome only,not supported on MacOS yet, false by default). - /// Whether to create a new Window or Tab (chrome-only, false by default). - /// Whether to create the target in background or foreground (chrome-only,false by default). + /// Whether BeginFrames for this target will be controlled via DevTools (headless shell only,not supported on MacOS yet, false by default). + /// Whether to create a new Window or Tab (false by default, not supported by headless shell). + /// Whether to create the target in background or foreground (false by default, not supportedby headless shell). /// Whether to create the target of type "tab". /// returns System.Threading.Tasks.Task<CreateTargetResponse> - public System.Threading.Tasks.Task CreateTargetAsync(string url, int? left = null, int? top = null, int? width = null, int? height = null, string browserContextId = null, bool? enableBeginFrameControl = null, bool? newWindow = null, bool? background = null, bool? forTab = null) + public System.Threading.Tasks.Task CreateTargetAsync(string url, int? left = null, int? top = null, int? width = null, int? height = null, CefSharp.DevTools.Target.WindowState? windowState = null, string browserContextId = null, bool? enableBeginFrameControl = null, bool? newWindow = null, bool? background = null, bool? forTab = null) { - ValidateCreateTarget(url, left, top, width, height, browserContextId, enableBeginFrameControl, newWindow, background, forTab); + ValidateCreateTarget(url, left, top, width, height, windowState, browserContextId, enableBeginFrameControl, newWindow, background, forTab); var dict = new System.Collections.Generic.Dictionary(); dict.Add("url", url); if (left.HasValue) @@ -55890,6 +55904,11 @@ public System.Threading.Tasks.Task CreateTargetAsync(strin dict.Add("height", height.Value); } + if (windowState.HasValue) + { + dict.Add("windowState", EnumToString(windowState)); + } + if (!(string.IsNullOrEmpty(browserContextId))) { dict.Add("browserContextId", browserContextId); @@ -59122,22 +59141,6 @@ public DebuggerClient(CefSharp.DevTools.IDevToolsClient client) _client = (client); } - /// - /// Fired when breakpoint is resolved to an actual script and location. - /// - public event System.EventHandler BreakpointResolved - { - add - { - _client.AddEventHandler("Debugger.breakpointResolved", value); - } - - remove - { - _client.RemoveEventHandler("Debugger.breakpointResolved", value); - } - } - /// /// Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria. /// @@ -60848,6 +60851,42 @@ public double TotalSize return totalSize; } } + + [DataMember] + internal double embedderHeapUsedSize + { + get; + set; + } + + /// + /// embedderHeapUsedSize + /// + public double EmbedderHeapUsedSize + { + get + { + return embedderHeapUsedSize; + } + } + + [DataMember] + internal double backingStorageSize + { + get; + set; + } + + /// + /// backingStorageSize + /// + public double BackingStorageSize + { + get + { + return backingStorageSize; + } + } } } @@ -62076,23 +62115,6 @@ public CefSharp.DevTools.DOMStorage.DOMStorageClient DOMStorage } } - private CefSharp.DevTools.Database.DatabaseClient _Database; - /// - /// Database - /// - public CefSharp.DevTools.Database.DatabaseClient Database - { - get - { - if ((_Database) == (null)) - { - _Database = (new CefSharp.DevTools.Database.DatabaseClient(this)); - } - - return _Database; - } - } - private CefSharp.DevTools.DeviceOrientation.DeviceOrientationClient _DeviceOrientation; /// /// DeviceOrientation diff --git a/CefSharp.Core/DevTools/DevToolsClient.Generated.netcore.cs b/CefSharp.Core/DevTools/DevToolsClient.Generated.netcore.cs index 5467c0ee8..7f3659eb3 100644 --- a/CefSharp.Core/DevTools/DevToolsClient.Generated.netcore.cs +++ b/CefSharp.Core/DevTools/DevToolsClient.Generated.netcore.cs @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. // // **This code was generated by a tool, do not change directly** -// CHROMIUM VERSION 133.0.6943.99 +// CHROMIUM VERSION 134.0.6998.89 using System.Text.Json.Serialization; namespace CefSharp.DevTools.Accessibility @@ -3312,7 +3312,12 @@ public enum FederatedAuthRequestIssueReason /// TypeNotMatching /// [JsonPropertyName("TypeNotMatching")] - TypeNotMatching + TypeNotMatching, + /// + /// UiDismissedNoEmbargo + /// + [JsonPropertyName("UiDismissedNoEmbargo")] + UiDismissedNoEmbargo } /// @@ -3484,7 +3489,7 @@ public enum SelectElementAccessibilityIssueReason } /// - /// This isue warns about errors in the select element content model. + /// This issue warns about errors in the select element content model. /// public partial class SelectElementAccessibilityIssueDetails : CefSharp.DevTools.DevToolsDomainEntityBase { @@ -10300,104 +10305,6 @@ public CefSharp.DevTools.DOMStorage.StorageId StorageId } } -namespace CefSharp.DevTools.Database -{ - /// - /// Database object. - /// - public partial class Database : CefSharp.DevTools.DevToolsDomainEntityBase - { - /// - /// Database ID. - /// - [JsonPropertyName("id")] - [System.Diagnostics.CodeAnalysis.DisallowNull] - public string Id - { - get; - set; - } - - /// - /// Database domain. - /// - [JsonPropertyName("domain")] - [System.Diagnostics.CodeAnalysis.DisallowNull] - public string Domain - { - get; - set; - } - - /// - /// Database name. - /// - [JsonPropertyName("name")] - [System.Diagnostics.CodeAnalysis.DisallowNull] - public string Name - { - get; - set; - } - - /// - /// Database version. - /// - [JsonPropertyName("version")] - [System.Diagnostics.CodeAnalysis.DisallowNull] - public string Version - { - get; - set; - } - } - - /// - /// Database error. - /// - public partial class Error : CefSharp.DevTools.DevToolsDomainEntityBase - { - /// - /// Error message. - /// - [JsonPropertyName("message")] - [System.Diagnostics.CodeAnalysis.DisallowNull] - public string Message - { - get; - set; - } - - /// - /// Error code. - /// - [JsonPropertyName("code")] - public int Code - { - get; - set; - } - } - - /// - /// addDatabase - /// - public class AddDatabaseEventArgs : CefSharp.DevTools.DevToolsDomainEventArgsBase - { - /// - /// Database - /// - [JsonInclude] - [JsonPropertyName("database")] - [System.Diagnostics.CodeAnalysis.DisallowNull] - public CefSharp.DevTools.Database.Database Database - { - get; - private set; - } - } -} - namespace CefSharp.DevTools.Emulation { /// @@ -15285,7 +15192,12 @@ public enum CookieExemptionReason /// Scheme /// [JsonPropertyName("Scheme")] - Scheme + Scheme, + /// + /// SameSiteNoneCookiesInSandbox + /// + [JsonPropertyName("SameSiteNoneCookiesInSandbox")] + SameSiteNoneCookiesInSandbox } /// @@ -19763,6 +19675,11 @@ public enum PermissionsPolicyFeature [JsonPropertyName("ch-ua-bitness")] ChUaBitness, /// + /// ch-ua-high-entropy-values + /// + [JsonPropertyName("ch-ua-high-entropy-values")] + ChUaHighEntropyValues, + /// /// ch-ua-platform /// [JsonPropertyName("ch-ua-platform")] @@ -23358,6 +23275,115 @@ public CefSharp.DevTools.Page.Frame Frame } } + /// + /// FrameStartedNavigatingNavigationType + /// + public enum FrameStartedNavigatingNavigationType + { + /// + /// reload + /// + [JsonPropertyName("reload")] + Reload, + /// + /// reloadBypassingCache + /// + [JsonPropertyName("reloadBypassingCache")] + ReloadBypassingCache, + /// + /// restore + /// + [JsonPropertyName("restore")] + Restore, + /// + /// restoreWithPost + /// + [JsonPropertyName("restoreWithPost")] + RestoreWithPost, + /// + /// historySameDocument + /// + [JsonPropertyName("historySameDocument")] + HistorySameDocument, + /// + /// historyDifferentDocument + /// + [JsonPropertyName("historyDifferentDocument")] + HistoryDifferentDocument, + /// + /// sameDocument + /// + [JsonPropertyName("sameDocument")] + SameDocument, + /// + /// differentDocument + /// + [JsonPropertyName("differentDocument")] + DifferentDocument + } + + /// + /// Fired when a navigation starts. This event is fired for both + /// renderer-initiated and browser-initiated navigations. For renderer-initiated + /// navigations, the event is fired after `frameRequestedNavigation`. + /// Navigation may still be cancelled after the event is issued. Multiple events + /// can be fired for a single navigation, for example, when a same-document + /// navigation becomes a cross-document navigation (such as in the case of a + /// frameset). + /// + public class FrameStartedNavigatingEventArgs : CefSharp.DevTools.DevToolsDomainEventArgsBase + { + /// + /// ID of the frame that is being navigated. + /// + [JsonInclude] + [JsonPropertyName("frameId")] + [System.Diagnostics.CodeAnalysis.DisallowNull] + public string FrameId + { + get; + private set; + } + + /// + /// The URL the navigation started with. The final URL can be different. + /// + [JsonInclude] + [JsonPropertyName("url")] + [System.Diagnostics.CodeAnalysis.DisallowNull] + public string Url + { + get; + private set; + } + + /// + /// Loader identifier. Even though it is present in case of same-document + /// navigation, the previously committed loaderId would not change unless + /// the navigation changes from a same-document to a cross-document + /// navigation. + /// + [JsonInclude] + [JsonPropertyName("loaderId")] + [System.Diagnostics.CodeAnalysis.DisallowNull] + public string LoaderId + { + get; + private set; + } + + /// + /// NavigationType + /// + [JsonInclude] + [JsonPropertyName("navigationType")] + public CefSharp.DevTools.Page.FrameStartedNavigatingNavigationType NavigationType + { + get; + private set; + } + } + /// /// Fired when a renderer-initiated navigation is requested. /// Navigation may still be cancelled after the event is issued. @@ -25362,11 +25388,6 @@ namespace CefSharp.DevTools.Storage /// public enum StorageType { - /// - /// appcache - /// - [JsonPropertyName("appcache")] - Appcache, /// /// cookies /// @@ -28400,6 +28421,33 @@ public int Port } } + /// + /// The state of the target window. + /// + public enum WindowState + { + /// + /// normal + /// + [JsonPropertyName("normal")] + Normal, + /// + /// minimized + /// + [JsonPropertyName("minimized")] + Minimized, + /// + /// maximized + /// + [JsonPropertyName("maximized")] + Maximized, + /// + /// fullscreen + /// + [JsonPropertyName("fullscreen")] + Fullscreen + } + /// /// Issued when attached to target because of auto-attach or `attachToTarget` command. /// @@ -33344,8 +33392,37 @@ public string ExternalURL } } + /// + /// ResolvedBreakpoint + /// + public partial class ResolvedBreakpoint : CefSharp.DevTools.DevToolsDomainEntityBase + { + /// + /// Breakpoint unique identifier. + /// + [JsonPropertyName("breakpointId")] + [System.Diagnostics.CodeAnalysis.DisallowNull] + public string BreakpointId + { + get; + set; + } + + /// + /// Actual breakpoint location. + /// + [JsonPropertyName("location")] + [System.Diagnostics.CodeAnalysis.DisallowNull] + public CefSharp.DevTools.Debugger.Location Location + { + get; + set; + } + } + /// /// Fired when breakpoint is resolved to an actual script and location. + /// Deprecated in favor of `resolvedBreakpoints` in the `scriptParsed` event. /// public class BreakpointResolvedEventArgs : CefSharp.DevTools.DevToolsDomainEventArgsBase { @@ -33967,6 +34044,19 @@ public string EmbedderName get; private set; } + + /// + /// The list of set breakpoints in this script if calls to `setBreakpointByUrl` + /// matches this script's URL or hash. Clients that use this list can ignore the + /// `breakpointResolved` event. They are equivalent. + /// + [JsonInclude] + [JsonPropertyName("resolvedBreakpoints")] + public System.Collections.Generic.IList ResolvedBreakpoints + { + get; + private set; + } } } @@ -37404,6 +37494,22 @@ public System.Threading.Tasks.Task LoadUnpackedAsync(strin return _client.ExecuteDevToolsMethodAsync("Extensions.loadUnpacked", dict); } + partial void ValidateUninstall(string id); + /// + /// Uninstalls an unpacked extension (others not supported) from the profile. + /// Available if the client is connected using the --remote-debugging-pipe flag + /// and the --enable-unsafe-extension-debugging. + /// + /// Extension id. + /// returns System.Threading.Tasks.Task<DevToolsMethodResponse> + public System.Threading.Tasks.Task UninstallAsync(string id) + { + ValidateUninstall(id); + var dict = new System.Collections.Generic.Dictionary(); + dict.Add("id", id); + return _client.ExecuteDevToolsMethodAsync("Extensions.uninstall", dict); + } + partial void ValidateGetStorageItems(string id, CefSharp.DevTools.Extensions.StorageArea storageArea, string[] keys = null); /// /// Gets data from extension storage in the given `storageArea`. If `keys` is @@ -39164,17 +39270,23 @@ public System.Threading.Tasks.Task CollectClassNamesA return _client.ExecuteDevToolsMethodAsync("CSS.collectClassNames", dict); } - partial void ValidateCreateStyleSheet(string frameId); + partial void ValidateCreateStyleSheet(string frameId, bool? force = null); /// /// Creates a new special "via-inspector" stylesheet in the frame with given `frameId`. /// /// Identifier of the frame where "via-inspector" stylesheet should be created. + /// If true, creates a new stylesheet for every call. If false,returns a stylesheet previously created by a call with force=falsefor the frame's document if it exists or creates a new stylesheet(default: false). /// returns System.Threading.Tasks.Task<CreateStyleSheetResponse> - public System.Threading.Tasks.Task CreateStyleSheetAsync(string frameId) + public System.Threading.Tasks.Task CreateStyleSheetAsync(string frameId, bool? force = null) { - ValidateCreateStyleSheet(frameId); + ValidateCreateStyleSheet(frameId, force); var dict = new System.Collections.Generic.Dictionary(); dict.Add("frameId", frameId); + if (force.HasValue) + { + dict.Add("force", force.Value); + } + return _client.ExecuteDevToolsMethodAsync("CSS.createStyleSheet", dict); } @@ -42545,155 +42657,6 @@ public System.Threading.Tasks.Task SetDOMStorageItemAsyn } } -namespace CefSharp.DevTools.Database -{ - /// - /// ExecuteSQLResponse - /// - public class ExecuteSQLResponse : DevToolsDomainResponseBase - { - /// - /// columnNames - /// - [JsonInclude] - [JsonPropertyName("columnNames")] - public string[] ColumnNames - { - get; - private set; - } - - /// - /// values - /// - [JsonInclude] - [JsonPropertyName("values")] - public object[] Values - { - get; - private set; - } - - /// - /// sqlError - /// - [JsonInclude] - [JsonPropertyName("sqlError")] - public CefSharp.DevTools.Database.Error SqlError - { - get; - private set; - } - } -} - -namespace CefSharp.DevTools.Database -{ - /// - /// GetDatabaseTableNamesResponse - /// - public class GetDatabaseTableNamesResponse : DevToolsDomainResponseBase - { - /// - /// tableNames - /// - [JsonInclude] - [JsonPropertyName("tableNames")] - public string[] TableNames - { - get; - private set; - } - } -} - -namespace CefSharp.DevTools.Database -{ - using System.Linq; - - /// - /// Database - /// - public partial class DatabaseClient : DevToolsDomainBase - { - private CefSharp.DevTools.IDevToolsClient _client; - /// - /// Database - /// - /// DevToolsClient - public DatabaseClient(CefSharp.DevTools.IDevToolsClient client) - { - _client = (client); - } - - /// - /// AddDatabase - /// - public event System.EventHandler AddDatabase - { - add - { - _client.AddEventHandler("Database.addDatabase", value); - } - - remove - { - _client.RemoveEventHandler("Database.addDatabase", value); - } - } - - /// - /// Disables database tracking, prevents database events from being sent to the client. - /// - /// returns System.Threading.Tasks.Task<DevToolsMethodResponse> - public System.Threading.Tasks.Task DisableAsync() - { - System.Collections.Generic.Dictionary dict = null; - return _client.ExecuteDevToolsMethodAsync("Database.disable", dict); - } - - /// - /// Enables database tracking, database events will now be delivered to the client. - /// - /// returns System.Threading.Tasks.Task<DevToolsMethodResponse> - public System.Threading.Tasks.Task EnableAsync() - { - System.Collections.Generic.Dictionary dict = null; - return _client.ExecuteDevToolsMethodAsync("Database.enable", dict); - } - - partial void ValidateExecuteSQL(string databaseId, string query); - /// - /// ExecuteSQL - /// - /// databaseId - /// query - /// returns System.Threading.Tasks.Task<ExecuteSQLResponse> - public System.Threading.Tasks.Task ExecuteSQLAsync(string databaseId, string query) - { - ValidateExecuteSQL(databaseId, query); - var dict = new System.Collections.Generic.Dictionary(); - dict.Add("databaseId", databaseId); - dict.Add("query", query); - return _client.ExecuteDevToolsMethodAsync("Database.executeSQL", dict); - } - - partial void ValidateGetDatabaseTableNames(string databaseId); - /// - /// GetDatabaseTableNames - /// - /// databaseId - /// returns System.Threading.Tasks.Task<GetDatabaseTableNamesResponse> - public System.Threading.Tasks.Task GetDatabaseTableNamesAsync(string databaseId) - { - ValidateGetDatabaseTableNames(databaseId); - var dict = new System.Collections.Generic.Dictionary(); - dict.Add("databaseId", databaseId); - return _client.ExecuteDevToolsMethodAsync("Database.getDatabaseTableNames", dict); - } - } -} - namespace CefSharp.DevTools.DeviceOrientation { using System.Linq; @@ -48440,6 +48403,28 @@ public event System.EventHandler FrameResized } } + /// + /// Fired when a navigation starts. This event is fired for both + /// renderer-initiated and browser-initiated navigations. For renderer-initiated + /// navigations, the event is fired after `frameRequestedNavigation`. + /// Navigation may still be cancelled after the event is issued. Multiple events + /// can be fired for a single navigation, for example, when a same-document + /// navigation becomes a cross-document navigation (such as in the case of a + /// frameset). + /// + public event System.EventHandler FrameStartedNavigating + { + add + { + _client.AddEventHandler("Page.frameStartedNavigating", value); + } + + remove + { + _client.RemoveEventHandler("Page.frameStartedNavigating", value); + } + } + /// /// Fired when a renderer-initiated navigation is requested. /// Navigation may still be cancelled after the event is issued. @@ -50345,6 +50330,26 @@ public System.Collections.Generic.IList + /// GetAffectedUrlsForThirdPartyCookieMetadataResponse + /// + public class GetAffectedUrlsForThirdPartyCookieMetadataResponse : DevToolsDomainResponseBase + { + /// + /// matchedUrls + /// + [JsonInclude] + [JsonPropertyName("matchedUrls")] + public string[] MatchedUrls + { + get; + private set; + } + } +} + namespace CefSharp.DevTools.Storage { using System.Linq; @@ -51080,6 +51085,24 @@ public System.Threading.Tasks.Task GetRelatedWebs System.Collections.Generic.Dictionary dict = null; return _client.ExecuteDevToolsMethodAsync("Storage.getRelatedWebsiteSets", dict); } + + partial void ValidateGetAffectedUrlsForThirdPartyCookieMetadata(string firstPartyUrl, string[] thirdPartyUrls); + /// + /// Returns the list of URLs from a page and its embedded resources that match + /// existing grace period URL pattern rules. + /// https://developers.google.com/privacy-sandbox/cookies/temporary-exceptions/grace-period + /// + /// The URL of the page currently being visited. + /// The list of embedded resource URLs from the page. + /// returns System.Threading.Tasks.Task<GetAffectedUrlsForThirdPartyCookieMetadataResponse> + public System.Threading.Tasks.Task GetAffectedUrlsForThirdPartyCookieMetadataAsync(string firstPartyUrl, string[] thirdPartyUrls) + { + ValidateGetAffectedUrlsForThirdPartyCookieMetadata(firstPartyUrl, thirdPartyUrls); + var dict = new System.Collections.Generic.Dictionary(); + dict.Add("firstPartyUrl", firstPartyUrl); + dict.Add("thirdPartyUrls", thirdPartyUrls); + return _client.ExecuteDevToolsMethodAsync("Storage.getAffectedUrlsForThirdPartyCookieMetadata", dict); + } } } @@ -51657,24 +51680,25 @@ public System.Threading.Tasks.Task GetBrowserContext return _client.ExecuteDevToolsMethodAsync("Target.getBrowserContexts", dict); } - partial void ValidateCreateTarget(string url, int? left = null, int? top = null, int? width = null, int? height = null, string browserContextId = null, bool? enableBeginFrameControl = null, bool? newWindow = null, bool? background = null, bool? forTab = null); + partial void ValidateCreateTarget(string url, int? left = null, int? top = null, int? width = null, int? height = null, CefSharp.DevTools.Target.WindowState? windowState = null, string browserContextId = null, bool? enableBeginFrameControl = null, bool? newWindow = null, bool? background = null, bool? forTab = null); /// /// Creates a new page. /// /// The initial URL the page will be navigated to. An empty string indicates about:blank. - /// Frame left origin in DIP (headless chrome only). - /// Frame top origin in DIP (headless chrome only). - /// Frame width in DIP (headless chrome only). - /// Frame height in DIP (headless chrome only). + /// Frame left origin in DIP (requires newWindow to be true or headless shell). + /// Frame top origin in DIP (requires newWindow to be true or headless shell). + /// Frame width in DIP (requires newWindow to be true or headless shell). + /// Frame height in DIP (requires newWindow to be true or headless shell). + /// Frame window state (requires newWindow to be true or headless shell).Default is normal. /// The browser context to create the page in. - /// Whether BeginFrames for this target will be controlled via DevTools (headless chrome only,not supported on MacOS yet, false by default). - /// Whether to create a new Window or Tab (chrome-only, false by default). - /// Whether to create the target in background or foreground (chrome-only,false by default). + /// Whether BeginFrames for this target will be controlled via DevTools (headless shell only,not supported on MacOS yet, false by default). + /// Whether to create a new Window or Tab (false by default, not supported by headless shell). + /// Whether to create the target in background or foreground (false by default, not supportedby headless shell). /// Whether to create the target of type "tab". /// returns System.Threading.Tasks.Task<CreateTargetResponse> - public System.Threading.Tasks.Task CreateTargetAsync(string url, int? left = null, int? top = null, int? width = null, int? height = null, string browserContextId = null, bool? enableBeginFrameControl = null, bool? newWindow = null, bool? background = null, bool? forTab = null) + public System.Threading.Tasks.Task CreateTargetAsync(string url, int? left = null, int? top = null, int? width = null, int? height = null, CefSharp.DevTools.Target.WindowState? windowState = null, string browserContextId = null, bool? enableBeginFrameControl = null, bool? newWindow = null, bool? background = null, bool? forTab = null) { - ValidateCreateTarget(url, left, top, width, height, browserContextId, enableBeginFrameControl, newWindow, background, forTab); + ValidateCreateTarget(url, left, top, width, height, windowState, browserContextId, enableBeginFrameControl, newWindow, background, forTab); var dict = new System.Collections.Generic.Dictionary(); dict.Add("url", url); if (left.HasValue) @@ -51697,6 +51721,11 @@ public System.Threading.Tasks.Task CreateTargetAsync(strin dict.Add("height", height.Value); } + if (windowState.HasValue) + { + dict.Add("windowState", EnumToString(windowState)); + } + if (!(string.IsNullOrEmpty(browserContextId))) { dict.Add("browserContextId", browserContextId); @@ -54610,22 +54639,6 @@ public DebuggerClient(CefSharp.DevTools.IDevToolsClient client) _client = (client); } - /// - /// Fired when breakpoint is resolved to an actual script and location. - /// - public event System.EventHandler BreakpointResolved - { - add - { - _client.AddEventHandler("Debugger.breakpointResolved", value); - } - - remove - { - _client.RemoveEventHandler("Debugger.breakpointResolved", value); - } - } - /// /// Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria. /// @@ -56182,6 +56195,28 @@ public double TotalSize get; private set; } + + /// + /// embedderHeapUsedSize + /// + [JsonInclude] + [JsonPropertyName("embedderHeapUsedSize")] + public double EmbedderHeapUsedSize + { + get; + private set; + } + + /// + /// backingStorageSize + /// + [JsonInclude] + [JsonPropertyName("backingStorageSize")] + public double BackingStorageSize + { + get; + private set; + } } } @@ -57342,23 +57377,6 @@ public CefSharp.DevTools.DOMStorage.DOMStorageClient DOMStorage } } - private CefSharp.DevTools.Database.DatabaseClient _Database; - /// - /// Database - /// - public CefSharp.DevTools.Database.DatabaseClient Database - { - get - { - if ((_Database) == (null)) - { - _Database = (new CefSharp.DevTools.Database.DatabaseClient(this)); - } - - return _Database; - } - } - private CefSharp.DevTools.DeviceOrientation.DeviceOrientationClient _DeviceOrientation; /// /// DeviceOrientation From c43ed62399b5bc614541f1c4b466c7a8ea475865 Mon Sep 17 00:00:00 2001 From: amaitland <307872+amaitland@users.noreply.github.com> Date: Sun, 16 Mar 2025 13:05:32 +1000 Subject: [PATCH 3/5] Core - Add Cef.ApiHash Issue #5066 --- CefSharp.Core.Runtime/Cef.h | 53 +++++++++++++++++++++++++++++ CefSharp.Core/Cef.cs | 58 ++++++++++++++++++++++++++++++++ CefSharp.Test/CefSharpFixture.cs | 7 ++++ 3 files changed, 118 insertions(+) diff --git a/CefSharp.Core.Runtime/Cef.h b/CefSharp.Core.Runtime/Cef.h index 1c97f1f3e..c0a087ae8 100644 --- a/CefSharp.Core.Runtime/Cef.h +++ b/CefSharp.Core.Runtime/Cef.h @@ -125,6 +125,37 @@ namespace CefSharp } } + /// + /// API version that will be compiled client-side. The experimental (unversioned) + /// API is selected by default. Clients can set the CEF_API_VERSION value in + /// their project configuration to configure an explicit API version. Unlike + /// the experimental API, explicit API versions are back/forward compatible with + /// a specific range of CEF versions. + /// + static property int ApiVersion + { + int get() + { + return CEF_API_VERSION; + } + } + + /// + /// API hashes for the selected CEF_API_VERSION. API hashes are created for + /// each version by analyzing CEF header files for C API type definitions. The + /// hash value will change when header files are modified in a way that may + /// cause binary incompatibility with other builds. + /// + static property String^ ApiHashPlatform + { + String^ get() + { + auto hash = CEF_API_HASH_PLATFORM; + + return gcnew String(hash); + } + } + /// Gets a value that indicates the Chromium version currently being used. /// The Chromium version. static property String^ ChromiumVersion @@ -149,6 +180,28 @@ namespace CefSharp } } + /// + /// Configures the CEF API version and returns API hashes for the libcef + /// library. The entry parameter describes which hash value will be returned: + /// + /// 0 - CEF_API_HASH_PLATFORM + /// 1 - CEF_API_HASH_UNIVERSAL (deprecated, same as CEF_API_HASH_PLATFORM) + /// 2 - CEF_COMMIT_HASH (from cef_version.h) + /// + /// + /// parameter should be CEF_API_VERSION and any changes to this value will be ignored after the first call to this method. + /// The entry parameter describes which hash value will be returned: + /// + /// returns API hashes for the libcef library. + /// The returned string is owned by the library and should not be freed. + /// + static String^ ApiHash(int version, int entry) + { + auto response = cef_api_hash(version, entry); + + return gcnew String(response); + } + /// /// Parse the specified url into its component parts. /// Uses a GURL to parse the Url. GURL is Google's URL parsing library. diff --git a/CefSharp.Core/Cef.cs b/CefSharp.Core/Cef.cs index 23ae0f992..e95b42b80 100644 --- a/CefSharp.Core/Cef.cs +++ b/CefSharp.Core/Cef.cs @@ -81,6 +81,30 @@ public static string CefVersion get { return Core.Cef.CefVersion; } } + /// + /// API version that will be compiled client-side. The experimental (unversioned) + /// API is selected by default. Clients can set the CEF_API_VERSION value in + /// their project configuration to configure an explicit API version. Unlike + /// the experimental API, explicit API versions are back/forward compatible with + /// a specific range of CEF versions. + /// + public static int ApiVersion + { + get { return Core.Cef.ApiVersion; } + } + + + /// + /// API hashes for the selected CEF_API_VERSION. API hashes are created for + /// each version by analyzing CEF header files for C API type definitions. The + /// hash value will change when header files are modified in a way that may + /// cause binary incompatibility with other builds. + /// + public static string ApiHashPlatform + { + get { return Core.Cef.ApiHashPlatform; } + } + /// Gets a value that indicates the Chromium version currently being used. /// The Chromium version. public static string ChromiumVersion @@ -97,6 +121,40 @@ public static string CefCommitHash get { return Core.Cef.CefCommitHash; } } + /// + /// Configures the CEF API version and returns API hashes for the libcef + /// library. Defaults to CEF_API_HASH_PLATFORM + /// + /// parameter should be CEF_API_VERSION and any changes to this value will be ignored after the first call to this method. + /// + /// returns API hashes for the libcef library. + /// The returned string is owned by the library and should not be freed. + /// + public static string ApiHash(int version) + { + return ApiHash(version, 0); + } + + /// + /// Configures the CEF API version and returns API hashes for the libcef + /// library. The entry parameter describes which hash value will be returned: + /// + /// 0 - CEF_API_HASH_PLATFORM + /// 1 - CEF_API_HASH_UNIVERSAL (deprecated, same as CEF_API_HASH_PLATFORM) + /// 2 - CEF_COMMIT_HASH (from cef_version.h) + /// + /// + /// parameter should be CEF_API_VERSION and any changes to this value will be ignored after the first call to this method. + /// The entry parameter describes which hash value will be returned: + /// + /// returns API hashes for the libcef library. + /// The returned string is owned by the library and should not be freed. + /// + public static string ApiHash(int version, int entry) + { + return Core.Cef.ApiHash(version, entry); + } + /// /// Parse the specified url into its component parts. /// Uses a GURL to parse the Url. GURL is Google's URL parsing library. diff --git a/CefSharp.Test/CefSharpFixture.cs b/CefSharp.Test/CefSharpFixture.cs index 41de1af53..93d415b5f 100644 --- a/CefSharp.Test/CefSharpFixture.cs +++ b/CefSharp.Test/CefSharpFixture.cs @@ -39,6 +39,13 @@ private void CefInitialize() throw new Exception(@"Add to your app.config to disable appdomains"); } + var apiHash = Cef.ApiHash(Cef.ApiVersion); + + if (Cef.ApiHashPlatform != apiHash) + { + throw new Exception($"CEF API Has does not match expected. {apiHash} {Cef.ApiHashPlatform}"); + } + Cef.EnableWaitForBrowsersToClose(); CefSharp.Internals.BrowserRefCounter.Instance.EnableLogging(); From 0b308027e28637a7cd745408ec6e739c5e8be3a9 Mon Sep 17 00:00:00 2001 From: amaitland <307872+amaitland@users.noreply.github.com> Date: Sat, 22 Mar 2025 13:38:08 +1000 Subject: [PATCH 4/5] Upgrade to 134.3.6+g96006d1+chromium-134.0.6998.118 / Chromium 134.0.6998.118 --- .../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 6e4c6dd31..615b1a808 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 6bdeba39c..edc6a929a 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 5f79f012d..7ee14457e 100644 --- a/CefSharp.BrowserSubprocess.Core/Resource.rc +++ b/CefSharp.BrowserSubprocess.Core/Resource.rc @@ -1,8 +1,8 @@ #pragma code_page(65001) 1 VERSIONINFO - FILEVERSION 134,3,10 - PRODUCTVERSION 134,3,10 + FILEVERSION 134,3,60 + PRODUCTVERSION 134,3,60 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -18,10 +18,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "CefSharp.BrowserSubprocess.Core" - VALUE "FileVersion", "134.3.10" + VALUE "FileVersion", "134.3.60" VALUE "LegalCopyright", "Copyright © 2023 The CefSharp Authors" VALUE "ProductName", "CefSharp" - VALUE "ProductVersion", "134.3.10" + VALUE "ProductVersion", "134.3.60" 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 ba2b2e5bb..6541d7cec 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 28215c0b4..e0fab9ebb 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 2bbc4a6b0..5e7e69835 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 a542a2dda..9781ff30b 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 37032f7b0..86482bbd4 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 1909bfcf2..8b3afea6b 100644 --- a/CefSharp.Core.Runtime/Resource.rc +++ b/CefSharp.Core.Runtime/Resource.rc @@ -1,8 +1,8 @@ #pragma code_page(65001) 1 VERSIONINFO - FILEVERSION 134,3,10 - PRODUCTVERSION 134,3,10 + FILEVERSION 134,3,60 + PRODUCTVERSION 134,3,60 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -18,10 +18,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "CefSharp.Core" - VALUE "FileVersion", "134.3.10" + VALUE "FileVersion", "134.3.60" VALUE "LegalCopyright", "Copyright © 2023 The CefSharp Authors" VALUE "ProductName", "CefSharp" - VALUE "ProductVersion", "134.3.10" + VALUE "ProductVersion", "134.3.60" 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 ba2b2e5bb..6541d7cec 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 28215c0b4..e0fab9ebb 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 b2489198a..c7ec8e44d 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 b60e4b867..b1031574b 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 0e2da4c9a..6c5b1bf30 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 a4074de8f..5fcb8f648 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 275f5c1bd..2cd315539 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 e782fae86..cc0089d39 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 98d79a9b3..ef2c55f77 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 593d23a3b..5758b293f 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 28a5c110f..f60dce748 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 d85b7b6ef..48523f1dc 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 d7ab99807..0204cf367 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 2bf9ee9f0..05b3a5b4f 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 381d80d68..9a56b6e7b 100644 --- a/CefSharp.Wpf.HwndHost.Example/CefSharp.Wpf.HwndHost.Example.netcore.csproj +++ b/CefSharp.Wpf.HwndHost.Example/CefSharp.Wpf.HwndHost.Example.netcore.csproj @@ -42,7 +42,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CefSharp.shfbproj b/CefSharp.shfbproj index e00b5ffc9..c544658f8 100644 --- a/CefSharp.shfbproj +++ b/CefSharp.shfbproj @@ -31,7 +31,7 @@ - 134.3.10 + 134.3.60 2 False C#, Managed C++ @@ -59,7 +59,7 @@ InheritedMembers, InheritedFrameworkMembers, Protected, ProtectedInternalAsProtected, EditorBrowsableNever, NonBrowsable - Version 134.3.10 + Version 134.3.60 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 123b69678..e175f9c2a 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 = "134.3.10"; - public const string AssemblyFileVersion = "134.3.10.0"; + public const string AssemblyVersion = "134.3.60"; + public const string AssemblyFileVersion = "134.3.60.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 934ea0e90..91fec18b1 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 513bf7d7d..fb09976f2 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 ab2d4847e..89f4e58e7 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 851249cbd..acc175194 100644 --- a/UpdateNugetPackages.ps1 +++ b/UpdateNugetPackages.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Position = 1)] - [string] $CefVersion = "134.3.1", + [string] $CefVersion = "134.3.6", [Parameter(Position = 2)] [string] $CefSharpVersion = "" ) diff --git a/build.ps1 b/build.ps1 index d80c2a1dd..6eb306484 100644 --- a/build.ps1 +++ b/build.ps1 @@ -5,9 +5,9 @@ param( [Parameter(Position = 0)] [string] $Target = "vs2019", [Parameter(Position = 1)] - [string] $Version = "134.3.10", + [string] $Version = "134.3.60", [Parameter(Position = 2)] - [string] $AssemblyVersion = "134.3.10", + [string] $AssemblyVersion = "134.3.60", [Parameter(Position = 3)] [ValidateSet("NetFramework", "NetCore", "NetFramework462", "NetCore31")] [string] $TargetFramework = "NetFramework", From 3cbb86d3127c49d8855450120bdca4bd65c146cf Mon Sep 17 00:00:00 2001 From: amaitland <307872+amaitland@users.noreply.github.com> Date: Tue, 1 Apr 2025 06:14:05 +1000 Subject: [PATCH 5/5] Upgrade to 134.3.9+g5dc6f2f+chromium-134.0.6998.178 / Chromium 134.0.6998.178 --- .../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 +- appveyor.yml | 2 +- build.ps1 | 4 ++-- 32 files changed, 46 insertions(+), 46 deletions(-) diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj index 615b1a808..f4bc77dd3 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 edc6a929a..d8e947bcc 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 7ee14457e..34bb9a5ad 100644 --- a/CefSharp.BrowserSubprocess.Core/Resource.rc +++ b/CefSharp.BrowserSubprocess.Core/Resource.rc @@ -1,8 +1,8 @@ #pragma code_page(65001) 1 VERSIONINFO - FILEVERSION 134,3,60 - PRODUCTVERSION 134,3,60 + FILEVERSION 134,3,90 + PRODUCTVERSION 134,3,90 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -18,10 +18,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "CefSharp.BrowserSubprocess.Core" - VALUE "FileVersion", "134.3.60" + VALUE "FileVersion", "134.3.90" VALUE "LegalCopyright", "Copyright © 2023 The CefSharp Authors" VALUE "ProductName", "CefSharp" - VALUE "ProductVersion", "134.3.60" + VALUE "ProductVersion", "134.3.90" 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 6541d7cec..d80040dfa 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 e0fab9ebb..bb328b384 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 5e7e69835..9ff06d328 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 9781ff30b..319bf0895 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 86482bbd4..af4f11762 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 8b3afea6b..a283b976e 100644 --- a/CefSharp.Core.Runtime/Resource.rc +++ b/CefSharp.Core.Runtime/Resource.rc @@ -1,8 +1,8 @@ #pragma code_page(65001) 1 VERSIONINFO - FILEVERSION 134,3,60 - PRODUCTVERSION 134,3,60 + FILEVERSION 134,3,90 + PRODUCTVERSION 134,3,90 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -18,10 +18,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "CefSharp.Core" - VALUE "FileVersion", "134.3.60" + VALUE "FileVersion", "134.3.90" VALUE "LegalCopyright", "Copyright © 2023 The CefSharp Authors" VALUE "ProductName", "CefSharp" - VALUE "ProductVersion", "134.3.60" + VALUE "ProductVersion", "134.3.90" 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 6541d7cec..d80040dfa 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 e0fab9ebb..bb328b384 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 c7ec8e44d..b99db972b 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 b1031574b..f7b19166a 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 6c5b1bf30..d6d7e9aa2 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 5fcb8f648..f7c14fce7 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 2cd315539..66f8e8b3a 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 cc0089d39..0cb15a213 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 ef2c55f77..4d52722f4 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 5758b293f..17a775e5a 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 f60dce748..b0e4bcea2 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 48523f1dc..7107f7da6 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 0204cf367..3157d39c4 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 05b3a5b4f..b04daf06d 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 9a56b6e7b..0c97049f5 100644 --- a/CefSharp.Wpf.HwndHost.Example/CefSharp.Wpf.HwndHost.Example.netcore.csproj +++ b/CefSharp.Wpf.HwndHost.Example/CefSharp.Wpf.HwndHost.Example.netcore.csproj @@ -42,7 +42,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CefSharp.shfbproj b/CefSharp.shfbproj index c544658f8..80b129412 100644 --- a/CefSharp.shfbproj +++ b/CefSharp.shfbproj @@ -31,7 +31,7 @@ - 134.3.60 + 134.3.90 2 False C#, Managed C++ @@ -59,7 +59,7 @@ InheritedMembers, InheritedFrameworkMembers, Protected, ProtectedInternalAsProtected, EditorBrowsableNever, NonBrowsable - Version 134.3.60 + Version 134.3.90 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 e175f9c2a..2eb151a58 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 = "134.3.60"; - public const string AssemblyFileVersion = "134.3.60.0"; + public const string AssemblyVersion = "134.3.90"; + public const string AssemblyFileVersion = "134.3.90.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 91fec18b1..ed34a0421 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 fb09976f2..0b108cf3c 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 89f4e58e7..af74900a2 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 acc175194..483543ba7 100644 --- a/UpdateNugetPackages.ps1 +++ b/UpdateNugetPackages.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Position = 1)] - [string] $CefVersion = "134.3.6", + [string] $CefVersion = "134.3.9", [Parameter(Position = 2)] [string] $CefSharpVersion = "" ) diff --git a/appveyor.yml b/appveyor.yml index edbed7a2e..fb8c890cd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 134.3.10-RCI{build} +version: 134.3.90-RCI{build} clone_depth: 10 diff --git a/build.ps1 b/build.ps1 index 6eb306484..011e340a3 100644 --- a/build.ps1 +++ b/build.ps1 @@ -5,9 +5,9 @@ param( [Parameter(Position = 0)] [string] $Target = "vs2019", [Parameter(Position = 1)] - [string] $Version = "134.3.60", + [string] $Version = "134.3.90", [Parameter(Position = 2)] - [string] $AssemblyVersion = "134.3.60", + [string] $AssemblyVersion = "134.3.90", [Parameter(Position = 3)] [ValidateSet("NetFramework", "NetCore", "NetFramework462", "NetCore31")] [string] $TargetFramework = "NetFramework",