Dotnet/CefSharp.MinimalExample
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17 from cefsharp/cef/2171

Browse Source 
Upgrade to version 39
This commit is contained in:
Alex Maitland 2015-04-08 10:54:54 +10:00
commit 73d3e9d0bc
9 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CefSharp.MinimalExample.OffScreen/CefSharp.MinimalExample.OffScreen.csproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.OffScreen.39.0.0\build\CefSharp.OffScreen.props" Condition="Exists('..\packages\CefSharp.OffScreen.39.0.0\build\CefSharp.OffScreen.props')" />
<Import Project="..\packages\CefSharp.OffScreen.37.0.0\build\CefSharp.OffScreen.props" Condition="Exists('..\packages\CefSharp.OffScreen.37.0.0\build\CefSharp.OffScreen.props')" /> <Import Project="..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -82,8 +82,7 @@
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\cef.redist.x64.3.2062.1898\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2062.1898\build\cef.redist.x64.targets')" /> <Import Project="..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets')" />
<Import Project="..\packages\cef.redist.x86.3.2062.1898\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2062.1898\build\cef.redist.x86.targets')" /> <Import Project="..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets')" />
<Import Project="..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.targets')" />
</Project> </Project>

5
CefSharp.MinimalExample.OffScreen/Program.cs
View File

@ -24,15 +24,12 @@ namespace CefSharp.MinimalExample.OffScreen
Cef.Initialize(new CefSettings()); Cef.Initialize(new CefSettings());
// Create the offscreen Chromium browser. // Create the offscreen Chromium browser.
browser = new ChromiumWebBrowser(); browser = new ChromiumWebBrowser(testUrl);
// An event that is fired when the first page is finished loading. // An event that is fired when the first page is finished loading.
// This returns to us from another thread. // This returns to us from another thread.
browser.FrameLoadEnd += BrowserFrameLoadEnd; browser.FrameLoadEnd += BrowserFrameLoadEnd;
// Start loading the test URL in Chrome's thread.
browser.Load(testUrl);
// We have to wait for something, otherwise the process will exit too soon. // We have to wait for something, otherwise the process will exit too soon.
Console.ReadKey(); Console.ReadKey();

8
CefSharp.MinimalExample.OffScreen/packages.config
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="cef.redist.x64" version="3.2062.1898" targetFramework="net40-Client" /> <package id="cef.redist.x64" version="3.2171.2069" targetFramework="net40-Client" />
<package id="cef.redist.x86" version="3.2062.1898" targetFramework="net40-Client" /> <package id="cef.redist.x86" version="3.2171.2069" targetFramework="net40-Client" />
<package id="CefSharp.Common" version="37.0.0" targetFramework="net40-Client" /> <package id="CefSharp.Common" version="39.0.0" targetFramework="net40-Client" />
<package id="CefSharp.OffScreen" version="37.0.0" targetFramework="net40-Client" /> <package id="CefSharp.OffScreen" version="39.0.0" targetFramework="net40-Client" />
</packages> </packages>

13
CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.csproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.WinForms.39.0.0\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.39.0.0\build\CefSharp.WinForms.props')" />
<Import Project="..\packages\CefSharp.WinForms.37.0.0\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.37.0.0\build\CefSharp.WinForms.props')" /> <Import Project="..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -21,7 +21,7 @@
<UpgradeBackupLocation> <UpgradeBackupLocation>
</UpgradeBackupLocation> </UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile>Client</TargetFrameworkProfile>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<NuGetPackageImportStamp>182c5946</NuGetPackageImportStamp> <NuGetPackageImportStamp>182c5946</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
@ -98,8 +98,7 @@
<None Include="Resources\chromium-256.png" /> <None Include="Resources\chromium-256.png" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\cef.redist.x86.3.2062.1898\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2062.1898\build\cef.redist.x86.targets')" /> <Import Project="..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets')" />
<Import Project="..\packages\cef.redist.x64.3.2062.1898\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2062.1898\build\cef.redist.x64.targets')" /> <Import Project="..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets')" />
<Import Project="..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.targets')" />
</Project> </Project>

2
CefSharp.MinimalExample.WinForms/app.config
View File

@ -1,3 +1,3 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<configuration> <configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>

8
CefSharp.MinimalExample.WinForms/packages.config
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="cef.redist.x64" version="3.2062.1898" targetFramework="net40" /> <package id="cef.redist.x64" version="3.2171.2069" targetFramework="net40-Client" />
<package id="cef.redist.x86" version="3.2062.1898" targetFramework="net40" /> <package id="cef.redist.x86" version="3.2171.2069" targetFramework="net40-Client" />
<package id="CefSharp.Common" version="37.0.0" targetFramework="net40" /> <package id="CefSharp.Common" version="39.0.0" targetFramework="net40-Client" />
<package id="CefSharp.WinForms" version="37.0.0" targetFramework="net40" /> <package id="CefSharp.WinForms" version="39.0.0" targetFramework="net40-Client" />
</packages> </packages>

4
CefSharp.MinimalExample.Wpf/App.config
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
</startup> </startup>
</configuration> </configuration>

13
CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.Wpf.39.0.0\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.39.0.0\build\CefSharp.Wpf.props')" />
<Import Project="..\packages\CefSharp.Wpf.37.0.0\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.37.0.0\build\CefSharp.Wpf.props')" /> <Import Project="..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -15,7 +15,7 @@
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<TargetFrameworkProfile /> <TargetFrameworkProfile>Client</TargetFrameworkProfile>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<NuGetPackageImportStamp>5db844a5</NuGetPackageImportStamp> <NuGetPackageImportStamp>5db844a5</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
@ -132,9 +132,9 @@
<Resource Include="chromium-256.ico" /> <Resource Include="chromium-256.ico" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\cef.redist.x86.3.2062.1898\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2062.1898\build\cef.redist.x86.targets')" /> <Import Project="..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2171.2069\build\cef.redist.x86.targets')" />
<Import Project="..\packages\cef.redist.x64.3.2062.1898\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2062.1898\build\cef.redist.x64.targets')" /> <Import Project="..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2171.2069\build\cef.redist.x64.targets')" />
<Import Project="..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.37.0.0\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.39.0.0\build\CefSharp.Common.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">
@ -143,4 +143,3 @@
</Target> </Target>
--> -->
</Project> </Project>

8
CefSharp.MinimalExample.Wpf/packages.config
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="cef.redist.x64" version="3.2062.1898" targetFramework="net40" /> <package id="cef.redist.x64" version="3.2171.2069" targetFramework="net40-Client" />
<package id="cef.redist.x86" version="3.2062.1898" targetFramework="net40" /> <package id="cef.redist.x86" version="3.2171.2069" targetFramework="net40-Client" />
<package id="CefSharp.Common" version="37.0.0" targetFramework="net40" /> <package id="CefSharp.Common" version="39.0.0" targetFramework="net40-Client" />
<package id="CefSharp.Wpf" version="37.0.0" targetFramework="net40" /> <package id="CefSharp.Wpf" version="39.0.0" targetFramework="net40-Client" />
</packages> </packages>