1 files changed, 22 insertions, 3 deletions

diff --git a/src/internal/internal.cmd b/src/internal/internal.cmd
index 8b46e77c..9380ce4e 100644
--- a/src/internal/internal.cmd
+++ b/src/internal/internal.cmd
@@ -2,10 +2,21 @@
 @pushd %~dp0
 
 @set _C=Debug
+@set _L=%~dp0..\..\build\logs
+
 :parse_args
 @if /i "%1"=="release" set _C=Release
+@if /i "%1"=="inc" set _INC=1
+@if /i "%1"=="clean" set _CLEAN=1
 @if not "%1"=="" shift & goto parse_args
 
+@set _B=%~dp0..\..\build\wix\%_C%
+
+:: Clean
+
+@if "%_INC%"=="" call :clean
+@if NOT "%_CLEAN%"=="" goto :end
+
 @echo Building internal %_C%
 
 :: internal
@@ -14,10 +25,18 @@ nuget restore || exit /b
 :: dotnet pack -c %_C% WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || exit /b
 :: dotnet pack -c %_C% WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b
 
-msbuild -t:Pack WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\internal_build.binlog || exit /b
+msbuild internal_t.proj -p:Configuration=%_C% -nologo -warnaserror -bl:%_L%\internal_build.binlog || exit /b
+
+@goto :end
 
-msbuild -t:Build WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj -p:Configuration=%_C%;Platform=x86 -nologo || exit /b
-msbuild -t:Build WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj -p:Configuration=%_C%;Platform=x64 -nologo || exit /b
+:clean
+@rd /s/q "..\..\build\internal" 2> nul
+@del "..\..\build\artifacts\WixBuildTools.TestSupport.*.nupkg" 2> nul
+@del "..\..\build\artifacts\WixBuildTools.TestSupport.Native.*.nupkg" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixbuildtools.testsupport" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixbuildtools.testsupport.native" 2> nul
+@exit /b
 
+:end
 @popd
 @endlocal