Skip to content

Update dev build cycle time #1578

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
jonwis wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update dev build cycle time #1578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ test*.xml
test*_results.txt
test_failures.txt
build
_build
packages
Debug
Release
Expand Down
34 changes: 21 additions & 13 deletions build_test_all.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,33 +9,41 @@ if "%target_platform%"=="" set target_platform=x64
if "%target_configuration%"=="" set target_configuration=Release
if "%target_version%"=="" set target_version=999.999.999.999

call "%~dp0ensure_vsbuild.cmd" "%target_platform%"
if errorlevel 1 exit /b %errorlevel%

if not exist ".\.nuget" mkdir ".\.nuget"
if not exist ".\.nuget\nuget.exe" powershell -Command "$ProgressPreference = 'SilentlyContinue' ; Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile .\.nuget\nuget.exe"

call .nuget\nuget.exe restore cppwinrt.sln"
call .nuget\nuget.exe restore cppwinrt.sln
call .nuget\nuget.exe restore natvis\cppwinrtvisualizer.sln
call .nuget\nuget.exe restore test\nuget\NugetTest.sln

call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:fast_fwd
if errorlevel 1 exit /b %errorlevel%

call msbuild /p:Configuration=%target_configuration%,Platform=%target_platform%,Deployment=Component;CppWinRTBuildVersion=%target_version% natvis\cppwinrtvisualizer.sln
if errorlevel 1 exit /b %errorlevel%

call msbuild /p:Configuration=%target_configuration%,Platform=%target_platform%,Deployment=Standalone;CppWinRTBuildVersion=%target_version% natvis\cppwinrtvisualizer.sln
Comment on lines 25 to 28
if errorlevel 1 exit /b %errorlevel%

if "%target_platform%"=="arm64" goto :eof

call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:cppwinrt
set cppwinrt_targets=cppwinrt
set cppwinrt_targets=%cppwinrt_targets%;test\test
set cppwinrt_targets=%cppwinrt_targets%;test\test_nocoro
set cppwinrt_targets=%cppwinrt_targets%;test\test_cpp20
set cppwinrt_targets=%cppwinrt_targets%;test\test_cpp20_no_sourcelocation
set cppwinrt_targets=%cppwinrt_targets%;test\test_fast
set cppwinrt_targets=%cppwinrt_targets%;test\test_slow
set cppwinrt_targets=%cppwinrt_targets%;test\test_module_lock_custom
set cppwinrt_targets=%cppwinrt_targets%;test\test_module_lock_none
set cppwinrt_targets=%cppwinrt_targets%;test\old_tests\test_old
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln "/t:%cppwinrt_targets%"
if errorlevel 1 exit /b %errorlevel%

call msbuild /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% test\nuget\NugetTest.sln
Comment on lines +43 to 46

call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test_nocoro
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test_cpp20
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test_cpp20_no_sourcelocation
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test_fast
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test_slow
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test_module_lock_custom
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test_module_lock_none
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test_module_lock_none
call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\old_tests\test_old
if errorlevel 1 exit /b %errorlevel%

call run_tests.cmd %target_platform% %target_configuration%
5 changes: 5 additions & 0 deletions cppwinrt/cppwinrt.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,4 +311,9 @@
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Windows.WinMD.1.0.210629.2\build\native\Microsoft.Windows.WinMD.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.WinMD.1.0.210629.2\build\native\Microsoft.Windows.WinMD.props'))" />
</Target>
<ItemGroup>
Comment thread
jonwis marked this conversation as resolved.
<ProjectReference Include="..\fast_fwd\fast_fwd.vcxproj">
<Project>{A63B3AD1-AB7B-461E-9FFF-2447F5BCD459}</Project>
</ProjectReference>
</ItemGroup>
</Project>
70 changes: 70 additions & 0 deletions ensure_vsbuild.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
@echo off

set "target_platform=%~1"
if "%target_platform%"=="" set "target_platform=x64"

set "vsdevcmd_arch="
if /I "%target_platform%"=="x86" set "vsdevcmd_arch=x86"
Copy link
Copy Markdown
Member

@dunhor dunhor May 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If host architecture is x64, it's probably best to use x64_x86 to use the x64 compiler and get the advantage of a larger address space.

And if you want to go the extra mile, you should probably do the same for arm64 so that you can cross-compile arm64 on Windows (though this may not be super useful given that it's called from the 'build_test_all' script, so the testing part wouldn't work out so well.

Copy link
Copy Markdown
Member Author

@jonwis jonwis May 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I'll check it out. I agree that the 'run tests cross arch' probably isn't going to work out a certain matrix.

Copy link
Copy Markdown
Member

@dunhor dunhor May 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Though I do realize now this is calling VsDevCmd instead of vcvarsall, so maybe it's handled differently there.

if /I "%target_platform%"=="x64" set "vsdevcmd_arch=x64"
if /I "%target_platform%"=="arm64" set "vsdevcmd_arch=arm64"

if "%vsdevcmd_arch%"=="" (
echo Unsupported target platform "%target_platform%". Expected one of: x86, x64, arm64.
exit /b 1
)

set "vswhere_path=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
set "vs_install_path="

if exist "%vswhere_path%" for /f "usebackq delims=" %%i in (`"%vswhere_path%" -latest -products * -property installationPath`) do set "vs_install_path=%%i"
if "%vs_install_path%"=="" if exist "%vswhere_path%" for /f "usebackq delims=" %%i in (`"%vswhere_path%" -latest -prerelease -products * -property installationPath`) do set "vs_install_path=%%i"
if "%vs_install_path%"=="" if exist "%vswhere_path%" for /f "usebackq delims=" %%i in (`"%vswhere_path%" -all -products * -property installationPath`) do if "%vs_install_path%"=="" set "vs_install_path=%%i"

if not "%VSCMD_VER%"=="" goto :resolve_msbuild

if not exist "%vswhere_path%" (
echo Could not find vswhere at "%vswhere_path%".
exit /b 1
)

if "%vs_install_path%"=="" (
echo Could not locate a Visual Studio installation.
exit /b 1
)

set "vsdevcmd_path=%vs_install_path%\Common7\Tools\VsDevCmd.bat"
if not exist "%vsdevcmd_path%" (
echo Could not find VsDevCmd.bat at "%vsdevcmd_path%".
exit /b 1
)

call "%vsdevcmd_path%" -no_logo -startdir=none -host_arch=x64 -arch=%vsdevcmd_arch%
if errorlevel 1 (
echo VsDevCmd failed for target "%target_platform%".
exit /b 1
)

:resolve_msbuild
set "resolved_msbuild=msbuild"
where msbuild >nul 2>&1
if not errorlevel 1 goto :set_msbuild

if not "%vs_install_path%"=="" set "resolved_msbuild=%vs_install_path%\MSBuild\Current\Bin\MSBuild.exe"
if exist "%resolved_msbuild%" goto :set_msbuild

if not exist "%vswhere_path%" (
echo Could not find msbuild in PATH and could not find vswhere at "%vswhere_path%".
exit /b 1
)

set "resolved_msbuild="
for /f "usebackq delims=" %%i in (`"%vswhere_path%" -latest -products * -find MSBuild\Current\Bin\MSBuild.exe`) do set "resolved_msbuild=%%i"

if "%resolved_msbuild%"=="" (
echo Could not locate MSBuild.exe.
exit /b 1
)

:set_msbuild
set "MSBUILD_CMD=%resolved_msbuild%"
exit /b 0