mirror of
https://github.com/jedisct1/libsodium.git
synced 2026-08-27 12:17:12 +09:00
Visual Studio 2019 craps out with aarch64, restore need for 2022+
This commit is contained in:
+1
-1
@@ -46,7 +46,7 @@ jobs:
|
||||
vmImage: "windows-2022"
|
||||
steps:
|
||||
- powershell: |
|
||||
choco install visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --add Microsoft.VisualStudio.Component.VC.Tools.ARM64 --quiet --wait" -y
|
||||
choco install visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --quiet --wait" -y
|
||||
displayName: Install VS2019 Build Tools
|
||||
- powershell: |
|
||||
cd builds\msvc\build
|
||||
|
||||
@@ -12,7 +12,7 @@ IF NOT EXIST !vswhere! SET vswhere="%ProgramFiles%\Microsoft Visual Studio\Insta
|
||||
SET /A next_version=version + 1
|
||||
SET version_range=[%version%.0,!next_version!.0)
|
||||
SET required_components=Microsoft.VisualStudio.Component.VC.Tools.x86.x64
|
||||
IF %version% GEQ 16 SET required_components=!required_components! Microsoft.VisualStudio.Component.VC.Tools.ARM64
|
||||
IF %version% GEQ 17 SET required_components=!required_components! Microsoft.VisualStudio.Component.VC.Tools.ARM64
|
||||
|
||||
IF %version% GEQ 15 (
|
||||
IF EXIST !vswhere! (
|
||||
@@ -79,8 +79,8 @@ ECHO Configuration=StaticRelease
|
||||
msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=x64 %solution% >> %log%
|
||||
IF errorlevel 1 GOTO error
|
||||
|
||||
@REM Build ARM64 packages only for Visual studio 2019 and later
|
||||
IF %version% GEQ 16 (
|
||||
@REM Build ARM64 packages only for Visual Studio 2022 and later
|
||||
IF %version% GEQ 17 (
|
||||
ENDLOCAL & SET solution=%solution% & SET version=%version% & SET log=%log% & SET environment=%environment%
|
||||
SETLOCAL enabledelayedexpansion
|
||||
|
||||
|
||||
Reference in New Issue
Block a user