Skip to content

Commit a942fc5

Browse files
campersaucampersau
committed
Merge remote-tracking branch 'origin/master' into cancelpendingtasksoncrashmaster
2 parents 432cc2e + 185d496 commit a942fc5

Some content is hidden

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

41 files changed

+101
-112
lines changed

‎.vsconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"Microsoft.VisualStudio.Component.VC.CLI.Support",
2727
"Microsoft.VisualStudio.Component.Windows10SDK.19041",
2828
"Microsoft.VisualStudio.Workload.NativeDesktop",
29-
"Microsoft.NetCore.Component.DevelopmentTools",
30-
"Microsoft.NetCore.Component.Runtime.3.1",
29+
"Microsoft.NetCore.Component.DevelopmentTools",
30+
"Microsoft.NetCore.Component.Runtime.6.0",
3131
"Microsoft.NetCore.Component.SDK"
3232
]
3333
}

‎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.138.0.17\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.138.0.17\build\cef.sdk.props')" />
3+
<Import Project="..\packages\cef.sdk.138.0.33\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.138.0.33\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.138.0.17\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.138.0.17\build\cef.sdk.props')" />
3+
<Import Project="..\packages\cef.sdk.138.0.33\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.138.0.33\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 138,0,170
5-
PRODUCTVERSION 138,0,170
4+
FILEVERSION 138,0,330
5+
PRODUCTVERSION 138,0,330
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", "138.0.170"
21+
VALUE "FileVersion", "138.0.330"
2222
VALUE "LegalCopyright", "Copyright © 2023 The CefSharp Authors"
2323
VALUE "ProductName", "CefSharp"
24-
VALUE "ProductVersion", "138.0.170"
24+
VALUE "ProductVersion", "138.0.330"
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="138.0.17" targetFramework="native" />
3+
<package id="cef.sdk" version="138.0.33" 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="138.0.17" targetFramework="net6.0" />
3+
<package id="cef.sdk" version="138.0.33" targetFramework="net6.0" />
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/CefSharp.BrowserSubprocess.netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<!-- Explicitly set the PlatformTarget for arm64, see: https://github.com/dotnet/sdk/issues/15434 -->
2626
<PlatformTarget Condition="'$(Platform)' == 'arm64'">arm64</PlatformTarget>
2727
<!--
28-
Run on a newer version of .Net if the specified version (.Net Core 3.1) is not installed
28+
Run on a newer version of .Net if the specified version (.Net 6) is not installed
2929
https://github.com/dotnet/docs/issues/12237
3030
-->
3131
<RollForward>Major</RollForward>

‎CefSharp.BrowserSubprocess/Program.netcore.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace CefSharp.BrowserSubprocess
99
{
1010
/// <summary>
1111
/// When implementing your own BrowserSubprocess
12-
/// - For .Net Core use <see cref="BrowserSubprocessExecutable"/> (No WCF Support)
12+
/// - For .Net 6+ use <see cref="BrowserSubprocessExecutable"/> (No WCF Support)
1313
/// - Include an app.manifest with the dpi/compatability sections, this is required (this project contains the relevant).
1414
/// - If you are targeting x86/Win32 then you should set /LargeAddressAware (https://docs.microsoft.com/en-us/cpp/build/reference/largeaddressaware?view=vs-2017)
1515
/// </summary>

‎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="138.0.170.0" name="CefSharp.BrowserSubprocess.app" />
11+
<assemblyIdentity version="138.0.330.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.138.0.17\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.138.0.17\build\cef.sdk.props')" />
3+
<Import Project="..\packages\cef.sdk.138.0.33\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.138.0.33\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)