Skip to content

Commit

Permalink
Upgrade to CEF 97.0.8+g4eb2da6+chromium-97.0.4692.36 / Chromium 97.0.…
Browse files Browse the repository at this point in the history
…4692.36
  • Loading branch information
amaitland committed Dec 7, 2021
1 parent 4313c9a commit f619a1a
Show file tree
Hide file tree
Showing 20 changed files with 23 additions and 23 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\cef.sdk.96.0.14\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.96.0.14\build\cef.sdk.props')" />
<Import Project="..\packages\cef.sdk.97.0.8\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.97.0.8\build\cef.sdk.props')" />
<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')" />
<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')" />
<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')" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\cef.sdk.96.0.14\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.96.0.14\build\cef.sdk.props')" />
<Import Project="..\packages\cef.sdk.97.0.8\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.97.0.8\build\cef.sdk.props')" />
<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')" />
<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')" />
<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')" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="cef.sdk" version="96.0.14" targetFramework="native" />
<package id="cef.sdk" version="97.0.8" targetFramework="native" />
<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="cef.sdk" version="96.0.14" targetFramework="netcoreapp3.1" />
<package id="cef.sdk" version="97.0.8" targetFramework="netcoreapp3.1" />
<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\cef.sdk.96.0.14\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.96.0.14\build\cef.sdk.props')" />
<Import Project="..\packages\cef.sdk.97.0.8\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.97.0.8\build\cef.sdk.props')" />
<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')" />
<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')" />
<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')" />
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\cef.sdk.96.0.14\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.96.0.14\build\cef.sdk.props')" />
<Import Project="..\packages\cef.sdk.97.0.8\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.97.0.8\build\cef.sdk.props')" />
<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')" />
<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')" />
<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')" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="cef.sdk" version="96.0.14" targetFramework="native" />
<package id="cef.sdk" version="97.0.8" targetFramework="native" />
<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="cef.sdk" version="96.0.14" targetFramework="netcoreapp3.1" />
<package id="cef.sdk" version="97.0.8" targetFramework="netcoreapp3.1" />
<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="chromiumembeddedframework.runtime" Version="96.0.14" />
<PackageReference Include="chromiumembeddedframework.runtime" Version="97.0.8" />
</ItemGroup>
<ItemGroup>
<Compile Remove="bin.netcore\**" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<ProjectReference Include="..\CefSharp.Example\CefSharp.Example.netcore.csproj" />
<ProjectReference Include="..\CefSharp.OffScreen\CefSharp.OffScreen.netcore.csproj" />
<ProjectReference Include="..\CefSharp\CefSharp.netcore.csproj" />
<PackageReference Include="chromiumembeddedframework.runtime" Version="96.0.14" />
<PackageReference Include="chromiumembeddedframework.runtime" Version="97.0.8" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Test/CefSharp.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<ProjectReference Include="..\CefSharp\CefSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="chromiumembeddedframework.runtime" Version="96.0.14" />
<PackageReference Include="chromiumembeddedframework.runtime" Version="97.0.8" />

