Merge branch 'master' into message-interceptor-fix

merceyz · web-flow · commit 4f67c2acefe8 · 2019-02-22T13:18:52.000+01:00
diff --git a/NuGet/CefSharp.Common.props b/NuGet/CefSharp.Common.props
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CefSharpCommonBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
+    <CefSharpCommonBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
+    <CefSharpCommonBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
+  </ItemGroup>
+  
   <Choose>
     <When Condition="'$(Platform)' == 'x64'">
       <ItemGroup>
diff --git a/NuGet/CefSharp.Common.targets b/NuGet/CefSharp.Common.targets
@@ -8,12 +8,6 @@
     <Error Text="CefSharp requires .Net 4.5.2 or higher" />
   </Target>
 
-  <ItemGroup>
-    <CefSharpCommonBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
-    <CefSharpCommonBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
-    <CefSharpCommonBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
-  </ItemGroup>
-
   <PropertyGroup>
     <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' "></CefSharpTargetDir>
   </PropertyGroup>
diff --git a/NuGet/CefSharp.OffScreen.props b/NuGet/CefSharp.OffScreen.props
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CefSharpOffScreenBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
+    <CefSharpOffScreenBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
+    <!-- Not currently used, might come in handy for someone though as it contains all x86 and x64 files -->
+    <CefSharpOffscreenBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
+  </ItemGroup>
+  
   <Choose>
     <When Condition="'$(Platform)' == 'x64'">
       <ItemGroup>
diff --git a/NuGet/CefSharp.OffScreen.targets b/NuGet/CefSharp.OffScreen.targets
@@ -4,13 +4,6 @@
     <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' "></CefSharpTargetDir>
   </PropertyGroup>
 
-  <ItemGroup>
-    <CefSharpOffScreenBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
-    <CefSharpOffScreenBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
-    <!-- Not currently used, might come in handy for someone though as it contains all x86 and x64 files -->
-    <CefSharpOffscreenBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
-  </ItemGroup>
-
   <!--
     These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the
     correct ordering .props imports, which we require as this depends on the cef.redist packages
diff --git a/NuGet/CefSharp.WinForms.props b/NuGet/CefSharp.WinForms.props
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CefSharpWinFormsBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
+    <CefSharpWinFormsBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
+    <!-- Not currently used, might come in handy for someone though as it contains all x86 and x64 files -->
+    <CefSharpWinFormsBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
+  </ItemGroup>
+  
   <Choose>
     <When Condition="'$(Platform)' == 'x64'">
       <ItemGroup>
diff --git a/NuGet/CefSharp.WinForms.targets b/NuGet/CefSharp.WinForms.targets
@@ -4,13 +4,6 @@
     <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' "></CefSharpTargetDir>
   </PropertyGroup>
 
-  <ItemGroup>
-    <CefSharpWinFormsBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
-    <CefSharpWinFormsBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
-    <!-- Not currently used, might come in handy for someone though as it contains all x86 and x64 files -->
-    <CefSharpWinFormsBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
-  </ItemGroup>
-
   <!--
     These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the
     correct ordering .props imports, which we require as this depends on the cef.redist packages
diff --git a/NuGet/CefSharp.Wpf.props b/NuGet/CefSharp.Wpf.props
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <CefSharpWpfBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
+    <CefSharpWpfBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
+    <!-- Not currently used, might come in handy for someone though as it contains all x86 and x64 files -->
+    <CefSharpWpfBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
+  </ItemGroup>
+  
   <Choose>
     <When Condition="'$(Platform)' == 'x64'">
       <ItemGroup>
diff --git a/NuGet/CefSharp.Wpf.targets b/NuGet/CefSharp.Wpf.targets
@@ -4,13 +4,6 @@
     <CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' "></CefSharpTargetDir>
   </PropertyGroup>
 
