diff --git a/NuGet/cef.sdk.props b/NuGet/cef.sdk.props index ebe59a6..7f412a8 100644 --- a/NuGet/cef.sdk.props +++ b/NuGet/cef.sdk.props @@ -1,6 +1,6 @@ - cef.sdk.121.2.14 + cef.sdk.138.0.15 diff --git a/NuGet/chromiumembeddedframework.runtime.json b/NuGet/chromiumembeddedframework.runtime.json index f16b7e4..9dc32d3 100644 --- a/NuGet/chromiumembeddedframework.runtime.json +++ b/NuGet/chromiumembeddedframework.runtime.json @@ -2,17 +2,17 @@ "runtimes": { "win-x64": { "chromiumembeddedframework.runtime": { - "chromiumembeddedframework.runtime.win-x64": "132.3.1" + "chromiumembeddedframework.runtime.win-x64": "138.0.15" } }, "win-x86": { "chromiumembeddedframework.runtime": { - "chromiumembeddedframework.runtime.win-x86": "132.3.1" + "chromiumembeddedframework.runtime.win-x86": "138.0.15" } }, "win-arm64": { "chromiumembeddedframework.runtime": { - "chromiumembeddedframework.runtime.win-arm64": "132.3.1" + "chromiumembeddedframework.runtime.win-arm64": "138.0.15" } }, } diff --git a/appveyor.yml b/appveyor.yml index dd3d487..319342b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ -image: Visual Studio 2019 +image: Visual Studio 2022 -version: 93.0.1-CI{build} +version: 138.0.15-CI{build} shallow_clone: true diff --git a/build.ps1 b/build.ps1 index 37e8c40..f8d58a0 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,7 +1,7 @@ #requires -Version 5 param( - [ValidateSet("vs2019", "vs2022", "nupkg", "nupkg-only")] + [ValidateSet("vs2022", "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 = "132.3.1+g144febe+chromium-132.0.6834.83", + $CefVersion = "138.0.15+gd0f1f64+chromium-138.0.7204.50", [ValidateSet("tar.bz2","zip","7z")] [Parameter(Position = 4)] @@ -136,7 +136,7 @@ function DownloadDependencies() $global:VSWherePath = Join-Path ${env:ProgramFiles(x86)} 'Microsoft Visual Studio\Installer\vswhere.exe' } - #Check if we already have vswhere which is included in newer versions of VS2019/VS2022 + #Check if we already have vswhere which is included in newer versions of VS2022 if(-not (Test-Path $global:VSwherePath)) { Write-Diagnostic "Downloading VSWhere as no install found at $global:VSwherePath" @@ -202,10 +202,8 @@ function Bootstrap mkdir "cef\$arch" | Out-Null mkdir "cef\$arch\debug" | Out-Null - mkdir "cef\$arch\debug\VS2019" | Out-Null mkdir "cef\$arch\debug\VS2022" | Out-Null mkdir "cef\$arch\release" | Out-Null - mkdir "cef\$arch\release\VS2019" | Out-Null mkdir "cef\$arch\release\VS2022" | Out-Null } @@ -405,17 +403,12 @@ function CreateCefSdk Write-Diagnostic "Creating sdk for $Toolchain" - $VisualStudioVersion = "VS2019" - - if($Toolchain -eq "v143") - { - $VisualStudioVersion = "VS2022" - } + $VisualStudioVersion = "VS2022" $CefArchDir = $Platform.Folder $Arch = $Platform.NativeArch; - # cef_binary_3.y.z_windows32\out\debug\lib -> cef\win32\debug\vs2019 + # cef_binary_3.y.z_windows32\out\debug\lib -> cef\win32\debug\vs2022 Copy-Item $CefArchDir\libcef_dll_wrapper\$Configuration\libcef_dll_wrapper.lib $CefWorkingFolder\$Arch\$Configuration\$VisualStudioVersion | Out-Null Copy-Item $CefArchDir\libcef_dll_wrapper\$Configuration\libcef_dll_wrapper.pdb $CefWorkingFolder\$Arch\$Configuration\$VisualStudioVersion | Out-Null @@ -746,16 +739,12 @@ try { "nupkg" { - VSX v142 $platform + VSX v143 $platform } "vs2022" { VSX v143 $platform } - "vs2019" - { - VSX v142 $platform - } } }