Skip to content

Commit

Permalink
upgrade to cefsharp 79 anyCPU
Browse files Browse the repository at this point in the history
  • Loading branch information
robinrodricks committed Feb 27, 2020
1 parent 6137c0e commit 14253d5
Show file tree
Hide file tree
Showing 82 changed files with 3,804 additions and 2,127 deletions.
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,18 @@ Ctrl+Tab | Switch to the next tab
Ctrl+Shift+Tab | Switch to the previous tab
Ctrl+F | Open search bar (Enter to find next, Esc to close)

## System requirements

- You need [VC++ 2015 Runtime](https://www.microsoft.com/en-in/download/details.aspx?id=48145) 32-bit and 64-bit versions

- You need .NET Framework 4.6.

- You need to install the version of VC++ Runtime that CEFSharp needs. Since we are using CefSharp 79, according to [this](https://github.com/cefsharp/CefSharp/#release-branches) we need the above versions

## Code

- SharpBrowser uses CefSharp 75, NET Framework 4.6
- SharpBrowser uses CefSharp 79 and is built on NET Framework 4.6
- SharpBrowser supports AnyCPU as well as x86/x64 specific builds
- `MainForm.cs` - main web browser UI and related functionality
- `Handlers` - various handlers that we have registered with CefSharp that enable deeper integration between us and CefSharp
- `Data/JSON.cs` - fast JSON serializer/deserializer
Expand Down
2 changes: 1 addition & 1 deletion src/Handlers/ContextMenuHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ internal class ContextMenuHandler : IContextMenuHandler {
private const int OpenLinkInNewTab = 26507;
private const int CloseTab = 40007;
private const int RefreshTab = 40008;
MainForm myForm;
readonly MainForm myForm;

private string lastSelText = "";

Expand Down
33 changes: 15 additions & 18 deletions src/SharpBrowser.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="packages\CefSharp.WinForms.75.1.142\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.75.1.142\build\CefSharp.WinForms.props')" />
<Import Project="packages\CefSharp.Common.75.1.142\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.75.1.142\build\CefSharp.Common.props')" />
<Import Project="packages\cef.redist.x86.75.1.14\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.75.1.14\build\cef.redist.x86.props')" />
<Import Project="packages\cef.redist.x64.75.1.14\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.75.1.14\build\cef.redist.x64.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -19,6 +15,7 @@
</TargetFrameworkProfile>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<CefSharpAnyCpuSupport>true</CefSharpAnyCpuSupport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
Expand Down Expand Up @@ -108,7 +105,6 @@
<None Include="App.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand All @@ -129,20 +125,21 @@
<HintPath>bin\TabStrip.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="cef.redist.x64">
<Version>79.1.36</Version>
</PackageReference>
<PackageReference Include="cef.redist.x86">
<Version>79.1.36</Version>
</PackageReference>
<PackageReference Include="CefSharp.Common">
<Version>79.1.360</Version>
</PackageReference>
<PackageReference Include="CefSharp.WinForms">
<Version>79.1.360</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('packages\cef.redist.x64.75.1.14\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.75.1.14\build\cef.redist.x64.props'))" />
<Error Condition="!Exists('packages\cef.redist.x86.75.1.14\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.75.1.14\build\cef.redist.x86.props'))" />
<Error Condition="!Exists('packages\CefSharp.Common.75.1.142\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.75.1.142\build\CefSharp.Common.props'))" />
<Error Condition="!Exists('packages\CefSharp.Common.75.1.142\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.75.1.142\build\CefSharp.Common.targets'))" />
<Error Condition="!Exists('packages\CefSharp.WinForms.75.1.142\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.75.1.142\build\CefSharp.WinForms.props'))" />
<Error Condition="!Exists('packages\CefSharp.WinForms.75.1.142\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.75.1.142\build\CefSharp.WinForms.targets'))" />
</Target>
<Import Project="packages\CefSharp.Common.75.1.142\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.75.1.142\build\CefSharp.Common.targets')" />
<Import Project="packages\CefSharp.WinForms.75.1.142\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.75.1.142\build\CefSharp.WinForms.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
Binary file modified src/bin/CefSharp.BrowserSubprocess.Core.dll
Binary file not shown.
Binary file modified src/bin/CefSharp.BrowserSubprocess.exe
Binary file not shown.
Binary file modified src/bin/CefSharp.Core.dll
Binary file not shown.
Loading

0 comments on commit 14253d5

Please sign in to comment.