Skip to content

Fix nuget config override option, set default warp version to 1.0.15 #7825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+15 −14
Open

Fix nuget config override option, set default warp version to 1.0.15 #7825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64a77f5
fix override option, set default to 1.0.15
bob80905 Oct 15, 2025
f279b74
don't destroy capacity to specify -Config with nuget-config, add new …
bob80905 Oct 15, 2025
ddd60b8
simplify logic
bob80905 Oct 15, 2025
928335b
update to newest good version
bob80905 Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ stages:
submodules: true
- script: |
call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
call utils\hct\hctbuild.cmd -$(platform) -$(configuration) -show-cmake-log -spirvtest
call utils\hct\hctbuild.cmd -$(platform) -$(configuration) -show-cmake-log -spirvtest -warp-nuget-version 1.0.16.1
displayName: 'Building'
- script: |
call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
Expand Down
13 changes: 4 additions & 9 deletions tools/clang/test/taef_exec/DownloadWarp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,12 @@ if(NOT NUGET_EXE)
endif()
endif()

# Install the WARP nuget package.

# NUGET_WARP_EXTRA_ARGS gets passed as a single command-line argument. In cmake,
# lists are items separated by semicolons, so these will become separate
# arguments.
if(NUGET_WARP_EXTRA_ARGS)
string(REPLACE " " ";" NUGET_WARP_EXTRA_ARGS_LIST ${NUGET_WARP_EXTRA_ARGS})
endif()
# Install the WARP nuget package.
separate_arguments(NUGET_WARP_EXTRA_ARGS)
message("Running ${NUGET_EXE} install -ForceEnglishOutput Microsoft.Direct3D.WARP -OutputDirectory ${CMAKE_BINARY_DIR}/nuget ${NUGET_WARP_EXTRA_ARGS}")

execute_process(
COMMAND ${NUGET_EXE} install -ForceEnglishOutput Microsoft.Direct3D.WARP -OutputDirectory ${CMAKE_BINARY_DIR}/nuget ${NUGET_WARP_EXTRA_ARGS_LIST}
COMMAND ${NUGET_EXE} install -ForceEnglishOutput Microsoft.Direct3D.WARP -OutputDirectory ${CMAKE_BINARY_DIR}/nuget ${NUGET_WARP_EXTRA_ARGS}
RESULT_VARIABLE result
OUTPUT_VARIABLE nuget_output
ERROR_VARIABLE nuget_output)
Expand Down
14 changes: 10 additions & 4 deletions utils/hct/hctbuild.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,17 @@ if "%1"=="-fresh" (
shift /1 & goto :parse_args
)
if "%1"=="-nuget-config" (
set NUGET_WARP_EXTRA_ARGS="-Config %~2"
set "NUGET_WARP_EXTRA_ARGS=-Config %~2 %NUGET_WARP_EXTRA_ARGS%"
shift /1
shift /1 & goto :parse_args
shift /1
goto :parse_args
)
if "%1"=="-warp-nuget-version" (
set "NUGET_WARP_EXTRA_ARGS=-Version %~2 %NUGET_WARP_EXTRA_ARGS%"
shift /1
shift /1
goto :parse_args
)


rem Begin SPIRV change
if "%1"=="-spirv" (
Expand Down Expand Up @@ -359,8 +365,8 @@ set CMAKE_OPTS=%CMAKE_OPTS% -DCLANG_BUILD_EXAMPLES:BOOL=OFF
set CMAKE_OPTS=%CMAKE_OPTS% -DCLANG_CL:BOOL=OFF
set CMAKE_OPTS=%CMAKE_OPTS% -DCMAKE_SYSTEM_VERSION=%DXC_CMAKE_SYSTEM_VERSION%
set CMAKE_OPTS=%CMAKE_OPTS% -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR%
set "CMAKE_OPTS=%CMAKE_OPTS% -DNUGET_WARP_EXTRA_ARGS="%NUGET_WARP_EXTRA_ARGS%""

set CMAKE_OPTS=%CMAKE_OPTS% -DNUGET_WARP_EXTRA_ARGS=%NUGET_WARP_EXTRA_ARGS%

if "%LIT_ARGS%" NEQ "" (
set CMAKE_OPTS=%CMAKE_OPTS% -DLLVM_LIT_ARGS="%LIT_ARGS%"
Expand Down