3 files changed, 32 insertions, 13 deletions

diff --git a/src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs b/src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs
index 32680e5d..3271cc20 100644
--- a/src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs
+++ b/src/internal/WixBuildTools.TestSupport/MsbuildUtilities.cs
@@ -17,7 +17,7 @@ namespace WixToolsetTest.Sdk
 
     public static class MsbuildUtilities
     {
-        public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null, string verbosityLevel = "normal", bool suppressValidation = true)
+        public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", string verbosityLevel = "normal", bool suppressValidation = true)
         {
             var allArgs = new List<string>
             {
@@ -30,11 +30,6 @@ namespace WixToolsetTest.Sdk
                 $"-bl:{Path.ChangeExtension(projectPath, ".binlog")}"
             };
 
-            if (outOfProc.HasValue)
-            {
-                allArgs.Add($"-p:RunWixToolsOutOfProc={outOfProc.Value}");
-            }
-
             if (arguments != null)
             {
                 allArgs.AddRange(arguments);
@@ -96,11 +91,9 @@ namespace WixToolsetTest.Sdk
             }
         }
 
-        public static IEnumerable<string> GetToolCommandLines(MsbuildRunnerResult result, string toolName, string operation, BuildSystem buildSystem, bool? outOfProc = null)
+        public static IEnumerable<string> GetToolCommandLines(MsbuildRunnerResult result, string toolName, string operation, BuildSystem buildSystem)
         {
-            var expectedOutOfProc = buildSystem == BuildSystem.DotNetCoreSdk || outOfProc.HasValue && outOfProc.Value;
-            var expectedToolExe = !expectedOutOfProc ? $"({toolName}.exe)" :
-                                  buildSystem == BuildSystem.DotNetCoreSdk ? $"{toolName}.dll\"" : $"{toolName}.exe";
+            var expectedToolExe = buildSystem == BuildSystem.DotNetCoreSdk ? $"{toolName}.dll\"" : $"{toolName}.exe";
             var expectedToolCommand = $"{expectedToolExe} {operation}";
             return result.Output.Where(line => line.Contains(expectedToolCommand));
         }
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
diff --git a/src/internal/internal_t.proj b/src/internal/internal_t.proj
new file mode 100644
index 00000000..fda67786
--- /dev/null
+++ b/src/internal/internal_t.proj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.Build.Traversal">
+  <ItemGroup>
+    <ProjectReference Include="WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" Targets="Pack" />
+    <ProjectReference Include="WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj" Properties="Platform=x64" />
+  </ItemGroup>
+</Project>