-  <ItemGroup>
-    <CefSharpWpfBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
-    <CefSharpWpfBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
-    <!-- Not currently used, might come in handy for someone though as it contains all x86 and x64 files -->
-    <CefSharpWpfBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
-  </ItemGroup>
-
   <!--
     These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the
     correct ordering .props imports, which we require as this depends on the cef.redist packages
diff --git a/README.md b/README.md
@@ -118,3 +118,4 @@ Now that I (@amaitland) am a stay at home dad your contributions are the only re
 
 - [HtmlView](https://github.com/MISoftware/HtmlView) : Visual Studio extension bringing CefSharp for showing HTML pages inside VS.
 - [Chromely](https://github.com/mattkol/Chromely) : Build .NET/.NET Core HTML5 desktop apps using cross-platform native GUI API.
+- [SharpBrowser](https://github.com/sharpbrowser/SharpBrowser) : The fastest web browser for C# with tabbed browsing and HTML5/CSS3.
diff --git a/appveyor.yml b/appveyor.yml
@@ -27,7 +27,7 @@ deploy:
   provider: NuGet
   server: https://www.myget.org/F/cefsharp/api/v2/package
   api_key:
-    secure: j19WwX8uoo5NZSTcOgpzkPGS17NyoSBwu3CpRxzdslTgjnzcBlDC2Dzw+aEX41+M
+    secure: q//EEhpYkeC7JaxBiK6ebPFiF3ixBi62pNWk0p7UIh8o/7Tm25DvbZPOoKf9dwsY
   skip_symbols: false
   symbol_server: https://www.myget.org/F/cefsharp/api/v2/package
   artifact: nupkgfiles
diff --git a/build.ps1 b/build.ps1
@@ -135,6 +135,10 @@ function Msvs
 
     switch -Exact ($Toolchain) {
         'v140' {
+            if($env:VS140COMNTOOLS -eq $null) {
+                Die "Visual Studio 2015 is not installed on your development machine, unable to continue."
+            }
+
             $MSBuildExe = join-path -path (Get-ItemProperty "HKLM:\software\Microsoft\MSBuild\ToolsVersions\14.0").MSBuildToolsPath -childpath "msbuild.exe"
             $MSBuildExe = $MSBuildExe -replace "Framework64", "Framework"
             $VisualStudioVersion = '14.0'
@@ -168,7 +172,7 @@ function Msvs
                 
             if(-not (Test-Path $VS2017InstallPath))
             {
-                Die "Visual Studio 2017 was not found"
+                Die "Visual Studio 2017 is not installed on your development machine, unable to continue."
             }
                 
             $MSBuildExe = "msbuild.exe"
@@ -243,16 +247,6 @@ function VSX
         [string] $Toolchain
     )
 
-    if($Toolchain -eq 'v140' -and $env:VS140COMNTOOLS -eq $null) {
-        Warn "Toolchain $Toolchain is not installed on your development machine, skipping build."
-        Return
-    }
-
-    if($Toolchain -eq 'v141' -and $env:VS141COMNTOOLS -eq $null) {
-        Warn "Toolchain $Toolchain is not installed on your development machine, skipping build."
-        Return
-    }
-
     Write-Diagnostic "Starting to build targeting toolchain $Toolchain"
 
     Msvs "$Toolchain" 'Release' 'x86'

Original file line number	Diff line number	Diff line change
`@@ -118,3 +118,4 @@ Now that I (@amaitland) am a stay at home dad your contributions are the only re`
`118`	`118`
`119`	`119`	`- [HtmlView](https://github.com/MISoftware/HtmlView) : Visual Studio extension bringing CefSharp for showing HTML pages inside VS.`
`120`	`120`	`- [Chromely](https://github.com/mattkol/Chromely) : Build .NET/.NET Core HTML5 desktop apps using cross-platform native GUI API.`
	`121`	`+- [SharpBrowser](https://github.com/sharpbrowser/SharpBrowser) : The fastest web browser for C# with tabbed browsing and HTML5/CSS3.`