Skip to content

Commit 002628d

Browse files
kpreisserkpreisser
committed
Merge remote-tracking branch 'remotes/CefSharp/master' into win-arm64 and resolve conflicts.
2 parents 75acbf3 + 9aac370 commit 002628d

24 files changed

+1575
-92
lines changed

‎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.88.2.1\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.88.2.1\build\cef.sdk.props')" />
3+
<Import Project="..\packages\cef.sdk.88.2.4\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.88.2.4\build\cef.sdk.props')" />
44
<ItemGroup Label="ProjectConfigurations">
55
<ProjectConfiguration Include="Debug|Win32">
66
<Configuration>Debug</Configuration>

‎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.88.2.1\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.88.2.1\build\cef.sdk.props')" />
3+
<Import Project="..\packages\cef.sdk.88.2.4\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.88.2.4\build\cef.sdk.props')" />
44
<Import Project="..\packages\GitLink.3.1.0\build\GitLink.props" Condition="Exists('..\packages\GitLink.3.1.0\build\GitLink.props')" />
55
<ItemGroup Label="ProjectConfigurations">
66
<ProjectConfiguration Include="Debug|Win32">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.sdk" version="88.2.1" targetFramework="native" />
3+
<package id="cef.sdk" version="88.2.4" targetFramework="native" />
44
<package id="GitLink" version="3.1.0" targetFramework="native" developmentDependency="true" />
55
</packages>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.sdk" version="88.2.1" targetFramework="netcoreapp3.1" />
3+
<package id="cef.sdk" version="88.2.4" targetFramework="netcoreapp3.1" />
44
</packages>

‎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.88.2.1\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.88.2.1\build\cef.sdk.props')" />
3+
<Import Project="..\packages\cef.sdk.88.2.4\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.88.2.4\build\cef.sdk.props')" />
44
<ItemGroup Label="ProjectConfigurations">
55
<ProjectConfiguration Include="Debug|Win32">
66
<Configuration>Debug</Configuration>

‎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.88.2.1\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.88.2.1\build\cef.sdk.props')" />
3+
<Import Project="..\packages\cef.sdk.88.2.4\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.88.2.4\build\cef.sdk.props')" />
44
<Import Project="..\packages\GitLink.3.1.0\build\GitLink.props" Condition="Exists('..\packages\GitLink.3.1.0\build\GitLink.props')" />
55
<ItemGroup Label="ProjectConfigurations">
66
<ProjectConfiguration Include="Debug|Win32">

‎CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.sdk" version="88.2.1" targetFramework="native" />
3+
<package id="cef.sdk" version="88.2.4" targetFramework="native" />
44
<package id="GitLink" version="3.1.0" targetFramework="native" developmentDependency="true" />
55
</packages>

‎CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.netcore.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.sdk" version="88.2.1" targetFramework="netcoreapp3.1" />
3+
<package id="cef.sdk" version="88.2.4" targetFramework="netcoreapp3.1" />
44
</packages>

‎CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\cef.redist.x86.88.2.1\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.88.2.1\build\cef.redist.x86.props')" />
4-
<Import Project="..\packages\cef.redist.x64.88.2.1\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.88.2.1\build\cef.redist.x64.props')" />
3+
<Import Project="..\packages\cef.redist.x86.88.2.4\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.88.2.4\build\cef.redist.x86.props')" />
4+
<Import Project="..\packages\cef.redist.x64.88.2.4\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.88.2.4\build\cef.redist.x64.props')" />
55
<Import Project="..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" />
66
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
77
<PropertyGroup>

‎CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<ProjectReference Include="..\CefSharp.Example\CefSharp.Example.netcore.csproj" />
3939
<ProjectReference Include="..\CefSharp.OffScreen\CefSharp.OffScreen.netcore.csproj" />
4040
<ProjectReference Include="..\CefSharp\CefSharp.netcore.csproj" />
41-
<PackageReference Include="chromiumembeddedframework.runtime" Version="88.2.1" />
41+
<PackageReference Include="chromiumembeddedframework.runtime" Version="88.2.4" />
4242
</ItemGroup>
4343

4444
<ItemGroup>

0 commit comments

Comments
 (0)