Upgrade to 87.1.132 (#130)
* Upgrade to 87.1.12-CI3846 - Upgrade to Net Core 3.1 (Required to use new Net Core packages) - Migrate to NetCore specific pages * Upgrade to 87.1.130-pre * OffScreen - Remove UseWindowsForms from csproj file No longer required as we use the Drawing nuget package Also causes a problem with Console.ReadLine * README.md - Update Net Core Section * WinForms - Add new SdkStyle .Net 4.7.2 project and solution TODO: Add OffScreen and WPF project files * Upgrade to 87.1.131-pre * Upgrade to 87.1.132
This commit is contained in:
Alex Maitland
GitHub
@@ -1,9 +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.WinForms.86.0.241\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.86.0.241\build\CefSharp.WinForms.props')" />
|
||||
<Import Project="..\packages\CefSharp.Common.86.0.241\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.86.0.241\build\CefSharp.Common.props')" />
|
||||
<Import Project="..\packages\cef.redist.x86.86.0.24\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.86.0.24\build\cef.redist.x86.props')" />
|
||||
<Import Project="..\packages\cef.redist.x64.86.0.24\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.86.0.24\build\cef.redist.x64.props')" />
|
||||
<Import Project="..\packages\CefSharp.Common.87.1.132\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.87.1.132\build\CefSharp.Common.props')" />
|
||||
<Import Project="..\packages\cef.redist.x86.87.1.13\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.87.1.13\build\cef.redist.x86.props')" />
|
||||
<Import Project="..\packages\cef.redist.x64.87.1.13\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.87.1.13\build\cef.redist.x64.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
@@ -56,6 +55,18 @@
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="CefSharp, Version=87.1.132.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
|
||||
<HintPath>..\packages\CefSharp.Common.87.1.132\lib\net452\CefSharp.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="CefSharp.Core, Version=87.1.132.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
|
||||
<HintPath>..\packages\CefSharp.Common.87.1.132\lib\net452\CefSharp.Core.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="CefSharp.WinForms, Version=87.1.132.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
|
||||
<HintPath>..\packages\CefSharp.WinForms.87.1.132\lib\net452\CefSharp.WinForms.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core">
|
||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||
@@ -113,6 +124,5 @@
|
||||
<None Include="Resources\chromium-256.png" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\CefSharp.Common.86.0.241\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.86.0.241\build\CefSharp.Common.targets')" />
|
||||
<Import Project="..\packages\CefSharp.WinForms.86.0.241\build\CefSharp.WinForms.targets" Condition="Exists('..\packages\CefSharp.WinForms.86.0.241\build\CefSharp.WinForms.targets')" />
|
||||
<Import Project="..\packages\CefSharp.Common.87.1.132\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.87.1.132\build\CefSharp.Common.targets')" />
|
||||
</Project>
|
||||
@@ -0,0 +1,37 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project>
|
||||
<!-- Note: We cannot use the recommended style of specifying <Project Sdk=...> because we need
|
||||
to set BaseIntermediateOutputPath and BaseOutputPath before the SDK props are imported. -->
|
||||
<PropertyGroup>
|
||||
<BaseIntermediateOutputPath>obj.net472\</BaseIntermediateOutputPath>
|
||||
<BaseOutputPath>bin.net472\</BaseOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net472</TargetFramework>
|
||||
<UseWindowsForms>true</UseWindowsForms>
|
||||
<RootNamespace>CefSharp.MinimalExample.WinForms</RootNamespace>
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
<Platforms>x86;x64</Platforms>
|
||||
<ProjectGuid>{1D1D63D1-5257-4AA0-A284-7EF4574878CB}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="bin\**" />
|
||||
<Compile Remove="obj\**" />
|
||||
<EmbeddedResource Remove="bin\**" />
|
||||
<EmbeddedResource Remove="obj\**" />
|
||||
<None Remove="bin\**" />
|
||||
<None Remove="obj\**" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CefSharp.WinForms" Version="87.1.132" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
|
||||
</Project>
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<UseWindowsForms>true</UseWindowsForms>
|
||||
<RootNamespace>CefSharp.MinimalExample.WinForms</RootNamespace>
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
@@ -29,44 +29,8 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CefSharp.WinForms" Version="86.0.241" />
|
||||
<PackageReference Include="CefSharp.WinForms.NetCore" Version="87.1.132" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!-- TODO: These updates are currently required because CefSharp.WinForms specifies
|
||||
<Private>false</Private>, which means these libraries will not be specified in
|
||||
the .deps.json file, and so the CoreCLR wouldn't load these. -->
|
||||
<Reference Update="CefSharp">
|
||||
<Private>true</Private>
|
||||
</Reference>
|
||||
<Reference Update="CefSharp.Core">
|
||||
<Private>true</Private>
|
||||
</Reference>
|
||||
<Reference Update="CefSharp.WinForms">
|
||||
<Private>true</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Include CefSharp.BrowserSubprocess.Core so we can selfhost the BrowserSubProcess using our exe -->
|
||||
<Choose>
|
||||
<When Condition="'$(PlatformTarget)' == 'x64'">
|
||||
<ItemGroup>
|
||||
<Reference Include="CefSharp.BrowserSubprocess.Core">
|
||||
<HintPath>$(CefSharpBrowserProcessCore64)</HintPath>
|
||||
<Private>true</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
</When>
|
||||
<!-- x86, Win32 and AnyCPU -->
|
||||
<Otherwise>
|
||||
<ItemGroup>
|
||||
<Reference Include="CefSharp.BrowserSubprocess.Core">
|
||||
<HintPath>$(CefSharpBrowserProcessCore32)</HintPath>
|
||||
<Private>true</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
</Otherwise>
|
||||
</Choose>
|
||||
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
|
||||
</Project>
|
||||
|
||||
@@ -17,31 +17,12 @@ namespace CefSharp.MinimalExample.WinForms
|
||||
//For Windows 7 and above, best to include relevant app.manifest entries as well
|
||||
Cef.EnableHighDPISupport();
|
||||
|
||||
#if NETCOREAPP
|
||||
//We are using our current exe as the BrowserSubProcess
|
||||
//Multiple instances will be spawned to handle all the
|
||||
//Chromium proceses, render, gpu, network, plugin, etc.
|
||||
var subProcessExe = new CefSharp.BrowserSubprocess.BrowserSubprocessExecutable();
|
||||
var result = subProcessExe.Main(args);
|
||||
if (result > 0)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
#endif
|
||||
|
||||
var settings = new CefSettings()
|
||||
{
|
||||
//By default CefSharp will use an in-memory cache, you need to specify a Cache Folder to persist data
|
||||
CachePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "CefSharp\\Cache")
|
||||
};
|
||||
|
||||
#if NETCOREAPP
|
||||
//We use our Applications exe as the BrowserSubProcess, multiple copies
|
||||
//will be spawned
|
||||
var exePath = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName;
|
||||
settings.BrowserSubprocessPath = exePath;
|
||||
#endif
|
||||
|
||||
//Example of setting a command line argument
|
||||
//Enables WebRTC
|
||||
// - CEF Doesn't currently support permissions on a per browser basis see https://bitbucket.org/chromiumembedded/cef/issues/2582/allow-run-time-handling-of-media-access
|
||||
@@ -54,9 +35,15 @@ 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
|
||||
//This should be fixed shortly.
|
||||
dependencyCheck = false;
|
||||
#endif
|
||||
|
||||
//Perform dependency check to make sure all relevant resources are in our output directory.
|
||||
Cef.Initialize(settings, performDependencyCheck: true, browserProcessHandler: null);
|
||||
Cef.Initialize(settings, performDependencyCheck: dependencyCheck, browserProcessHandler: null);
|
||||
|
||||
var browser = new BrowserForm();
|
||||
Application.Run(browser);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="cef.redist.x64" version="86.0.24" targetFramework="net452" />
|
||||
<package id="cef.redist.x86" version="86.0.24" targetFramework="net452" />
|
||||
<package id="CefSharp.Common" version="86.0.241" targetFramework="net452" />
|
||||
<package id="CefSharp.WinForms" version="86.0.241" targetFramework="net452" />
|
||||
<package id="cef.redist.x64" version="87.1.13" targetFramework="net452" />
|
||||
<package id="cef.redist.x86" version="87.1.13" targetFramework="net452" />
|
||||
<package id="CefSharp.Common" version="87.1.132" targetFramework="net452" />
|
||||
<package id="CefSharp.WinForms" version="87.1.132" targetFramework="net452" />
|
||||
</packages>
|
||||
Reference in New Issue
Block a user