diff --git a/CefSharp.props b/CefSharp.props index f87b790e2..ae59e04c6 100644 --- a/CefSharp.props +++ b/CefSharp.props @@ -2,16 +2,13 @@ - 2019 - 2022 + 2022 + 2026 - v142 - v143 + v143 + v145 - 10.0 - - diff --git a/build.ps1 b/build.ps1 index 1c3f75e49..0eac0783b 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,7 +1,7 @@ #requires -Version 5 param( - [ValidateSet("vs2022","vs2019", "nupkg-only", "update-build-version")] + [ValidateSet("vs2022","vs2026", "nupkg-only", "update-build-version")] [Parameter(Position = 0)] [string] $Target = "vs2022", [Parameter(Position = 1)] @@ -80,7 +80,7 @@ function Warn function BuildSolution { param( - [ValidateSet('v142','v143')] + [ValidateSet('v145','v143')] [Parameter(Position = 0, ValueFromPipeline = $true)] [string] $Toolchain, @@ -153,7 +153,7 @@ function BuildSolution function VSX { param( - [ValidateSet('v142','v143')] + [ValidateSet('v143','v145')] [Parameter(Position = 0, ValueFromPipeline = $true)] [string] $Toolchain ) @@ -168,10 +168,11 @@ function VSX switch -Exact ($Toolchain) { - 'v142' + 'v145' { - $VS_VER = 16; - $VS_OFFICIAL_VER = 2019; + $VS_VER = 18; + $VS_OFFICIAL_VER = 2026; + $VS_PRE = "-prerelease"; } 'v143' { @@ -537,7 +538,7 @@ if(-not (Test-Path $VSWherePath)) $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 VS2017/VS2019 +#Check if we already have vswhere which is included in newer versions of VS2022 if(-not (Test-Path $VSWherePath)) { Write-Diagnostic "Downloading VSWhere as no install found at $VSWherePath" @@ -577,9 +578,9 @@ switch -Exact ($Target) { Nupkg $NupkgFiles } - "vs2019" + "vs2026" { - VSX v142 + VSX v145 Nupkg $NupkgFiles } "vs2022"