update to cefsharp 71 and .net 4.6

hiiter · Feb 22, 2019 · cc50edf · cc50edf
1 parent 951a599
commit cc50edf
Show file tree

Hide file tree

Showing 97 changed files with 13,851 additions and 96 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,285 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+bld/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
diff --git a/src/App.config b/src/App.config
@@ -7,4 +7,4 @@
     <add key="torDefaultConfigurationFile" value=""/>
     <add key="torPath" value="Tor\Tor\tor.exe"/>
   </appSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
diff --git a/src/Handlers/ContextMenuHandler.cs b/src/Handlers/ContextMenuHandler.cs
@@ -27,7 +27,7 @@ public ContextMenuHandler(MainForm form) {
 		}
 
 		public void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model) {
-			
+
 			// clear the menu
 			model.Clear();
 
@@ -49,7 +49,7 @@ public void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IF
 			}
 
 			if (parameters.HasImageContents && parameters.SourceUrl.CheckIfValid()) {
-				
+
 				// RIGHT CLICKED ON IMAGE
 
 			}
@@ -95,12 +95,12 @@ public bool OnContextMenuCommand(IWebBrowser browserControl, IBrowser browser, I
 				Clipboard.SetText(parameters.LinkUrl);
 			}
 			if (id == CloseTab) {
-				myForm.InvokeOnParent(delegate() {
+				myForm.InvokeOnParent(delegate () {
 					myForm.CloseActiveTab();
 				});
 			}
 			if (id == RefreshTab) {
-				myForm.InvokeOnParent(delegate() {
+				myForm.InvokeOnParent(delegate () {
 					myForm.RefreshActiveTab();
 				});
 			}
@@ -118,4 +118,4 @@ public bool RunContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame
 			return false;
 		}
 	}
-}
+}
diff --git a/src/Handlers/DownloadHandler.cs b/src/Handlers/DownloadHandler.cs
@@ -1,23 +1,18 @@
 using CefSharp;
 
 namespace SharpBrowser {
-    internal class DownloadHandler : IDownloadHandler
-    {
-        MainForm myForm;
+	internal class DownloadHandler : IDownloadHandler {
+		MainForm myForm;
 
-        public DownloadHandler(MainForm form)
-        {
-            myForm = form;
-        }
+		public DownloadHandler(MainForm form) {
+			myForm = form;
+		}
 
-        public void OnBeforeDownload(IBrowser browser, DownloadItem item, IBeforeDownloadCallback callback)
-        {
-            if (!callback.IsDisposed)
-            {
-                using (callback)
-                {
+		public void OnBeforeDownload(IWebBrowser webBrowser, IBrowser browser, DownloadItem item, IBeforeDownloadCallback callback) {
+			if (!callback.IsDisposed) {
+				using (callback) {
 
-                    myForm.UpdateDownloadItem(item);
+					myForm.UpdateDownloadItem(item);
 
 					// ask browser what path it wants to save the file into
 					string path = myForm.CalcDownloadPath(item);
@@ -38,17 +33,16 @@ public void OnBeforeDownload(IBrowser browser, DownloadItem item, IBeforeDownloa
 
 					}
 
-                }
-            }
-        }
+				}
+			}
+		}
 
-        public void OnDownloadUpdated(IBrowser browser, DownloadItem downloadItem, IDownloadItemCallback callback)
-        {
-            myForm.UpdateDownloadItem(downloadItem);
+		public void OnDownloadUpdated(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IDownloadItemCallback callback) {
+			myForm.UpdateDownloadItem(downloadItem);
 			if (downloadItem.IsInProgress && myForm.CancelRequests.Contains(downloadItem.Id)) {
 				callback.Cancel();
 			}
-            //Console.WriteLine(downloadItem.Url + " %" + downloadItem.PercentComplete + " complete");
-        }
-    }
-}
+			//Console.WriteLine(downloadItem.Url + " %" + downloadItem.PercentComplete + " complete");
+		}
+	}
+}