Skip to content

Commit 1699fe5

Browse files
authored
Merge branch 'master' into master
2 parents f266705 + 12d28b6 commit 1699fe5

File tree

48 files changed

+391
-112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+391
-112
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,17 @@ Delete this line and everything above, and then fill in the details below.
6969

7070
- **Does this problem also occur in the `CEF` Sample Application**
7171
- Download one of the following:
72-
- For x86 download https://cef-builds.spotifycdn.com/cef_binary_96.0.18%2Bgfe551e4%2Bchromium-96.0.4664.110_windows32_client.tar.bz2
73-
- For x64 download https://cef-builds.spotifycdn.com/cef_binary_96.0.18%2Bgfe551e4%2Bchromium-96.0.4664.110_windows64_client.tar.bz2
74-
- For arm64 download https://cef-builds.spotifycdn.com/cef_binary_96.0.18%2Bgfe551e4%2Bchromium-96.0.4664.110_windowsarm64_client.tar.bz2
72+
- For x86 download https://cef-builds.spotifycdn.com/cef_binary_97.1.6%2Bg8961cdb%2Bchromium-97.0.4692.99_windows32_client.tar.bz2
73+
- For x64 download https://cef-builds.spotifycdn.com/cef_binary_97.1.6%2Bg8961cdb%2Bchromium-97.0.4692.99_windows64_client.tar.bz2
74+
- For arm64 download https://cef-builds.spotifycdn.com/cef_binary_97.1.6%2Bg8961cdb%2Bchromium-97.0.4692.99_windowsarm64_client.tar.bz2
7575
- Extract and run cefclient.exe
7676
- If you are using WPF/OffScreen run
7777
```
78-
cefclient.exe --multi-threaded-message-loop --off-screen-rendering-enabled --enable-gpu --no-sandbox --disable-site-isolation-trials
78+
cefclient.exe --multi-threaded-message-loop --no-sandbox --off-screen-rendering-enabled --enable-gpu
7979
```
8080
- If you are using WinForms run
8181
```
82-
cefclient.exe --multi-threaded-message-loop --no-sandbox --disable-site-isolation-trials
82+
cefclient.exe --multi-threaded-message-loop --no-sandbox
8383
```
8484
- **MAKE SURE TO TEST WITH THE COMMAND LINE ARGS LISTED ABOVE**
8585
- If you can reproduce the problem with `cefclient` then please report the issue on https://bitbucket.org/chromiumembedded/cef/overview (Make sure you search before opening an issue). If you open an issue here it will most likely be closed as `upstream` as the bug needs to be fixed in `CEF`.

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ The upstream [`CEF` forum](http://magpcss.org/ceforum/) is a valuable resource,
1919
It maybe helpful to run the `cefclient` application and compare output with `CefSharp`. The `WinForms` and `WPF` versions use two different rendering modes, `WPF` uses Offscreen Rendering (`OSR`). `OffScreen` also uses `OSR` mode.
2020

2121
- Download one of the following:
22-
- For x86 download https://cef-builds.spotifycdn.com/cef_binary_96.0.18%2Bgfe551e4%2Bchromium-96.0.4664.110_windows32_client.tar.bz2
23-
- For x64 download https://cef-builds.spotifycdn.com/cef_binary_96.0.18%2Bgfe551e4%2Bchromium-96.0.4664.110_windows64_client.tar.bz2
24-
- For arm64 download https://cef-builds.spotifycdn.com/cef_binary_96.0.18%2Bgfe551e4%2Bchromium-96.0.4664.110_windowsarm64_client.tar.bz2
22+
- For x86 download https://cef-builds.spotifycdn.com/cef_binary_97.1.6%2Bg8961cdb%2Bchromium-97.0.4692.99_windows32_client.tar.bz2
23+
- For x64 download https://cef-builds.spotifycdn.com/cef_binary_97.1.6%2Bg8961cdb%2Bchromium-97.0.4692.99_windows64_client.tar.bz2
24+
- For arm64 download https://cef-builds.spotifycdn.com/cef_binary_97.1.6%2Bg8961cdb%2Bchromium-97.0.4692.99_windowsarm64_client.tar.bz2
2525
- Extract and run cefclient.exe
2626
- If you are using WPF/OffScreen run
2727
```
28-
cefclient.exe --multi-threaded-message-loop --off-screen-rendering-enabled --enable-gpu --no-sandbox --disable-site-isolation-trials --disable-gpu-compositing
28+
cefclient.exe --multi-threaded-message-loop --no-sandbox --off-screen-rendering-enabled --enable-gpu
2929
```
3030
- If you are using WinForms run
3131
```
32-
cefclient.exe --multi-threaded-message-loop --no-sandbox --disable-site-isolation-trials
32+
cefclient.exe --multi-threaded-message-loop --no-sandbox
3333
```
3434
- **MAKE SURE TO TEST WITH THE COMMAND LINE ARGS LISTED ABOVE**
3535
- If you can reproduce the problem with `cefclient` then you'll need to report the bug on https://bitbucket.org/chromiumembedded/cef/overview there is no point opening an issue here. (Make sure you search before opening an issue)

CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\cef.sdk.97.1.1\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.97.1.1\build\cef.sdk.props')" />
3+
<Import Project="..\packages\cef.sdk.98.1.12\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.98.1.12\build\cef.sdk.props')" />
44
<Import Project="..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
55
<Import Project="..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
66
<Import Project="..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />

CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\cef.sdk.97.1.1\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.97.1.1\build\cef.sdk.props')" />
3+
<Import Project="..\packages\cef.sdk.98.1.12\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.98.1.12\build\cef.sdk.props')" />
44
<Import Project="..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
55
<Import Project="..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
66
<Import Project="..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />

CefSharp.BrowserSubprocess.Core/Resource.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma code_page(65001)
22

33
1 VERSIONINFO
4-
FILEVERSION 97,1,10
5-
PRODUCTVERSION 97,1,10
4+
FILEVERSION 98,1,120
5+
PRODUCTVERSION 98,1,120
66
FILEFLAGSMASK 0x17L
77
#ifdef _DEBUG
88
FILEFLAGS 0x1L
@@ -18,10 +18,10 @@ BEGIN
1818
BLOCK "040904b0"
1919
BEGIN
2020
VALUE "FileDescription", "CefSharp.BrowserSubprocess.Core"
21-
VALUE "FileVersion", "97.1.10"
21+
VALUE "FileVersion", "98.1.120"
2222
VALUE "LegalCopyright", "Copyright © 2022 The CefSharp Authors"
2323
VALUE "ProductName", "CefSharp"
24-
VALUE "ProductVersion", "97.1.10"
24+
VALUE "ProductVersion", "98.1.120"
2525
END
2626
END
2727
BLOCK "VarFileInfo"

CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.sdk" version="97.1.1" targetFramework="native" />
3+
<package id="cef.sdk" version="98.1.12" targetFramework="native" />
44
<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
55
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
66
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />

CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.netcore.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.sdk" version="97.1.1" targetFramework="netcoreapp3.1" />
3+
<package id="cef.sdk" version="98.1.12" targetFramework="netcoreapp3.1" />
44
<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
55
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
66
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />

CefSharp.BrowserSubprocess/app.manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
99
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
1010

11-
<assemblyIdentity version="97.1.10.0" name="CefSharp.BrowserSubprocess.app" />
11+
<assemblyIdentity version="98.1.120.0" name="CefSharp.BrowserSubprocess.app" />
1212
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
1313
<security>
1414
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\cef.sdk.97.1.1\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.97.1.1\build\cef.sdk.props')" />
3+
<Import Project="..\packages\cef.sdk.98.1.12\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.98.1.12\build\cef.sdk.props')" />
44
<Import Project="..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
55
<Import Project="..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
66
<Import Project="..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />

CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\cef.sdk.97.1.1\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.97.1.1\build\cef.sdk.props')" />
3+
<Import Project="..\packages\cef.sdk.98.1.12\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.98.1.12\build\cef.sdk.props')" />
44
<Import Project="..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
55
<Import Project="..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
66
<Import Project="..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />

0 commit comments

Comments
 (0)