2 files changed, 32 insertions, 6 deletions

diff --git a/src/api/api.cmd b/src/api/api.cmd
index 82c6ddf8..abdc975b 100644
--- a/src/api/api.cmd
+++ b/src/api/api.cmd
@@ -3,25 +3,51 @@
 
 @set _C=Debug
 @set _L=%~dp0..\..\build\logs
+
 :parse_args
 @if /i "%1"=="release" set _C=Release
+@if /i "%1"=="inc" set _INCREMENTAL=1
+@if /i "%1"=="clean" set _INCREMENTAL= & set _CLEAN=1
 @if not "%1"=="" shift & goto parse_args
 
 @set _B=%~dp0..\..\build\api\%_C%
 
+:: Clean
+@if NOT "%_INCREMENTAL%"=="" call :clean
+@if NOT "%_CLEAN%"=="" goto :end
+
 @echo Building api %_C%
 
-:: restore
-:: build
-:: pack
+:: Restore
+:: Build
+:: Pack
 
 msbuild api_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\api_build.binlog || exit /b
 
-:: test
+:: Test
 dotnet test burn\test\WixToolsetTest.Mba.Core -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Mba.Core.trx" || exit /b
 dotnet test %_B%\x86\BalUtilUnitTest.dll --nologo -l "trx;LogFileName=%_L%\TestResults\BalUtilUnitTest.trx" || exit /b
 dotnet test %_B%\x86\BextUtilUnitTest.dll --nologo -l "trx;LogFileName=%_L%\TestResults\BextUtilUnitTest.trx" || exit /b
 dotnet test wix\api_wix.sln -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\api_wix.trx" || exit /b
 
+@goto :end
+
+:clean
+@rd /s/q "..\..\build\api" 2> nul
+@del "..\..\build\artifacts\WixToolset.BalUtil.*.nupkg" 2> nul
+@del "..\..\build\artifacts\WixToolset.BextUtil.*.nupkg" 2> nul
+@del "..\..\build\artifacts\WixToolset.BootstrapperCore.Native.*.nupkg" 2> nul
+@del "..\..\build\artifacts\WixToolset.Data.*.nupkg" 2> nul
+@del "..\..\build\artifacts\WixToolset.Extensibility.*.nupkg" 2> nul
+@del "..\..\build\artifacts\WixToolset.Mba.Core.*.nupkg" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.balutil" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bextutil" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bootstrappercore.native" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.data" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.extensibility" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.mba.core" 2> nul
+@exit /b
+
+:end
 @popd
 @endlocal
diff --git a/src/tools/tools.cmd b/src/tools/tools.cmd
index 125bf298..a37703f6 100644
--- a/src/tools/tools.cmd
+++ b/src/tools/tools.cmd
@@ -17,7 +17,7 @@
 @echo Building tools %_C%
 
 :: Build
-msbuild -Restore tools.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\tools_build.binlog || exit /b
+msbuild -Restore tools.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\tools_build.binlog || exit /b
 
 :: Publish
 msbuild publish_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\tools_publish.binlog || exit /b
@@ -26,7 +26,7 @@ msbuild publish_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\to
 dotnet test -c %_C% --no-build --nologo test\WixToolsetTest.HeatTasks -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.HeatTasks.trx" || exit /b
 
 :: Pack
-msbuild -t:Pack WixToolset.Heat -p:Configuration=%_C% -p:NoBuild=true -nologo -m -warnaserror -bl:..\..\build\logs\tools_pack.binlog || exit /b
+msbuild -t:Pack WixToolset.Heat -p:Configuration=%_C% -p:NoBuild=true -nologo -m -warnaserror -bl:%_L%\tools_pack.binlog || exit /b
 
 @goto :end