From bfc21ae6513e9f3ac46c5baf41f20fcee080552b Mon Sep 17 00:00:00 2001 From: Diego Gutierrez Yepiz Date: Mon, 20 Nov 2017 14:26:55 -0800 Subject: [PATCH 1/3] upgrade to 62 --- NuGet/cef.sdk.props | 2 +- README.txt | 4 ++-- appveyor.yml | 2 +- build.ps1 | 28 ++++++++++++++++++++++------ 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/NuGet/cef.sdk.props b/NuGet/cef.sdk.props index cb46ef9..b7940bc 100644 --- a/NuGet/cef.sdk.props +++ b/NuGet/cef.sdk.props @@ -1,6 +1,6 @@ - cef.sdk.3.2785.1486 + cef.sdk.3.3202.1686 diff --git a/README.txt b/README.txt index 846c82a..0f725af 100644 --- a/README.txt +++ b/README.txt @@ -3,11 +3,11 @@ Chromium Embedded Framework (CEF) Standard Binary Distribution for Windows Date: August 18, 2016 -CEF Version: 3.2743.1447.g37d988b +CEF Version: 3.3202.1686.gd665578 CEF URL: https://bitbucket.org/chromiumembedded/cef.git @37d988bda8bdff39f538ace426040faab1599b58 -Chromium Verison: 52.0.2743.116 +Chromium Verison: 62.0.3202.94 Chromium URL: https://chromium.googlesource.com/chromium/src.git @feb0ea45a0164eef52aa2631dd95d7c85fa65faa diff --git a/appveyor.yml b/appveyor.yml index 1679c29..d0bd34f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ environment: VisualStudioVersion: 12.0 -version: 57.0.0-CI{build} +version: 62.0.0-CI{build} shallow_clone: true diff --git a/build.ps1 b/build.ps1 index 8b0fd77..07ca00c 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,7 +1,7 @@ #requires -Version 3 param( - [ValidateSet("vs2012", "vs2013", "vs2015", "nupkg", "nupkg-only")] + [ValidateSet("vs2012", "vs2013", "vs2015", "vs2017", "nupkg", "nupkg-only")] [Parameter(Position = 0)] [string] $Target = "nupkg", @@ -14,7 +14,7 @@ param( [string] $CefBinaryDir = "../cefsource/chromium/src/cef/binary_distrib/", [Parameter(Position = 3)] - $CefVersion = "3.3112.1657.g2c22842" + $CefVersion = "3.3202.1686.gd665578" ) $WorkingDir = split-path -parent $MyInvocation.MyCommand.Definition @@ -165,7 +165,7 @@ function Bootstrap function Msvs { param( - [ValidateSet('v110', 'v120', 'v140')] + [ValidateSet('v110', 'v120', 'v140', 'v141')] [Parameter(Position = 0, ValueFromPipeline = $true)] [string] $Toolchain, @@ -204,6 +204,12 @@ function Msvs $VXXCommonTools = Join-Path $env:VS140COMNTOOLS '..\..\vc' $CmakeGenerator = 'Visual Studio 14' } + 'v141' { + $PlatformTarget = '4.0' + $VisualStudioVersion = '15.0' + $VXXCommonTools = Join-Path $env:VS141COMNTOOLS '..\..\vc' + $CmakeGenerator = 'Visual Studio 15' + } } if ($VXXCommonTools -eq $null -or (-not (Test-Path($VXXCommonTools)))) { @@ -282,7 +288,7 @@ function Msvs function VSX { param( - [ValidateSet('v110', 'v120', 'v140')] + [ValidateSet('v110', 'v120', 'v140', 'v141')] [Parameter(Position = 0, ValueFromPipeline = $true)] [string] $Toolchain ) @@ -302,6 +308,11 @@ function VSX 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" 'Debug' 'x86' @@ -315,7 +326,7 @@ function VSX function CreateCefSdk { param( - [ValidateSet('v110', 'v120', 'v140')] + [ValidateSet('v110', 'v120', 'v140', 'v141')] [Parameter(Position = 0, ValueFromPipeline = $true)] [string] $Toolchain, @@ -331,7 +342,9 @@ function CreateCefSdk Write-Diagnostic "Creating sdk for $Toolchain" $VisualStudioVersion = $null - if($Toolchain -eq "v140") { + if($Toolchain -eq "v141") { + $VisualStudioVersion = "VS2017" + } elseif($Toolchain -eq "v140") { $VisualStudioVersion = "VS2015" } elseif($Toolchain -eq "v110") { $VisualStudioVersion = "VS2012" @@ -586,4 +599,7 @@ switch -Exact ($Target) { "vs2015" { VSX v140 } + "vs2017" { + VSX v141 + } } From d880acc3ebbe655c0bfb3efa0f83b875ffd422bb Mon Sep 17 00:00:00 2001 From: Diego Gutierrez Yepiz Date: Mon, 20 Nov 2017 16:46:02 -0800 Subject: [PATCH 2/3] upgradeTo62 --- NuGet/cef.sdk.props | 2 +- README.txt | 4 ++-- appveyor.yml | 2 +- build.ps1 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet/cef.sdk.props b/NuGet/cef.sdk.props index cb46ef9..b7940bc 100644 --- a/NuGet/cef.sdk.props +++ b/NuGet/cef.sdk.props @@ -1,6 +1,6 @@ - cef.sdk.3.2785.1486 + cef.sdk.3.3202.1686 diff --git a/README.txt b/README.txt index 846c82a..0f725af 100644 --- a/README.txt +++ b/README.txt @@ -3,11 +3,11 @@ Chromium Embedded Framework (CEF) Standard Binary Distribution for Windows Date: August 18, 2016 -CEF Version: 3.2743.1447.g37d988b +CEF Version: 3.3202.1686.gd665578 CEF URL: https://bitbucket.org/chromiumembedded/cef.git @37d988bda8bdff39f538ace426040faab1599b58 -Chromium Verison: 52.0.2743.116 +Chromium Verison: 62.0.3202.94 Chromium URL: https://chromium.googlesource.com/chromium/src.git @feb0ea45a0164eef52aa2631dd95d7c85fa65faa diff --git a/appveyor.yml b/appveyor.yml index 1679c29..d0bd34f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ environment: VisualStudioVersion: 12.0 -version: 57.0.0-CI{build} +version: 62.0.0-CI{build} shallow_clone: true diff --git a/build.ps1 b/build.ps1 index 8b0fd77..cf7f536 100644 --- a/build.ps1 +++ b/build.ps1 @@ -14,7 +14,7 @@ param( [string] $CefBinaryDir = "../cefsource/chromium/src/cef/binary_distrib/", [Parameter(Position = 3)] - $CefVersion = "3.3112.1657.g2c22842" + $CefVersion = "3.3202.1686.gd665578" ) $WorkingDir = split-path -parent $MyInvocation.MyCommand.Definition From c447962fa8efa3aecb1180ba4d5e058b1b30c364 Mon Sep 17 00:00:00 2001 From: Diego Gutierrez Yepiz Date: Mon, 20 Nov 2017 16:50:15 -0800 Subject: [PATCH 3/3] remove VS2017 --- build.ps1 | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/build.ps1 b/build.ps1 index 07ca00c..cf7f536 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,7 +1,7 @@ #requires -Version 3 param( - [ValidateSet("vs2012", "vs2013", "vs2015", "vs2017", "nupkg", "nupkg-only")] + [ValidateSet("vs2012", "vs2013", "vs2015", "nupkg", "nupkg-only")] [Parameter(Position = 0)] [string] $Target = "nupkg", @@ -165,7 +165,7 @@ function Bootstrap function Msvs { param( - [ValidateSet('v110', 'v120', 'v140', 'v141')] + [ValidateSet('v110', 'v120', 'v140')] [Parameter(Position = 0, ValueFromPipeline = $true)] [string] $Toolchain, @@ -204,12 +204,6 @@ function Msvs $VXXCommonTools = Join-Path $env:VS140COMNTOOLS '..\..\vc' $CmakeGenerator = 'Visual Studio 14' } - 'v141' { - $PlatformTarget = '4.0' - $VisualStudioVersion = '15.0' - $VXXCommonTools = Join-Path $env:VS141COMNTOOLS '..\..\vc' - $CmakeGenerator = 'Visual Studio 15' - } } if ($VXXCommonTools -eq $null -or (-not (Test-Path($VXXCommonTools)))) { @@ -288,7 +282,7 @@ function Msvs function VSX { param( - [ValidateSet('v110', 'v120', 'v140', 'v141')] + [ValidateSet('v110', 'v120', 'v140')] [Parameter(Position = 0, ValueFromPipeline = $true)] [string] $Toolchain ) @@ -308,11 +302,6 @@ function VSX 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" 'Debug' 'x86' @@ -326,7 +315,7 @@ function VSX function CreateCefSdk { param( - [ValidateSet('v110', 'v120', 'v140', 'v141')] + [ValidateSet('v110', 'v120', 'v140')] [Parameter(Position = 0, ValueFromPipeline = $true)] [string] $Toolchain, @@ -342,9 +331,7 @@ function CreateCefSdk Write-Diagnostic "Creating sdk for $Toolchain" $VisualStudioVersion = $null - if($Toolchain -eq "v141") { - $VisualStudioVersion = "VS2017" - } elseif($Toolchain -eq "v140") { + if($Toolchain -eq "v140") { $VisualStudioVersion = "VS2015" } elseif($Toolchain -eq "v110") { $VisualStudioVersion = "VS2012" @@ -599,7 +586,4 @@ switch -Exact ($Target) { "vs2015" { VSX v140 } - "vs2017" { - VSX v141 - } }