Skip to content

Commit 75acbf3

Browse files
committed
Merge commit '9f73a6845724c0020e9442550bbcfdc9981d2a77' into win-arm64 and resolve conflicts.
2 parents ca2c9fa + 9f73a68 commit 75acbf3

39 files changed

+96
-94
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.1.6\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.88.1.6\build\cef.sdk.props')" />
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')" />
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.1.6\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.88.1.6\build\cef.sdk.props')" />
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')" />
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/Resource.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
1 VERSIONINFO
2-
FILEVERSION 88,1,0
3-
PRODUCTVERSION 88,1,0
2+
FILEVERSION 88,2,10
3+
PRODUCTVERSION 88,2,10
44
FILEFLAGSMASK 0x17L
55
#ifdef _DEBUG
66
FILEFLAGS 0x1L
@@ -16,10 +16,10 @@ BEGIN
1616
BLOCK "040904b0"
1717
BEGIN
1818
VALUE "FileDescription", "CefSharp.BrowserSubprocess.Core"
19-
VALUE "FileVersion", "88.1.0"
19+
VALUE "FileVersion", "88.2.10"
2020
VALUE "LegalCopyright", "Copyright © 2021 The CefSharp Authors"
2121
VALUE "ProductName", "CefSharp"
22-
VALUE "ProductVersion", "88.1.0"
22+
VALUE "ProductVersion", "88.2.10"
2323
END
2424
END
2525
BLOCK "VarFileInfo"
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.1.6" targetFramework="native" />
3+
<package id="cef.sdk" version="88.2.1" targetFramework="native" />
44
<package id="GitLink" version="3.1.0" targetFramework="native" developmentDependency="true" />
55
</packages>
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.1.6" targetFramework="netcoreapp3.1" />
3+
<package id="cef.sdk" version="88.2.1" targetFramework="netcoreapp3.1" />
44
</packages>

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="88.1.0.0" name="CefSharp.BrowserSubprocess.app" />
11+
<assemblyIdentity version="88.2.10.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.88.1.6\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.88.1.6\build\cef.sdk.props')" />
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')" />
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.1.6\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.88.1.6\build\cef.sdk.props')" />
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')" />
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/Resource.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
1 VERSIONINFO
2-
FILEVERSION 88,1,0
3-
PRODUCTVERSION 88,1,0
2+
FILEVERSION 88,2,10
3+
PRODUCTVERSION 88,2,10
44
FILEFLAGSMASK 0x17L
55
#ifdef _DEBUG
66
FILEFLAGS 0x1L
@@ -16,10 +16,10 @@ BEGIN
1616
BLOCK "040904b0"
1717
BEGIN
1818
VALUE "FileDescription", "CefSharp.Core"
19-
VALUE "FileVersion", "88.1.0"
19+
VALUE "FileVersion", "88.2.10"
2020
VALUE "LegalCopyright", "Copyright © 2021 The CefSharp Authors"
2121
VALUE "ProductName", "CefSharp"
22-
VALUE "ProductVersion", "88.1.0"
22+
VALUE "ProductVersion", "88.2.10"
2323
END
2424
END
2525
BLOCK "VarFileInfo"
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.1.6" targetFramework="native" />
3+
<package id="cef.sdk" version="88.2.1" targetFramework="native" />
44
<package id="GitLink" version="3.1.0" targetFramework="native" developmentDependency="true" />
55
</packages>

0 commit comments

Comments
 (0)