Merge pull request #85 from chylex/screenshot

Add tweet screenshot functionality & update CEF
2025-04-21 06:15:47 +02:00 · 2016-12-23 15:31:15 +01:00 · 2016-12-23 15:31:15 +01:00 · da83d73ba6
commit da83d73ba6
parent 04cd662d78 02e8dc3440
12 changed files with 199 additions and 57 deletions
--- a/Configuration/packages.config
+++ b/Configuration/packages.config
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <package id="cef.redist.x64" version="3.2785.1478" targetFramework="net452" />
-  <package id="cef.redist.x86" version="3.2785.1478" targetFramework="net452" />
-  <package id="CefSharp.Common" version="53.0.0-pre01" targetFramework="net452" />
-  <package id="CefSharp.WinForms" version="53.0.0-pre01" targetFramework="net452" />
+  <package id="cef.redist.x64" version="3.2785.1486" targetFramework="net452" />
+  <package id="cef.redist.x86" version="3.2785.1486" targetFramework="net452" />
+  <package id="CefSharp.Common" version="53.0.1" targetFramework="net452" />
+  <package id="CefSharp.WinForms" version="53.0.1" targetFramework="net452" />
  <package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net452" />
 </packages>
--- a/Core/FormBrowser.cs
+++ b/Core/FormBrowser.cs
@ -9,6 +9,7 @@
 using TweetDck.Core.Controls;
 using System.Drawing;
 using TweetDck.Core.Utils;
+using TweetDck.Core.Utils.Notification;
 using TweetDck.Updates;
 using TweetDck.Plugins;
 using TweetDck.Plugins.Enums;
