From 920e7b78da480733eaa79c417302efde6a0d626f Mon Sep 17 00:00:00 2001 From: Per Lundberg Date: Tue, 28 Nov 2017 00:04:55 +0200 Subject: [PATCH 1/3] Upgraded to CEF 62. --- .../CefSharp.BrowserSubprocess.Core.vcxproj | 10 ++++++++-- .../packages.config | 2 +- CefSharp.Core/CefSharp.Core.vcxproj | 13 +++++++----- CefSharp.Core/PopupFeatures.h | 20 ------------------- CefSharp.Core/packages.config | 2 +- .../CefSharp.OffScreen.Example.csproj | 13 +++++++++--- CefSharp.OffScreen.Example/packages.config | 4 ++-- CefSharp.Test/CefSharp.Test.csproj | 14 ++++++++++--- CefSharp.Test/packages.config | 4 ++-- .../CefSharp.WinForms.Example.csproj | 13 +++++++++--- CefSharp.WinForms.Example/packages.config | 4 ++-- .../CefSharp.Wpf.Example.csproj | 13 +++++++++--- CefSharp.Wpf.Example/packages.config | 4 ++-- CefSharp/IPopupFeatures.cs | 4 ---- 14 files changed, 67 insertions(+), 53 deletions(-) diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj index 866a44a153..de2c739a92 100644 --- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj +++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj @@ -1,6 +1,6 @@  - + Debug @@ -226,4 +226,10 @@ - + + + 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}. + + + + \ No newline at end of file diff --git a/CefSharp.BrowserSubprocess.Core/packages.config b/CefSharp.BrowserSubprocess.Core/packages.config index 71b71a1a84..00abc59037 100644 --- a/CefSharp.BrowserSubprocess.Core/packages.config +++ b/CefSharp.BrowserSubprocess.Core/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/CefSharp.Core/CefSharp.Core.vcxproj b/CefSharp.Core/CefSharp.Core.vcxproj index f106f9c45a..112f4011ee 100644 --- a/CefSharp.Core/CefSharp.Core.vcxproj +++ b/CefSharp.Core/CefSharp.Core.vcxproj @@ -1,6 +1,6 @@  - + Debug @@ -128,7 +128,6 @@ opengl32.lib;glu32.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies) - LinkVerbose $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion) false true @@ -158,7 +157,6 @@ opengl32.lib;glu32.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies) - LinkVerbose $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion) false true @@ -200,7 +198,6 @@ opengl32.lib;glu32.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies) - LinkVerbose $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion) true $(LinkKeyFile) @@ -335,4 +332,10 @@ - + + + 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}. + + + + \ No newline at end of file diff --git a/CefSharp.Core/PopupFeatures.h b/CefSharp.Core/PopupFeatures.h index 9a4c80bc06..1c7b2844a1 100644 --- a/CefSharp.Core/PopupFeatures.h +++ b/CefSharp.Core/PopupFeatures.h @@ -87,31 +87,11 @@ namespace CefSharp bool get() { return _popupFeatures->toolBarVisible == 1; } } - virtual property bool LocationBarVisible - { - bool get() { return _popupFeatures->locationBarVisible == 1; } - } - virtual property bool ScrollbarsVisible { bool get() { return _popupFeatures->scrollbarsVisible == 1; } } - virtual property bool Resizable - { - bool get() { return _popupFeatures->resizable == 1; } - } - - virtual property bool Fullscreen - { - bool get() { return _popupFeatures->fullscreen == 1; } - } - - virtual property bool Dialog - { - bool get() { return _popupFeatures->dialog == 1; } - } - /*property List^ AdditionalFeatures { List^ get() { return StringUtils::ToClr(_popupFeatures->additionalFeatures); } diff --git a/CefSharp.Core/packages.config b/CefSharp.Core/packages.config index 71b71a1a84..00abc59037 100644 --- a/CefSharp.Core/packages.config +++ b/CefSharp.Core/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj index 748244dbee..6b7f3ae22d 100644 --- a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj +++ b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj @@ -96,6 +96,13 @@ - - - + + + + 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}. + + + + + + \ No newline at end of file diff --git a/CefSharp.OffScreen.Example/packages.config b/CefSharp.OffScreen.Example/packages.config index 9dd9119614..b6422162ec 100644 --- a/CefSharp.OffScreen.Example/packages.config +++ b/CefSharp.OffScreen.Example/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/CefSharp.Test/CefSharp.Test.csproj b/CefSharp.Test/CefSharp.Test.csproj index 2a4df677aa..f2f73a0727 100644 --- a/CefSharp.Test/CefSharp.Test.csproj +++ b/CefSharp.Test/CefSharp.Test.csproj @@ -20,7 +20,8 @@ 3.5 Client - 1e810f40 + + true @@ -146,6 +147,13 @@ --> - - + + + + 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}. + + + + + \ No newline at end of file diff --git a/CefSharp.Test/packages.config b/CefSharp.Test/packages.config index 6742246eb2..4faf5c6abc 100644 --- a/CefSharp.Test/packages.config +++ b/CefSharp.Test/packages.config @@ -1,8 +1,8 @@  - - + + diff --git a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj index 5df78204c2..a8f303bf6d 100644 --- a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj +++ b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj @@ -186,6 +186,13 @@ - - - + + + + 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}. + + + + + + \ No newline at end of file diff --git a/CefSharp.WinForms.Example/packages.config b/CefSharp.WinForms.Example/packages.config index 9dd9119614..b6422162ec 100644 --- a/CefSharp.WinForms.Example/packages.config +++ b/CefSharp.WinForms.Example/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj index 61e7feef46..ca6bb2e3ae 100644 --- a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj +++ b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj @@ -188,6 +188,13 @@ - - - + + + + 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}. + + + + + + \ No newline at end of file diff --git a/CefSharp.Wpf.Example/packages.config b/CefSharp.Wpf.Example/packages.config index e4b0c8c8f7..0d0795142a 100644 --- a/CefSharp.Wpf.Example/packages.config +++ b/CefSharp.Wpf.Example/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/CefSharp/IPopupFeatures.cs b/CefSharp/IPopupFeatures.cs index 20c68b9dad..93a0bd1feb 100644 --- a/CefSharp/IPopupFeatures.cs +++ b/CefSharp/IPopupFeatures.cs @@ -17,10 +17,6 @@ public interface IPopupFeatures bool MenuBarVisible { get; } bool StatusBarVisible { get; } bool ToolBarVisible { get; } - bool LocationBarVisible { get; } bool ScrollbarsVisible { get; } - bool Resizable { get; } - bool Fullscreen { get; } - bool Dialog { get; } } } From 6a850e107750f230beea5fdc9260bc37b1de139f Mon Sep 17 00:00:00 2001 From: Per Lundberg Date: Wed, 29 Nov 2017 22:32:15 +0200 Subject: [PATCH 2/3] Upgraded CEF version in README.md --- README.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index ffcbe41f27..e35ea2184a 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Stable binaries are released on NuGet, and contain everything you need to embed * See the [CefSharp.MinimalExample](https://github.com/cefsharp/CefSharp.MinimalExample/) project for a basic demo of using the CefSharp NuGet packages. * See the [General Usage Guide](https://github.com/cefsharp/CefSharp/wiki/General-Usage) in help getting started/dealing with common scenarios. * See the [Wiki](https://github.com/cefsharp/CefSharp/wiki) for work-in-progress documentation -* See the [FAQ](https://github.com/cefsharp/CefSharp/wiki/Frequently-asked-questions) for help with common issues +* See the [FAQ](https://github.com/cefsharp/CefSharp/wiki/Frequently-asked-questions) for help with common issues * Upgrading from an earlier version of CefSharp? See the [ChangeLog](https://github.com/cefsharp/CefSharp/wiki/ChangeLog) for breaking changes and upgrade tips. * [CefSharp API](http://cefsharp.github.io/api/55.0.0/) generated from the source code comments. @@ -39,7 +39,7 @@ If you have a simple question please start by asking it on [![Gitter](https://ba This is the `official` CefSharp fork, as maintained by the CefSharp community. You can also view [the entire network of public forks/branches](https://github.com/search?utf8=%E2%9C%93&q=cefsharp+fork%3Atrue&type=Repositories&ref=searchresults). -*Note* Due to so many Forks - Github can't process them through the `Network Graphs` Section so, if you need to do a search use the following: `cefsharp fork:true` and it will be able to process all of the forks. +*Note* Due to so many Forks - Github can't process them through the `Network Graphs` Section so, if you need to do a search use the following: `cefsharp fork:true` and it will be able to process all of the forks. Development is done in the `master` branch. New features are preferably added in feature branches, if the changes are more than trivial. New `PR's` should be targeted against `master`. @@ -61,20 +61,19 @@ Every commit on `master` produces a `Nuget` package. Use at your own risk! - [![CefSharp.Wpf](http://img.shields.io/nuget/vpre/CefSharp.Wpf.svg?style=flat&label=Wpf)](http://www.nuget.org/packages/CefSharp.Wpf/) - [![CefSharp.OffScreen](http://img.shields.io/nuget/vpre/CefSharp.OffScreen.svg?style=flat&label=OffScreen)](http://www.nuget.org/packages/CefSharp.OffScreen/) -**Stable**
+**Stable**
- [![CefSharp.WinForms](http://img.shields.io/nuget/v/CefSharp.WinForms.svg?style=flat&label=WinForms)](http://www.nuget.org/packages/CefSharp.WinForms/) - [![CefSharp.Wpf](http://img.shields.io/nuget/v/CefSharp.Wpf.svg?style=flat&label=Wpf)](http://www.nuget.org/packages/CefSharp.Wpf/) - [![CefSharp.OffScreen](http://img.shields.io/nuget/v/CefSharp.OffScreen.svg?style=flat&label=OffScreen)](http://www.nuget.org/packages/CefSharp.OffScreen/) - ### Release Branches With each release a new branch is created, for example the `53.0.1` release corresponds to the `cefsharp/53` branch. -If your new to `CefSharp` and are downloading the source to check it out, please use a **Release** branch +If you're new to `CefSharp` and are downloading the source to check it out, please use a **Release** branch -| Branch | CEF Version | VC++ Version | .Net Version | Status | -|--------|-------------|--------------|--------------|--------| -| [master](https://github.com/cefsharp/CefSharp/) | 3029 | 2013 | 4.5.2 | Development | +| Branch | CEF Version | VC++ Version | .Net Version | Status | +|----------------------------------------------------------------------|------|------|-------|-------------| +| [master](https://github.com/cefsharp/CefSharp/) | 3202 | 2013 | 4.5.2 | Development | | [cefsharp/57](https://github.com/cefsharp/CefSharp/tree/cefsharp/57) | 2987 | 2013 | 4.5.2 | **Release** | | [cefsharp/55](https://github.com/cefsharp/CefSharp/tree/cefsharp/55) | 2883 | 2013 | 4.5.2 | Unsupported | | [cefsharp/53](https://github.com/cefsharp/CefSharp/tree/cefsharp/53) | 2785 | 2013 | 4.5.2 | Unsupported | From e587e7962023ee11c1ccc52226e4adcef1d3011d Mon Sep 17 00:00:00 2001 From: Per Lundberg Date: Wed, 29 Nov 2017 22:53:47 +0200 Subject: [PATCH 3/3] Bumped appveyor etc versions to 62.0.0. --- CefSharp.OffScreen.Example/crash_reporter.cfg | 2 +- CefSharp.WinForms.Example/crash_reporter.cfg | 2 +- CefSharp.Wpf.Example/crash_reporter.cfg | 2 +- appveyor.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CefSharp.OffScreen.Example/crash_reporter.cfg b/CefSharp.OffScreen.Example/crash_reporter.cfg index 08143ba58f..c408c71935 100644 --- a/CefSharp.OffScreen.Example/crash_reporter.cfg +++ b/CefSharp.OffScreen.Example/crash_reporter.cfg @@ -22,6 +22,6 @@ [Config] ProductName=CefSharp -ProductVersion=58.0.0 +ProductVersion=62.0.0 AppName=CefSharp ExternalHandler=CefSharp.BrowserSubprocess.exe \ No newline at end of file diff --git a/CefSharp.WinForms.Example/crash_reporter.cfg b/CefSharp.WinForms.Example/crash_reporter.cfg index 08143ba58f..c408c71935 100644 --- a/CefSharp.WinForms.Example/crash_reporter.cfg +++ b/CefSharp.WinForms.Example/crash_reporter.cfg @@ -22,6 +22,6 @@ [Config] ProductName=CefSharp -ProductVersion=58.0.0 +ProductVersion=62.0.0 AppName=CefSharp ExternalHandler=CefSharp.BrowserSubprocess.exe \ No newline at end of file diff --git a/CefSharp.Wpf.Example/crash_reporter.cfg b/CefSharp.Wpf.Example/crash_reporter.cfg index 08143ba58f..c408c71935 100644 --- a/CefSharp.Wpf.Example/crash_reporter.cfg +++ b/CefSharp.Wpf.Example/crash_reporter.cfg @@ -22,6 +22,6 @@ [Config] ProductName=CefSharp -ProductVersion=58.0.0 +ProductVersion=62.0.0 AppName=CefSharp ExternalHandler=CefSharp.BrowserSubprocess.exe \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index e60fa61bcd..f129bbf4bb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ environment: VisualStudioVersion: 12.0 -version: 58.0.0-CI{build} +version: 62.0.0-CI{build} clone_depth: 10