QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-27 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

dotnet-core workflow: switch to VS2026

Browse Source 
On the current Windows images, it looks like VS2026 is in
Microsoft Visual Studio\18

Also, for ARM64, use the documented amd64_arm64 environment
This commit is contained in:
Frank Denis
2026-08-26 18:54:30 +02:00
parent 2d59e49ca0
commit ec3769f4ed
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/dotnet-core.yml
+5 -5
View File
@@ -13,25 +13,25 @@ permissions:
jobs:
build-windows-msvc:
runs-on: windows-2022
runs-on: windows-latest
steps:
- uses: actions/checkout@v6
- name: buildbase.bat
run: buildbase.bat ..\vs2022\libsodium.sln 17
run: buildbase.bat ..\vs2026\libsodium.sln 18
working-directory: builds/msvc/build/
shell: cmd
- uses: actions/upload-artifact@v7
with:
name: build-win-x64
path: bin/x64/Release/v143/dynamic/libsodium.dll
path: bin/x64/Release/v145/dynamic/libsodium.dll
- uses: actions/upload-artifact@v7
with:
name: build-win-x86
path: bin/Win32/Release/v143/dynamic/libsodium.dll
path: bin/Win32/Release/v145/dynamic/libsodium.dll
- uses: actions/upload-artifact@v7
with:
name: build-win-arm64
path: bin/ARM64/Release/v143/dynamic/libsodium.dll
path: bin/ARM64/Release/v145/dynamic/libsodium.dll
build-others:
runs-on: ubuntu-latest
builds/msvc/build/buildbase.bat
+6 -8
View File
@@ -9,12 +9,12 @@ SET log=build_%version%.log
SET tools=Microsoft Visual Studio %version%.0\VC\vcvarsall.bat
IF %version% == 18 (
SET tools=Microsoft Visual Studio\2026\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
SET tools=Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
SET environment="%programfiles%\!tools!"
IF NOT EXIST !environment! (
SET environment="%programfiles(x86)%\!tools!"
IF NOT EXIST !environment! (
SET tools=Microsoft Visual Studio\2026\Community\VC\Auxiliary\Build\vcvarsall.bat
SET tools=Microsoft Visual Studio\18\Community\VC\Auxiliary\Build\vcvarsall.bat
)
)
)
@@ -112,7 +112,7 @@ IF %version% GEQ 16 (
ENDLOCAL & SET solution=%solution% & SET version=%version% & SET log=%log% & SET tools=%tools% & SET environment=%environment%
SETLOCAL enabledelayedexpansion
CALL !environment! ARM64 > nul 2>&1
CALL !environment! amd64_arm64 > nul 2>&1
ECHO Platform=ARM64
ECHO Configuration=DynDebug
@@ -136,7 +136,7 @@ IF %version% GEQ 16 (
)
ECHO Complete: %solution%
GOTO end
EXIT /B 0
:error
ECHO *** ERROR, build terminated early, see: %log%
@@ -144,10 +144,8 @@ ECHO.
ECHO === Last errors from %log% ===
findstr /i /c:"error " /c:"error:" /c:"fatal error" %log%
ECHO.
GOTO end
EXIT /B 1
:no_tools
ECHO *** ERROR, build tools not found: !tools!
:end
EXIT /B 1