<PackageReference Include="Moq" Version="4.13.0" />
<PackageReference Include="Nito.AsyncEx.Context" Version="5.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Test/CefSharp.Test.netcore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<ProjectReference Include="..\CefSharp.WinForms\CefSharp.WinForms.netcore.csproj" />
<ProjectReference Include="..\CefSharp.Wpf\CefSharp.Wpf.netcore.csproj" />
<ProjectReference Include="..\CefSharp.Example\CefSharp.Example.netcore.csproj" />
<PackageReference Include="chromiumembeddedframework.runtime" Version="96.0.14" />
<PackageReference Include="chromiumembeddedframework.runtime" Version="97.0.8" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<ProjectReference Include="..\CefSharp\CefSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="chromiumembeddedframework.runtime" Version="96.0.14" />
<PackageReference Include="chromiumembeddedframework.runtime" Version="97.0.8" />
</ItemGroup>
<ItemGroup>
<Compile Remove="bin.netcore\**" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<ProjectReference Include="..\CefSharp.Example\CefSharp.Example.netcore.csproj" />
<ProjectReference Include="..\CefSharp.WinForms\CefSharp.WinForms.netcore.csproj" />
<ProjectReference Include="..\CefSharp\CefSharp.netcore.csproj" />
<PackageReference Include="chromiumembeddedframework.runtime" Version="96.0.14" />
<PackageReference Include="chromiumembeddedframework.runtime" Version="97.0.8" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<Folder Include="Assets\Images\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="chromiumembeddedframework.runtime" Version="96.0.14" />
<PackageReference Include="chromiumembeddedframework.runtime" Version="97.0.8" />
</ItemGroup>
<ItemGroup>
<Compile Remove="bin.netcore\**" />
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Wpf.Example/CefSharp.Wpf.Example.netcore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<ProjectReference Include="..\CefSharp.Example\CefSharp.Example.netcore.csproj" />
<ProjectReference Include="..\CefSharp.Wpf\CefSharp.Wpf.netcore.csproj" />
<ProjectReference Include="..\CefSharp\CefSharp.netcore.csproj" />
<PackageReference Include="chromiumembeddedframework.runtime" Version="96.0.14" />
<PackageReference Include="chromiumembeddedframework.runtime" Version="97.0.8" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ If you're new to `CefSharp` and are downloading the source to check it out, plea

| Branch | CEF Version | VC++ Version | .Net Version | Status |
|----------------------------------------------------------------------|------|-------|---------|-----------------|
| [master](https://github.com/cefsharp/CefSharp/) | 4664 | 2019* | 4.5.2** | Development |
| [cefsharp/96](https://github.com/cefsharp/CefSharp/tree/cefsharp/96) | 4664 | 2019* | 4.5.2** | **Pre-Release** |
| [cefsharp/95](https://github.com/cefsharp/CefSharp/tree/cefsharp/95) | 4638 | 2019* | 4.5.2** | **Release** |
| [master](https://github.com/cefsharp/CefSharp/) | 4692 | 2019* | 4.5.2** | Development |
| [cefsharp/96](https://github.com/cefsharp/CefSharp/tree/cefsharp/96) | 4664 | 2019* | 4.5.2** | **Release** |
| [cefsharp/95](https://github.com/cefsharp/CefSharp/tree/cefsharp/95) | 4638 | 2019* | 4.5.2** | Unsupported |
| [cefsharp/94](https://github.com/cefsharp/CefSharp/tree/cefsharp/94) | 4606 | 2019* | 4.5.2** | Unsupported |
| [cefsharp/93](https://github.com/cefsharp/CefSharp/tree/cefsharp/93) | 4577 | 2019* | 4.5.2** | Unsupported |
| [cefsharp/92](https://github.com/cefsharp/CefSharp/tree/cefsharp/92) | 4515 | 2015* | 4.5.2** | Unsupported |
Expand Down
2 changes: 1 addition & 1 deletion UpdateNugetPackages.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Update the vcxproj files first
# Update the .Net csproj files modifying the xml file directly

$CefVersion = '96.0.14'
$CefVersion = '97.0.8'

function RemoveEnsureNuGetPackageBuildImports
{
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 96.0.140-CI{build}
version: 97.0.80-CI{build}

clone_depth: 10

Expand Down
4 changes: 2 additions & 2 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ param(
[Parameter(Position = 0)]
[string] $Target = "vs2019",
[Parameter(Position = 1)]
[string] $Version = "96.0.140",
[string] $Version = "97.0.80",
[Parameter(Position = 2)]
[string] $AssemblyVersion = "96.0.140",
[string] $AssemblyVersion = "97.0.80",
[Parameter(Position = 3)]
[ValidateSet("NetFramework", "NetCore", "NetFramework452", "NetCore31")]
[string] $TargetFramework = "NetFramework",
Expand Down

0 comments on commit f619a1a

Please sign in to comment.