Skip to content

Commit

Permalink
Upgrade to CEF 96.0.17+g20e2617+chromium-96.0.4664.93 / Chromium 96.0…
Browse files Browse the repository at this point in the history
….4664.93
  • Loading branch information
amaitland committed Dec 8, 2021
1 parent e22f38d commit c39e0ea
Show file tree
Hide file tree
Showing 19 changed files with 20 additions and 20 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.96.0.17\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.96.0.17\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.96.0.17\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.96.0.17\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="96.0.17" 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="96.0.17" 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.96.0.17\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.96.0.17\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.96.0.17\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.96.0.17\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="96.0.17" 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="96.0.17" 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="96.0.17" />
</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="96.0.17" />
</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="96.0.17" />

<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="96.0.17" />
</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="96.0.17" />
</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="96.0.17" />
</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="96.0.17" />
</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="96.0.17" />
</ItemGroup>

<ItemGroup>
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 = '96.0.17'

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.142-RCI{build}
version: 96.0.170-RCI{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.142",
[string] $Version = "96.0.170",
[Parameter(Position = 2)]
[string] $AssemblyVersion = "96.0.142",
[string] $AssemblyVersion = "96.0.170",
[Parameter(Position = 3)]
[ValidateSet("NetFramework", "NetCore", "NetFramework452", "NetCore31")]
[string] $TargetFramework = "NetFramework",
Expand Down

0 comments on commit c39e0ea

Please sign in to comment.