From 35f9cc3377237901df1e9f0421a511f7784c07a8 Mon Sep 17 00:00:00 2001 From: GrabzIt Date: Fri, 18 Aug 2017 15:45:52 +0100 Subject: [PATCH 01/11] Update to Cef Version 59.0.0 Note that there is one breaking change as offscreen windows are now automatically transparent due to this cef change: https://bitbucket.org/chromiumembedded/cef/commits/3f71138d64586d774f645a6db5283b5205ea9df4 To make a offscreen window non-transparent you need to set the background colour as shown below were it is set to white: browserSettings.BackgroundColor = 0255255255; --- .../CefSharp.BrowserSubprocess.Core.vcxproj | 16 ++++++++++------ ...fSharp.BrowserSubprocess.Core.vcxproj.filters | 4 ++-- CefSharp.BrowserSubprocess.Core/packages.config | 2 +- CefSharp.Core/CefSharp.Core.vcxproj | 13 +++++++++---- CefSharp.Core/CefSharp.Core.vcxproj.filters | 4 ++-- CefSharp.Core/ManagedCefBrowserAdapter.cpp | 5 ++--- CefSharp.Core/WindowInfo.h | 16 ++-------------- CefSharp.Core/packages.config | 2 +- .../CefSharp.OffScreen.Example.csproj | 14 +++++++++++--- CefSharp.OffScreen.Example/packages.config | 4 ++-- .../CefSharp.WinForms.Example.csproj | 14 +++++++++++--- CefSharp.WinForms.Example/packages.config | 4 ++-- CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj | 14 +++++++++++--- CefSharp.Wpf.Example/packages.config | 4 ++-- CefSharp/IWindowInfo.cs | 7 ++----- CefSharp/Properties/AssemblyInfo.cs | 4 ++-- 16 files changed, 72 insertions(+), 55 deletions(-) diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj index 534f697702..53edc2a5e6 100644 --- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj +++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj @@ -1,6 +1,6 @@  - + Debug @@ -66,9 +66,7 @@ - - 0c266be5 - + true ..\CefSharp.snk @@ -221,11 +219,17 @@ - + - + + + + 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/CefSharp.BrowserSubprocess.Core.vcxproj.filters b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj.filters index 31675b397c..881c585fc9 100644 --- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj.filters +++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj.filters @@ -153,9 +153,9 @@ - + - + \ No newline at end of file diff --git a/CefSharp.BrowserSubprocess.Core/packages.config b/CefSharp.BrowserSubprocess.Core/packages.config index 541a37dd8f..27d2fec6f2 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 5785fb80c0..c6ddc274aa 100644 --- a/CefSharp.Core/CefSharp.Core.vcxproj +++ b/CefSharp.Core/CefSharp.Core.vcxproj @@ -1,6 +1,6 @@  - + Debug @@ -67,7 +67,6 @@ <_ProjectFileVersion>11.0.51106.1 - 892d6872 bin\$(Platform)\$(Configuration)\ @@ -329,11 +328,17 @@ - + - + + + + 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/CefSharp.Core.vcxproj.filters b/CefSharp.Core/CefSharp.Core.vcxproj.filters index ac0b7860ea..5fe799855f 100644 --- a/CefSharp.Core/CefSharp.Core.vcxproj.filters +++ b/CefSharp.Core/CefSharp.Core.vcxproj.filters @@ -284,9 +284,9 @@ - + - + \ No newline at end of file diff --git a/CefSharp.Core/ManagedCefBrowserAdapter.cpp b/CefSharp.Core/ManagedCefBrowserAdapter.cpp index fcb14df9cb..b24e329df4 100644 --- a/CefSharp.Core/ManagedCefBrowserAdapter.cpp +++ b/CefSharp.Core/ManagedCefBrowserAdapter.cpp @@ -25,12 +25,11 @@ void ManagedCefBrowserAdapter::CreateOffscreenBrowser(IntPtr windowHandle, Brows auto hwnd = static_cast(windowHandle.ToPointer()); CefWindowInfo window; - auto transparent = browserSettings->OffScreenTransparentBackground.GetValueOrDefault(true); - window.SetAsWindowless(hwnd, transparent); + window.SetAsWindowless(hwnd); CefString addressNative = StringUtils::ToNative(address); if (!CefBrowserHost::CreateBrowser(window, _clientAdapter.get(), addressNative, - *browserSettings->_browserSettings, requestContext)) + *browserSettings->_browserSettings, *requestContext)) { throw gcnew InvalidOperationException("Failed to create offscreen browser. Call Cef.Initialize() first."); } diff --git a/CefSharp.Core/WindowInfo.h b/CefSharp.Core/WindowInfo.h index c55118eb1e..bceb5cb2ec 100644 --- a/CefSharp.Core/WindowInfo.h +++ b/CefSharp.Core/WindowInfo.h @@ -131,18 +131,6 @@ namespace CefSharp } } - virtual property bool TransparentPaintingEnabled - { - bool get() - { - return _windowInfo->transparent_painting_enabled == 1; - } - void set(bool transparentPaintingEnabled) - { - _windowInfo->transparent_painting_enabled = transparentPaintingEnabled; - } - } - virtual property bool WindowlessRenderingEnabled { bool get() @@ -170,9 +158,9 @@ namespace CefSharp _windowInfo->SetAsPopup((HWND)parentHandle.ToPointer(), StringUtils::ToNative(windowName)); } - virtual void SetAsWindowless(IntPtr parentHandle, bool transparent) + virtual void SetAsWindowless(IntPtr parentHandle) { - _windowInfo->SetAsWindowless((HWND)parentHandle.ToPointer(), transparent); + _windowInfo->SetAsWindowless((HWND)parentHandle.ToPointer()); } CefWindowInfo* GetWindowInfo() diff --git a/CefSharp.Core/packages.config b/CefSharp.Core/packages.config index 541a37dd8f..27d2fec6f2 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 6d9f98c4dc..de20e193d8 100644 --- a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj +++ b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj @@ -13,7 +13,8 @@ 512 - 8b6c24fc + + true @@ -95,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 902e78d742..087e9d9641 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.WinForms.Example/CefSharp.WinForms.Example.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj index 5df5edb7c7..defc2c6368 100644 --- a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj +++ b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj @@ -21,7 +21,8 @@ 3.5 Client - 5f632012 + + x64 @@ -185,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 902e78d742..087e9d9641 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 66bab1acf3..3c406485f8 100644 --- a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj +++ b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj @@ -21,7 +21,8 @@ 3.5 Client - a03680f0 + + true @@ -187,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 6b0debf223..0192952678 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/IWindowInfo.cs b/CefSharp/IWindowInfo.cs index c50072b3bf..d44e521db2 100644 --- a/CefSharp/IWindowInfo.cs +++ b/CefSharp/IWindowInfo.cs @@ -15,7 +15,6 @@ public interface IWindowInfo : IDisposable uint Style { get; set; } uint ExStyle { get; set; } IntPtr ParentWindowHandle { get; set; } - bool TransparentPaintingEnabled { get; set; } bool WindowlessRenderingEnabled { get; set; } IntPtr WindowHandle { get; set; } @@ -24,13 +23,11 @@ public interface IWindowInfo : IDisposable /// /// Create the browser using windowless (off-screen) rendering. - /// No window will be created for the browser and all rendering will occur via the CefRenderHandler interface. + /// No window will be created for the browser and all rendering will occur via the CefRenderHandler interface. This window will automatically be transparent unless a colored backgrond is set in the browser settings. /// /// Value will be used to identify monitor info and to act as the parent window for dialogs, context menus, etc. /// If not provided then the main screen monitor will be used and some functionality that requires a parent window may not function correctly. - /// If is true a transparent background color will be used (RGBA=0x00000000). - /// If is false the background will be white and opaque. /// In order to create windowless browsers the CefSettings.windowless_rendering_enabled value must be set to true. - void SetAsWindowless(IntPtr parentHandle, bool transparent); + void SetAsWindowless(IntPtr parentHandle); } } diff --git a/CefSharp/Properties/AssemblyInfo.cs b/CefSharp/Properties/AssemblyInfo.cs index 75bc8a239d..70149e2abc 100644 --- a/CefSharp/Properties/AssemblyInfo.cs +++ b/CefSharp/Properties/AssemblyInfo.cs @@ -34,8 +34,8 @@ public static class AssemblyInfo public const bool ComVisible = false; public const string AssemblyCompany = "The CefSharp Authors"; public const string AssemblyProduct = "CefSharp"; - public const string AssemblyVersion = "58.0.0"; - public const string AssemblyFileVersion = "58.0.0.0"; + public const string AssemblyVersion = "59.0.0"; + public const string AssemblyFileVersion = "59.0.0.0"; public const string AssemblyCopyright = "Copyright © 2010-2017 The CefSharp Authors"; public const string CefSharpCoreProject = "CefSharp.Core, PublicKey=" + PublicKey; public const string CefSharpBrowserSubprocessProject = "CefSharp.BrowserSubprocess, PublicKey=" + PublicKey; From 08444fe035423a88f09920a3fff01d615ff5014f Mon Sep 17 00:00:00 2001 From: GrabzIt Date: Fri, 18 Aug 2017 16:07:03 +0100 Subject: [PATCH 02/11] Updated to version 59.0.0 --- CefSharp.BrowserSubprocess.Core/Resource.rc | 8 ++++---- CefSharp.BrowserSubprocess/app.manifest | 6 +++--- CefSharp.Core/Resource.rc | 8 ++++---- CefSharp.OffScreen.Example/app.manifest | 2 +- CefSharp.WinForms.Example/app.manifest | 6 +++--- CefSharp.Wpf.Example/app.manifest | 2 +- build.ps1 | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CefSharp.BrowserSubprocess.Core/Resource.rc b/CefSharp.BrowserSubprocess.Core/Resource.rc index 8901200110..ba981e47f9 100644 --- a/CefSharp.BrowserSubprocess.Core/Resource.rc +++ b/CefSharp.BrowserSubprocess.Core/Resource.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO - FILEVERSION 58.0.0 - PRODUCTVERSION 58.0.0 + FILEVERSION 59.0.0 + PRODUCTVERSION 59.0.0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -16,10 +16,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "CefSharp.BrowserSubprocess.Core" - VALUE "FileVersion", "58.0.0" + VALUE "FileVersion", "59.0.0" VALUE "LegalCopyright", "Copyright © 2010-2017 The CefSharp Authors" VALUE "ProductName", "CefSharp" - VALUE "ProductVersion", "58.0.0" + VALUE "ProductVersion", "59.0.0" END END BLOCK "VarFileInfo" diff --git a/CefSharp.BrowserSubprocess/app.manifest b/CefSharp.BrowserSubprocess/app.manifest index 3108c3ef14..12e2cae8eb 100644 --- a/CefSharp.BrowserSubprocess/app.manifest +++ b/CefSharp.BrowserSubprocess/app.manifest @@ -1,4 +1,4 @@ - + - + @@ -48,4 +48,4 @@ - \ No newline at end of file + diff --git a/CefSharp.Core/Resource.rc b/CefSharp.Core/Resource.rc index fbc4854b84..e85ec3acae 100644 --- a/CefSharp.Core/Resource.rc +++ b/CefSharp.Core/Resource.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO - FILEVERSION 58.0.0 - PRODUCTVERSION 58.0.0 + FILEVERSION 59.0.0 + PRODUCTVERSION 59.0.0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -16,10 +16,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "CefSharp.Core" - VALUE "FileVersion", "58.0.0" + VALUE "FileVersion", "59.0.0" VALUE "LegalCopyright", "Copyright © 2010-2017 The CefSharp Authors" VALUE "ProductName", "CefSharp" - VALUE "ProductVersion", "58.0.0" + VALUE "ProductVersion", "59.0.0" END END BLOCK "VarFileInfo" diff --git a/CefSharp.OffScreen.Example/app.manifest b/CefSharp.OffScreen.Example/app.manifest index 03d0721127..cd8b52e39a 100644 --- a/CefSharp.OffScreen.Example/app.manifest +++ b/CefSharp.OffScreen.Example/app.manifest @@ -7,7 +7,7 @@ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - + diff --git a/CefSharp.WinForms.Example/app.manifest b/CefSharp.WinForms.Example/app.manifest index 3a92b90398..9f1fe10312 100644 --- a/CefSharp.WinForms.Example/app.manifest +++ b/CefSharp.WinForms.Example/app.manifest @@ -1,4 +1,4 @@ - + - + @@ -55,4 +55,4 @@ - \ No newline at end of file + diff --git a/CefSharp.Wpf.Example/app.manifest b/CefSharp.Wpf.Example/app.manifest index 035e5cf686..d887a20608 100644 --- a/CefSharp.Wpf.Example/app.manifest +++ b/CefSharp.Wpf.Example/app.manifest @@ -7,7 +7,7 @@ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - + diff --git a/build.ps1 b/build.ps1 index e9762cf47c..68bdbd4a52 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,11 +1,11 @@ param( [ValidateSet("vs2013", "vs2015", "nupkg-only", "gitlink")] [Parameter(Position = 0)] - [string] $Target = "vs2013", + [string] $Target = "vs2015", [Parameter(Position = 1)] - [string] $Version = "58.0.0", + [string] $Version = "59.0.0", [Parameter(Position = 2)] - [string] $AssemblyVersion = "58.0.0" + [string] $AssemblyVersion = "59.0.0" ) $WorkingDir = split-path -parent $MyInvocation.MyCommand.Definition From 2f680f01b71f7dc311cd74a6baad8b1e8b85afbf Mon Sep 17 00:00:00 2001 From: GrabzIt Date: Fri, 18 Aug 2017 20:37:41 +0100 Subject: [PATCH 03/11] Updated version 59.0.0 to latest build 3.3071.1649 --- .../CefSharp.BrowserSubprocess.Core.vcxproj | 4 ++-- CefSharp.BrowserSubprocess.Core/packages.config | 2 +- CefSharp.Core/CefSharp.Core.vcxproj | 4 ++-- CefSharp.Core/Internals/CefBrowserHostWrapper.cpp | 2 +- CefSharp.Core/ManagedCefBrowserAdapter.cpp | 2 +- CefSharp.Core/packages.config | 2 +- .../CefSharp.OffScreen.Example.csproj | 8 ++++---- CefSharp.OffScreen.Example/packages.config | 4 ++-- .../CefSharp.WinForms.Example.csproj | 8 ++++---- CefSharp.WinForms.Example/packages.config | 4 ++-- CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj | 8 ++++---- CefSharp.Wpf.Example/packages.config | 4 ++-- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj index 53edc2a5e6..1201530c0b 100644 --- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj +++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj @@ -1,6 +1,6 @@  - + Debug @@ -230,6 +230,6 @@ 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 27d2fec6f2..9eabb51f53 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 c6ddc274aa..680faa690c 100644 --- a/CefSharp.Core/CefSharp.Core.vcxproj +++ b/CefSharp.Core/CefSharp.Core.vcxproj @@ -1,6 +1,6 @@  - + Debug @@ -339,6 +339,6 @@ 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/Internals/CefBrowserHostWrapper.cpp b/CefSharp.Core/Internals/CefBrowserHostWrapper.cpp index cf830b50e0..6df3aecd65 100644 --- a/CefSharp.Core/Internals/CefBrowserHostWrapper.cpp +++ b/CefSharp.Core/Internals/CefBrowserHostWrapper.cpp @@ -20,7 +20,7 @@ void CefBrowserHostWrapper::DragTargetDragEnter(IDragData^ dragData, MouseEvent auto dragDataWrapper = static_cast(dragData); dragDataWrapper->ResetFileContents(); // Recommended by documentation to reset before calling DragEnter - _browserHost->DragTargetDragEnter(dragDataWrapper, GetCefMouseEvent(mouseEvent), (CefBrowserHost::DragOperationsMask) allowedOperations); + _browserHost->DragTargetDragEnter(*dragDataWrapper, GetCefMouseEvent(mouseEvent), (CefBrowserHost::DragOperationsMask) allowedOperations); } void CefBrowserHostWrapper::DragTargetDragOver(MouseEvent mouseEvent, DragOperationsMask allowedOperations) diff --git a/CefSharp.Core/ManagedCefBrowserAdapter.cpp b/CefSharp.Core/ManagedCefBrowserAdapter.cpp index b24e329df4..5e9b4ee7a0 100644 --- a/CefSharp.Core/ManagedCefBrowserAdapter.cpp +++ b/CefSharp.Core/ManagedCefBrowserAdapter.cpp @@ -77,7 +77,7 @@ void ManagedCefBrowserAdapter::CreateBrowser(BrowserSettings^ browserSettings, R CefString addressNative = StringUtils::ToNative(address); CefBrowserHost::CreateBrowser(window, _clientAdapter.get(), addressNative, - *browserSettings->_browserSettings, requestContext); + *browserSettings->_browserSettings, *requestContext); } void ManagedCefBrowserAdapter::Resize(int width, int height) diff --git a/CefSharp.Core/packages.config b/CefSharp.Core/packages.config index 27d2fec6f2..9eabb51f53 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 de20e193d8..526980003f 100644 --- a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj +++ b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj @@ -96,13 +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 087e9d9641..9dd9119614 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.WinForms.Example/CefSharp.WinForms.Example.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj index defc2c6368..f2ad51ab76 100644 --- a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj +++ b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj @@ -186,13 +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 087e9d9641..9dd9119614 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 3c406485f8..4a072cb04d 100644 --- a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj +++ b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj @@ -188,13 +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 0192952678..e4b0c8c8f7 100644 --- a/CefSharp.Wpf.Example/packages.config +++ b/CefSharp.Wpf.Example/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file From ea7d2c8082a79b917ebd4e9a6dac40d23a9b512e Mon Sep 17 00:00:00 2001 From: GrabzIt Date: Fri, 6 Oct 2017 08:03:19 +0100 Subject: [PATCH 04/11] Removed EnsureNuGetPackageBuildImports --- CefSharp.Core/CefSharp.Core.vcxproj | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CefSharp.Core/CefSharp.Core.vcxproj b/CefSharp.Core/CefSharp.Core.vcxproj index 680faa690c..c0018d6849 100644 --- a/CefSharp.Core/CefSharp.Core.vcxproj +++ b/CefSharp.Core/CefSharp.Core.vcxproj @@ -335,10 +335,4 @@ - - - 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 + From 3d45c10b2812cfb0b29c04eb3ecf0c9fd571d986 Mon Sep 17 00:00:00 2001 From: GrabzIt Date: Fri, 6 Oct 2017 08:04:25 +0100 Subject: [PATCH 05/11] Remove EnsureNuGetPackageBuildImports target --- .../CefSharp.BrowserSubprocess.Core.vcxproj | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj index 1201530c0b..1d13b40470 100644 --- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj +++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj @@ -226,10 +226,4 @@ - - - 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 + From b5ade5102bb3f4a04560984bd1a07295535f7b0d Mon Sep 17 00:00:00 2001 From: GrabzIt Date: Fri, 6 Oct 2017 08:05:12 +0100 Subject: [PATCH 06/11] Removed EnsureNuGetPackageBuildImports --- .../CefSharp.WinForms.Example.csproj | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj index f2ad51ab76..5df78204c2 100644 --- a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj +++ b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj @@ -187,12 +187,5 @@ - - - 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 + From 22b67f0d30b6a42e3d648124b6060941202ee1b9 Mon Sep 17 00:00:00 2001 From: GrabzIt Date: Fri, 6 Oct 2017 08:05:50 +0100 Subject: [PATCH 07/11] Removed EnsureNuGetPackageBuildImports --- .../CefSharp.OffScreen.Example.csproj | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj index 526980003f..748244dbee 100644 --- a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj +++ b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj @@ -97,12 +97,5 @@ - - - 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 + From fb5a0bb9acd7ce3feb95985c95f6ca6d65e2dbe3 Mon Sep 17 00:00:00 2001 From: GrabzIt Date: Fri, 6 Oct 2017 08:08:31 +0100 Subject: [PATCH 08/11] Removed EnsureNuGetPackageBuildImports --- CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj index 4a072cb04d..61e7feef46 100644 --- a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj +++ b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj @@ -189,12 +189,5 @@ - - - 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 + From f82d7440ac430d7273df1f82c0d470a1d4c615ae Mon Sep 17 00:00:00 2001 From: GrabzIt Date: Fri, 6 Oct 2017 08:09:51 +0100 Subject: [PATCH 09/11] Put target back to 2013 --- build.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.ps1 b/build.ps1 index 68bdbd4a52..81ff85467c 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,7 +1,7 @@ param( [ValidateSet("vs2013", "vs2015", "nupkg-only", "gitlink")] [Parameter(Position = 0)] - [string] $Target = "vs2015", + [string] $Target = "vs2013", [Parameter(Position = 1)] [string] $Version = "59.0.0", [Parameter(Position = 2)] @@ -379,4 +379,4 @@ switch -Exact ($Target) UpdateSymbolsWithGitLink Nupkg } -} \ No newline at end of file +} From 62ae9ed36fd6db5629802bc48b1f5d8454da4381 Mon Sep 17 00:00:00 2001 From: GrabzIt Date: Fri, 6 Oct 2017 08:26:59 +0100 Subject: [PATCH 10/11] Fixed pointer --- CefSharp.Core/ManagedCefBrowserAdapter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CefSharp.Core/ManagedCefBrowserAdapter.cpp b/CefSharp.Core/ManagedCefBrowserAdapter.cpp index 5e9b4ee7a0..e3a4c218eb 100644 --- a/CefSharp.Core/ManagedCefBrowserAdapter.cpp +++ b/CefSharp.Core/ManagedCefBrowserAdapter.cpp @@ -1,4 +1,4 @@ -// Copyright � 2010-2017 The CefSharp Authors. All rights reserved. +// Copyright © 2010-2017 The CefSharp Authors. All rights reserved. // // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. @@ -29,7 +29,7 @@ void ManagedCefBrowserAdapter::CreateOffscreenBrowser(IntPtr windowHandle, Brows CefString addressNative = StringUtils::ToNative(address); if (!CefBrowserHost::CreateBrowser(window, _clientAdapter.get(), addressNative, - *browserSettings->_browserSettings, *requestContext)) + *browserSettings->_browserSettings, static_cast>(requestContext))) { throw gcnew InvalidOperationException("Failed to create offscreen browser. Call Cef.Initialize() first."); } @@ -77,7 +77,7 @@ void ManagedCefBrowserAdapter::CreateBrowser(BrowserSettings^ browserSettings, R CefString addressNative = StringUtils::ToNative(address); CefBrowserHost::CreateBrowser(window, _clientAdapter.get(), addressNative, - *browserSettings->_browserSettings, *requestContext); + *browserSettings->_browserSettings, static_cast>(requestContext)); } void ManagedCefBrowserAdapter::Resize(int width, int height) From f76f4d9436b3b9aa9ef6e5a76eb6f805cb3bd94f Mon Sep 17 00:00:00 2001 From: GrabzIt Date: Fri, 6 Oct 2017 09:04:33 +0100 Subject: [PATCH 11/11] Updated pointer --- CefSharp.Core/Internals/CefBrowserHostWrapper.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CefSharp.Core/Internals/CefBrowserHostWrapper.cpp b/CefSharp.Core/Internals/CefBrowserHostWrapper.cpp index 6df3aecd65..8f40e93f4c 100644 --- a/CefSharp.Core/Internals/CefBrowserHostWrapper.cpp +++ b/CefSharp.Core/Internals/CefBrowserHostWrapper.cpp @@ -1,4 +1,4 @@ -// Copyright � 2010-2017 The CefSharp Authors. All rights reserved. +// Copyright © 2010-2017 The CefSharp Authors. All rights reserved. // // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. @@ -20,7 +20,7 @@ void CefBrowserHostWrapper::DragTargetDragEnter(IDragData^ dragData, MouseEvent auto dragDataWrapper = static_cast(dragData); dragDataWrapper->ResetFileContents(); // Recommended by documentation to reset before calling DragEnter - _browserHost->DragTargetDragEnter(*dragDataWrapper, GetCefMouseEvent(mouseEvent), (CefBrowserHost::DragOperationsMask) allowedOperations); + _browserHost->DragTargetDragEnter(static_cast>(dragDataWrapper), GetCefMouseEvent(mouseEvent), (CefBrowserHost::DragOperationsMask) allowedOperations); } void CefBrowserHostWrapper::DragTargetDragOver(MouseEvent mouseEvent, DragOperationsMask allowedOperations) @@ -603,4 +603,4 @@ int CefBrowserHostWrapper::GetCefKeyboardModifiers(WPARAM wparam, LPARAM lparam) break; } return modifiers; -} \ No newline at end of file +}