Upgrade to 89.0.170 (#132)

* Upgrade to 89.0.140-pre

- Dependency Check is currently disabled

* Upgrade to 89.0.170
This commit is contained in:
Alex Maitland
2021-04-07 15:39:45 +10:00
committed by GitHub
parent 1d55d776cf
commit 55bcee859a
14 changed files with 52 additions and 73 deletions

View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.props')" />
<Import Project="..\packages\cef.redist.x86.88.2.9\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.88.2.9\build\cef.redist.x86.props')" />
<Import Project="..\packages\cef.redist.x64.88.2.9\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.88.2.9\build\cef.redist.x64.props')" />
<Import Project="..\packages\CefSharp.Common.89.0.170\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.89.0.170\build\CefSharp.Common.props')" />
<Import Project="..\packages\cef.redist.x86.89.0.17\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.89.0.17\build\cef.redist.x86.props')" />
<Import Project="..\packages\cef.redist.x64.89.0.17\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.89.0.17\build\cef.redist.x64.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -72,16 +72,16 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="CefSharp, Version=88.2.90.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.88.2.90\lib\net452\CefSharp.dll</HintPath>
<Reference Include="CefSharp, Version=89.0.170.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.89.0.170\lib\net452\CefSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CefSharp.Core, Version=88.2.90.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.88.2.90\lib\net452\CefSharp.Core.dll</HintPath>
<Reference Include="CefSharp.Core, Version=89.0.170.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.89.0.170\lib\net452\CefSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CefSharp.WinForms, Version=88.2.90.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.WinForms.88.2.90\lib\net452\CefSharp.WinForms.dll</HintPath>
<Reference Include="CefSharp.WinForms, Version=89.0.170.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.WinForms.89.0.170\lib\net452\CefSharp.WinForms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@@ -144,5 +144,5 @@
<Target Name="CefSharpAfterBuildDebug" AfterTargets="AfterBuild">
<CallTarget Targets="CefSharpAfterBuildDiagnostic" />
</Target>
<Import Project="..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.targets')" />
<Import Project="..\packages\CefSharp.Common.89.0.170\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.89.0.170\build\CefSharp.Common.targets')" />
</Project>

View File

@@ -27,8 +27,8 @@
For versions 87 and 88 specify CefSharpPlatformTargetOverride when using AnyCPU.
For versions 89 and above use PlatformTarget (CefSharpPlatformTargetOverride will also still work)
-->
<!--<PlatformTarget>AnyCPU</PlatformTarget>-->
<CefSharpPlatformTargetOverride>AnyCPU</CefSharpPlatformTargetOverride>
<PlatformTarget>AnyCPU</PlatformTarget>
<!--<CefSharpPlatformTargetOverride>AnyCPU</CefSharpPlatformTargetOverride>-->
</PropertyGroup>
<ItemGroup>
@@ -41,7 +41,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="CefSharp.WinForms" Version="88.2.90" />
<PackageReference Include="CefSharp.WinForms" Version="89.0.170" />
</ItemGroup>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />

View File

@@ -62,7 +62,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="CefSharp.WinForms.NetCore" Version="88.2.90" />
<PackageReference Include="CefSharp.WinForms.NetCore" Version="89.0.170" />
</ItemGroup>
<Target Name="CefSharpAfterBuildDiagnostic" AfterTargets="AfterBuild">

View File

@@ -41,15 +41,8 @@ namespace CefSharp.MinimalExample.WinForms
//For screen sharing add (see https://bitbucket.org/chromiumembedded/cef/issues/2582/allow-run-time-handling-of-media-access#comment-58677180)
settings.CefCommandLineArgs.Add("enable-usermedia-screen-capturing");
var dependencyCheck = true;
#if NETCOREAPP || ANYCPU
//For .Net Core/.Net 5 this should be fixed as part of https://github.com/cefsharp/CefSharp/issues/3388
dependencyCheck = false;
#endif
//Perform dependency check to make sure all relevant resources are in our output directory.
Cef.Initialize(settings, performDependencyCheck: dependencyCheck, browserProcessHandler: null);
Cef.Initialize(settings, performDependencyCheck: false, browserProcessHandler: null);
var browser = new BrowserForm();
Application.Run(browser);

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="cef.redist.x64" version="88.2.9" targetFramework="net452" />
<package id="cef.redist.x86" version="88.2.9" targetFramework="net452" />
<package id="CefSharp.Common" version="88.2.90" targetFramework="net452" />
<package id="CefSharp.WinForms" version="88.2.90" targetFramework="net452" />
<package id="cef.redist.x64" version="89.0.17" targetFramework="net452" />
<package id="cef.redist.x86" version="89.0.17" targetFramework="net452" />
<package id="CefSharp.Common" version="89.0.170" targetFramework="net452" />
<package id="CefSharp.WinForms" version="89.0.170" targetFramework="net452" />
</packages>