Skip to content

Commit ee4fd34

Browse files
authored
[HCT] Build DXC with VS 2026 by default (#8187)
Visual Studio 2026 recently released. The hct utilities build DXC with the 2022 release by default. This PR updates the hctbuild batch script so that the 2026 visual studio solution generator is used instead by default. A new option was added to specify the 2022 release if desired. The build pipelines remain building with 2022 until the vm image that targets 2026 is released.
1 parent 8dd982b commit ee4fd34

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ stages:
3636
submodules: true
3737
- script: |
3838
call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
39-
call utils\hct\hctbuild.cmd -$(platform) -$(configuration) -show-cmake-log -spirvtest -warp-nuget-version 1.0.16.1
39+
call utils\hct\hctbuild.cmd -vs2022 -$(platform) -$(configuration) -show-cmake-log -spirvtest -warp-nuget-version 1.0.16.1
4040
displayName: 'Building'
4141
- script: |
4242
call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%

utils/hct/hctbuild.cmd

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if "%BUILD_ARCH%"=="" (
2222
set BUILD_ARCH=Win32
2323
)
2424

25-
set BUILD_GENERATOR=Visual Studio 17 2022
25+
set BUILD_GENERATOR=Visual Studio 18 2026
2626
set BUILD_VS_VER=2022
2727
set BUILD_CONFIG=Debug
2828
set DO_SETUP=1
@@ -136,6 +136,11 @@ if "%1"=="-vs2019" (
136136
shift /1 & goto :parse_args
137137
)
138138
if "%1"=="-vs2022" (
139+
set BUILD_GENERATOR=Visual Studio 17 2022
140+
set BUILD_VS_VER=2022
141+
shift /1 & goto :parse_args
142+
)
143+
if "%1"=="-vs2026" (
139144
shift /1 & goto :parse_args
140145
)
141146
if "%1"=="-tblgen" (
@@ -442,6 +447,7 @@ echo -no-parallel disables parallel build
442447
echo -no-dxilconv disables build of DXBC to DXIL converter and tools
443448
echo -vs2019 uses Visual Studio 2019 to build
444449
echo -vs2022 uses Visual Studio 2022 to build
450+
echo -vs2026 uses Visual Studio 2026 to build
445451
echo.
446452
echo -update-generated-sources Updates generated sources in the source tree
447453
echo.

0 commit comments

Comments
 (0)