@ -27,6 +28,7 @@ private static UserConfig Config{
        private readonly ChromiumWebBrowser browser;
        private readonly PluginManager plugins;
        private readonly UpdateHandler updates;
+        private readonly FormNotification notification;

        private FormSettings currentFormSettings;
        private FormAbout currentFormAbout;
@ -44,9 +46,9 @@ public FormBrowser(PluginManager pluginManager, UpdaterSettings updaterSettings)
            this.plugins.Reloaded += plugins_Reloaded;
            this.plugins.PluginChangedState += plugins_PluginChangedState;

-            FormNotification notification = CreateNotificationForm(true);
-            notification.CanMoveWindow = () => false;
-            notification.Show();
+            this.notification = CreateNotificationForm(NotificationFlags.AutoHide);
+            this.notification.CanMoveWindow = () => false;
+            this.notification.Show();

            this.browser = new ChromiumWebBrowser("https://tweetdeck.twitter.com/"){
                MenuHandler = new ContextMenuBrowser(this),
@ -87,8 +89,8 @@ public void ForceClose(){
            Close();
        }

-        public FormNotification CreateNotificationForm(bool autoHide){
-            return new FormNotification(this, plugins, autoHide);
+        public FormNotification CreateNotificationForm(NotificationFlags flags){
+            return new FormNotification(this, plugins, flags);
        }

        // window setup
@ -291,6 +293,36 @@ public void OnTweetNotification(){
            }
        }

+        public void OnTweetScreenshotReady(string html, int width, int height){
+            FormNotification dummyWindow = CreateNotificationForm(NotificationFlags.DisableScripts | NotificationFlags.DisableContextMenu);
+
+            dummyWindow.ShowNotificationForScreenshot(new TweetNotification(html, string.Empty, 0), width, height, () => {
+                Point? prevNotificationLocation = null;
+                bool prevFreezeTimer = false;
+
+                if (notification.IsNotificationVisible){
+                    prevNotificationLocation = notification.Location;
+                    prevFreezeTimer = notification.FreezeTimer;
+
+                    notification.Location = new Point(-32000, -32000);
+                    notification.FreezeTimer = true;
+                }
+
+                dummyWindow.TakeScreenshot();
+                dummyWindow.Hide();
+                dummyWindow.Close();
+                // dummyWindow.Dispose(); // TODO something freezes the program sometimes
+
+                if (prevNotificationLocation.HasValue){
+                    notification.Location = prevNotificationLocation.Value;
+                    notification.FreezeTimer = prevFreezeTimer;
+                }
+            });
+            
+            dummyWindow.CanMoveWindow = () => false;
+            dummyWindow.Show();
+        }
+
        public void DisplayTooltip(string text){
            if (string.IsNullOrEmpty(text)){
                toolTip.Hide(this);
@ -310,6 +342,10 @@ public void OnImagePastedFinish(){
            browser.ExecuteScriptAsync("TDGF_tryPasteImageFinish()");
        }

+        public void TriggerTweetScreenshot(){
+            browser.ExecuteScriptAsync("TDGF_triggerScreenshot()");
+        }
+
        public void ReloadBrowser(){
            browser.ExecuteScriptAsync("window.location.reload()");
        }
--- a/Core/FormNotification.cs
+++ b/Core/FormNotification.cs
@ -8,6 +8,7 @@
 using TweetDck.Core.Handling;
 using TweetDck.Resources;
 using TweetDck.Core.Utils;
+using TweetDck.Core.Utils.Notification;
 using TweetDck.Plugins;
 using TweetDck.Plugins.Enums;

@ -20,12 +21,18 @@ sealed partial class FormNotification : Form{

        public Func<bool> CanMoveWindow = () => true;

+        public bool IsNotificationVisible{
+            get{
+                return Location.X != -32000;
+            }
+        }
+
        private readonly Form owner;
        private readonly PluginManager plugins;
        private readonly ChromiumWebBrowser browser;
+        private readonly NotificationFlags flags;

        private readonly Queue<TweetNotification> tweetQueue = new Queue<TweetNotification>(4);
-        private readonly bool autoHide;
        private int timeLeft, totalTime;
        
        private readonly NativeMethods.HookProc mouseHookDelegate;
@ -82,22 +89,24 @@ private static int BaseClientHeight{
            }
        }

-        public FormNotification(FormBrowser owner, PluginManager pluginManager, bool autoHide){
+        public FormNotification(FormBrowser owner, PluginManager pluginManager, NotificationFlags flags){
            InitializeComponent();

            Text = Program.BrandName;

            this.owner = owner;
            this.plugins = pluginManager;
-            this.autoHide = autoHide;
+            this.flags = flags;

            owner.FormClosed += (sender, args) => Close();

-            notificationJS = ScriptLoader.LoadResource(NotificationScriptFile);
-            pluginJS = ScriptLoader.LoadResource(PluginManager.PluginNotificationScriptFile);
+            if (!flags.HasFlag(NotificationFlags.DisableScripts)){
+                notificationJS = ScriptLoader.LoadResource(NotificationScriptFile);
+                pluginJS = ScriptLoader.LoadResource(PluginManager.PluginNotificationScriptFile);
+            }

            browser = new ChromiumWebBrowser("about:blank"){
-                MenuHandler = new ContextMenuNotification(this, autoHide),
+                MenuHandler = new ContextMenuNotification(this, !flags.HasFlag(NotificationFlags.DisableContextMenu)),
                LifeSpanHandler = new LifeSpanHandler()
            };

@ -112,7 +121,7 @@ public FormNotification(FormBrowser owner, PluginManager pluginManager, bool aut

            panelBrowser.Controls.Add(browser);

-            if (autoHide){
+            if (flags.HasFlag(NotificationFlags.AutoHide)){
                Program.UserConfig.MuteToggled += Config_MuteToggled;
                Disposed += (sender, args) => Program.UserConfig.MuteToggled -= Config_MuteToggled;
            }
@ -197,7 +206,7 @@ private void Browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
                    Initialized(this, new EventArgs());
                }
            }
-            else if (notificationJS != null && browser.Address != "about:blank"){
+            else if (notificationJS != null && browser.Address != "about:blank" && !flags.HasFlag(NotificationFlags.DisableScripts)){
                ScriptLoader.ExecuteScript(e.Frame, notificationJS, NotificationScriptIdentifier);

                if (plugins.HasAnyPlugin(PluginEnvironment.Notification)){
@ -242,10 +251,35 @@ public void ShowNotificationForSettings(bool reset){
                LoadTweet(TweetNotification.ExampleTweet);
            }
            else{
-                MoveToVisibleLocation();
+                PrepareAndDisplayWindow();
            }
        }

+        public void ShowNotificationForScreenshot(TweetNotification tweet, int width, int height, Action callback){
+            browser.RegisterAsyncJsObject("$TD_NotificationScreenshot", new CallbackBridge(this, callback));
+
+            browser.FrameLoadEnd += (sender, args) => {
+                if (args.Frame.IsMain){
+                    ScriptLoader.ExecuteScript(args.Frame, "window.setTimeout(() => $TD_NotificationScreenshot.trigger(), 25)", "gen:screenshot");
+                }
+            };
+
+            browser.LoadHtml(tweet.GenerateHtml(false), "http://tweetdeck.twitter.com/?"+DateTime.Now.Ticks);
+            
+            Location = new Point(-32000, -32000);
+            ClientSize = new Size(width, height);
+            progressBarTimer.Visible = false;
+            panelBrowser.Height = height;
+
+            // TODO start a timer on 10 seconds to close the window if anything fails or takes too long
+        }
+
+        public void TakeScreenshot(){
+            MoveToVisibleLocation();
+            Activate();
+            SendKeys.SendWait("%{PRTSC}");
+        }
+
        public void HideNotification(bool loadBlank){
            if (loadBlank || Program.UserConfig.NotificationLegacyLoad){
                browser.LoadHtml("", "about:blank");
@ -261,7 +295,7 @@ public void HideNotification(bool loadBlank){

        public void OnNotificationReady(){
            UpdateTitle();
-            MoveToVisibleLocation();
+            PrepareAndDisplayWindow();
            timerProgress.Start();
        }

@ -269,7 +303,7 @@ public void FinishCurrentTweet(){
            if (tweetQueue.Count > 0){
                LoadNextNotification();
            }
-            else if (autoHide){
+            else if (flags.HasFlag(NotificationFlags.AutoHide)){
                HideNotification(true);
            }
            else{
@ -299,21 +333,6 @@ private void LoadTweet(TweetNotification tweet){
        private void MoveToVisibleLocation(){
            UserConfig config = Program.UserConfig;

-            if (RequiresResize){
-                RequiresResize = false;
-
-                if (config.DisplayNotificationTimer){
-                    ClientSize = new Size(BaseClientWidth, BaseClientHeight+4);
-                    progressBarTimer.Visible = true;
-                }
-                else{
-                    ClientSize = new Size(BaseClientWidth, BaseClientHeight);
-                    progressBarTimer.Visible = false;
-                }
-
-                panelBrowser.Height = BaseClientHeight;
-            }
-            
            Screen screen = Screen.FromControl(owner);

            if (config.NotificationDisplay > 0 && config.NotificationDisplay <= Screen.AllScreens.Length){
@ -353,7 +372,25 @@ private void MoveToVisibleLocation(){
            if (needsReactivating){
                NativeMethods.SetFormPos(this, NativeMethods.HWND_TOPMOST, NativeMethods.SWP_NOACTIVATE);
            }
+        }

+        private void PrepareAndDisplayWindow(){
+            if (RequiresResize){
+                RequiresResize = false;
+
+                if (Program.UserConfig.DisplayNotificationTimer){
+                    ClientSize = new Size(BaseClientWidth, BaseClientHeight+4);
+                    progressBarTimer.Visible = true;
+                }
+                else{
+                    ClientSize = new Size(BaseClientWidth, BaseClientHeight);
+                    progressBarTimer.Visible = false;
+                }
+
+                panelBrowser.Height = BaseClientHeight;
+            }
+            
+            MoveToVisibleLocation();
            StartMouseHook();
        }

--- a/Core/Handling/ContextMenuBrowser.cs
+++ b/Core/Handling/ContextMenuBrowser.cs
@ -15,6 +15,7 @@ class ContextMenuBrowser : ContextMenuBase{
        private const int MenuCopyTweetUrl = 26611;
        private const int MenuOpenQuotedTweetUrl = 26612;
        private const int MenuCopyQuotedTweetUrl = 26613;
+        private const int MenuScreenshotTweet = 26614;

        private readonly FormBrowser form;

@ -45,6 +46,7 @@ public override void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser br
            if (!string.IsNullOrEmpty(lastHighlightedTweet) && (parameters.TypeFlags & (ContextMenuType.Editable | ContextMenuType.Selection)) == 0){
                model.AddItem((CefMenuCommand)MenuOpenTweetUrl, "Open tweet in browser");
                model.AddItem((CefMenuCommand)MenuCopyTweetUrl, "Copy tweet address");
+                model.AddItem((CefMenuCommand)MenuScreenshotTweet, "Screenshot tweet to clipboard");

                if (!string.IsNullOrEmpty(lastHighlightedQuotedTweet)){
                    model.AddSeparator();
@ -109,6 +111,10 @@ public override bool OnContextMenuCommand(IWebBrowser browserControl, IBrowser b
                    Clipboard.SetText(lastHighlightedTweet, TextDataFormat.UnicodeText);
                    return true;

+                case MenuScreenshotTweet:
+                    form.InvokeSafe(form.TriggerTweetScreenshot);
+                    return true;
+
                case MenuOpenQuotedTweetUrl:
                    BrowserUtils.OpenExternalBrowser(lastHighlightedQuotedTweet);
                    return true;
--- a/Core/Handling/TweetDeckBridge.cs
+++ b/Core/Handling/TweetDeckBridge.cs
@ -154,6 +154,10 @@ public void ClickUploadImage(int offsetX, int offsetY){
            });
        }

+        public void ScreenshotTweet(string html, int width, int height){
+            form.InvokeSafe(() => form.OnTweetScreenshotReady(html, width, height));
+        }
+
        public void OpenBrowser(string url){
            BrowserUtils.OpenExternalBrowser(url);
        }
--- a/Core/Handling/TweetNotification.cs
+++ b/Core/Handling/TweetNotification.cs
@ -99,16 +99,20 @@ public int GetDisplayDuration(int value){
            return 2000+Math.Max(1000, value*characters);
        }

-        public string GenerateHtml(){
+        public string GenerateHtml(bool enableCustomCSS = true){
            StringBuilder build = new StringBuilder();
            build.Append("<!DOCTYPE html>");
            build.Append("<html class='os-windows txt-base-").Append(FontSizeClass ?? DefaultFontSizeClass).Append("'>");
-            build.Append("<head>").Append(HeadTag ?? DefaultHeadTag).Append("<style type='text/css'>").Append(CustomCSS).Append("</style>");
+            build.Append("<head>").Append(HeadTag ?? DefaultHeadTag);
            
-            if (!string.IsNullOrEmpty(Program.UserConfig.CustomNotificationCSS)){
-                build.Append("<style type='text/css'>").Append(Program.UserConfig.CustomNotificationCSS).Append("</style>");
-            }
+            if (enableCustomCSS){
+                build.Append("<style type='text/css'>").Append(CustomCSS).Append("</style>");

+                if (!string.IsNullOrEmpty(Program.UserConfig.CustomNotificationCSS)){
+                    build.Append("<style type='text/css'>").Append(Program.UserConfig.CustomNotificationCSS).Append("</style>");
+                }
+            }
+            
            build.Append("</head>");
            build.Append("<body class='hearty'").Append(isExample ? " td-example-notification" : "").Append("><div class='app-columns-container'><div class='column scroll-styled-v' style='width:100%;overflow-y:auto'>");
            build.Append(html);
--- a/Core/Other/FormSettings.cs
+++ b/Core/Other/FormSettings.cs
@ -3,6 +3,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using TweetDck.Core.Other.Settings;
+using TweetDck.Core.Utils.Notification;
 using TweetDck.Plugins;
 using TweetDck.Updates;

@ -17,7 +18,7 @@ public FormSettings(FormBrowser browserForm, PluginManager plugins, UpdateHandle

            this.tabPanel.SetupTabPanel(100);
            this.tabPanel.AddButton("General", SelectTab<TabSettingsGeneral>);
-            this.tabPanel.AddButton("Notifications", () => SelectTab(() => new TabSettingsNotifications(browserForm.CreateNotificationForm(false))));
+            this.tabPanel.AddButton("Notifications", () => SelectTab(() => new TabSettingsNotifications(browserForm.CreateNotificationForm(NotificationFlags.DisableContextMenu))));
            this.tabPanel.AddButton("Updates", () => SelectTab(() => new TabSettingsUpdates(updates)));
            this.tabPanel.AddButton("Advanced", () => SelectTab(() => new TabSettingsAdvanced(browserForm.ReloadBrowser, plugins)));
            this.tabPanel.SelectTab(tabPanel.Buttons.First());
--- a/Core/Utils/Notification/CallbackBridge.cs
+++ b/Core/Utils/Notification/CallbackBridge.cs
@ -0,0 +1,19 @@
+using System;
+using System.Windows.Forms;
+using TweetDck.Core.Controls;
+
+namespace TweetDck.Core.Utils.Notification{
+    sealed class CallbackBridge{
+        private readonly Control owner;
+        private readonly Action safeCallback;
+
+        public CallbackBridge(Control owner, Action safeCallback){
+            this.owner = owner;
+            this.safeCallback = safeCallback;
+        }
+
+        public void Trigger(){
+            owner.InvokeSafe(safeCallback);
+        }
+    }
+}
--- a/Core/Utils/Notification/NotificationFlags.cs
+++ b/Core/Utils/Notification/NotificationFlags.cs
@ -0,0 +1,11 @@
+using System;
+
+namespace TweetDck.Core.Utils.Notification{
+    [Flags]
+    public enum NotificationFlags{
+        None = 0,
+        AutoHide = 1,
+        DisableScripts = 2,
+        DisableContextMenu = 4
+    }
+}
--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@

 The program was build using Visual Studio 2013. After opening the solution, make sure you have **CefSharp.WinForms** and **Microsoft.VC120.CRT.JetBrains** included - if not, download them using NuGet. For **CefSharp**, you will need version 53 or newer currently available as a pre-release.
 ```
-PM> Install-Package CefSharp.WinForms -Pre -Version 53.0.0-pre01
+PM> Install-Package CefSharp.WinForms -Version 53.0.1
 PM> Install-Package Microsoft.VC120.CRT.JetBrains
 ```

--- a/Resources/Scripts/code.js
+++ b/Resources/Scripts/code.js
@ -304,6 +304,30 @@
    });
  })();
  
+  //
+  // Block: Screenshot tweet to clipboard.
+  //
+  (function(){
+    var selectedTweet;
+    
+    app.delegate("article.js-stream-item", "contextmenu", function(){
+      selectedTweet = $(this);
+    });
+    
+    window.TDGF_triggerScreenshot = function(){
+      if (selectedTweet){
+        var realWidth = selectedTweet.width();
+        var realHeight = selectedTweet.height()-selectedTweet.find("footer").last().height();
+        
+        selectedTweet = selectedTweet.clone();
+        selectedTweet.children().first().addClass($(document.documentElement).attr("class"));
+        selectedTweet.find("footer").last().remove();
+        
+        $TD.screenshotTweet(selectedTweet.html(), realWidth, realHeight);
+      }
+    };
+  })();
+  
  //
  // Block: Paste images when tweeting.
  //
--- a/TweetDck.csproj
+++ b/TweetDck.csproj
@ -1,9 +1,7 @@
 <?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.53.0.0-pre01\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.53.0.0-pre01\build\CefSharp.WinForms.props')" />
-  <Import Project="packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.props')" />
-  <Import Project="packages\CefSharp.WinForms.49.0.0-pre02\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.49.0.0-pre02\build\CefSharp.WinForms.props')" />
-  <Import Project="packages\CefSharp.Common.49.0.0-pre02\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.49.0.0-pre02\build\CefSharp.Common.props')" />
+  <Import Project="packages\CefSharp.WinForms.53.0.1\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.53.0.1\build\CefSharp.WinForms.props')" />
+  <Import Project="packages\CefSharp.Common.53.0.1\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.53.0.1\build\CefSharp.Common.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -16,7 +14,7 @@
    <AssemblyName Condition=" '$(Configuration)' == 'Release' ">TweetDuck</AssemblyName>
    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>e83161d1</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>783c0e30</NuGetPackageImportStamp>
    <TargetFrameworkProfile>
    </TargetFrameworkProfile>
    <PublishUrl>publish\</PublishUrl>
@ -176,8 +174,10 @@
    <Compile Include="Core\Other\Settings\TabSettingsUpdates.Designer.cs">
      <DependentUpon>TabSettingsUpdates.cs</DependentUpon>
    </Compile>
+    <Compile Include="Core\Utils\Notification\CallbackBridge.cs" />
    <Compile Include="Core\Utils\CommandLineArgs.cs" />
    <Compile Include="Core\Utils\CommandLineArgsParser.cs" />
+    <Compile Include="Core\Utils\Notification\NotificationFlags.cs" />
    <Compile Include="Core\Utils\WindowState.cs" />
    <Compile Include="Core\Utils\WindowsUtils.cs" />
    <Compile Include="Core\Handling\TweetDeckBridge.cs" />
@ -305,12 +305,12 @@
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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.x86.3.2785.1478\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.2785.1478\build\cef.redist.x86.targets'))" />
-    <Error Condition="!Exists('packages\cef.redist.x64.3.2785.1478\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.2785.1478\build\cef.redist.x64.targets'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.targets'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.53.0.0-pre01\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.53.0.0-pre01\build\CefSharp.WinForms.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.53.0.0-pre01\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.53.0.0-pre01\build\CefSharp.WinForms.targets'))" />
+    <Error Condition="!Exists('packages\cef.redist.x86.3.2785.1486\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.2785.1486\build\cef.redist.x86.targets'))" />
+    <Error Condition="!Exists('packages\cef.redist.x64.3.2785.1486\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.2785.1486\build\cef.redist.x64.targets'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.53.0.1\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.53.0.1\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.53.0.1\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.53.0.1\build\CefSharp.Common.targets'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.53.0.1\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.53.0.1\build\CefSharp.WinForms.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.53.0.1\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.53.0.1\build\CefSharp.WinForms.targets'))" />
  </Target>
  <PropertyGroup>
    <PostBuildEvent>del "$(TargetPath).config"
@ -331,10 +331,10 @@ xcopy "$(ProjectDir)Resources\Plugins\*" "$(TargetDir)plugins\official\" /E /Y
 rmdir "$(ProjectDir)\bin\Debug"
 rmdir "$(ProjectDir)\bin\Release"</PostBuildEvent>
  </PropertyGroup>
-  <Import Project="packages\cef.redist.x86.3.2785.1478\build\cef.redist.x86.targets" Condition="Exists('packages\cef.redist.x86.3.2785.1478\build\cef.redist.x86.targets')" />
-  <Import Project="packages\cef.redist.x64.3.2785.1478\build\cef.redist.x64.targets" Condition="Exists('packages\cef.redist.x64.3.2785.1478\build\cef.redist.x64.targets')" />
-  <Import Project="packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.targets')" />
-  <Import Project="packages\CefSharp.WinForms.53.0.0-pre01\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.53.0.0-pre01\build\CefSharp.WinForms.targets')" />
+  <Import Project="packages\cef.redist.x86.3.2785.1486\build\cef.redist.x86.targets" Condition="Exists('packages\cef.redist.x86.3.2785.1486\build\cef.redist.x86.targets')" />
+  <Import Project="packages\cef.redist.x64.3.2785.1486\build\cef.redist.x64.targets" Condition="Exists('packages\cef.redist.x64.3.2785.1486\build\cef.redist.x64.targets')" />
+  <Import Project="packages\CefSharp.Common.53.0.1\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.53.0.1\build\CefSharp.Common.targets')" />
+  <Import Project="packages\CefSharp.WinForms.53.0.1\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.53.0.1\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">