From 07b3d459ea0a45cbef29b98d283edafbab26462a Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 12 Oct 2022 22:01:55 -0700 Subject: Normalize ToolsetTask implementation to call wix.exe and heat.exe Share the ToolsetTask implementation that can find .NET Core and .NET Framework with multiple architectures. Fixes 6951 --- src/internal/internal.cmd | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/internal/internal.cmd') diff --git a/src/internal/internal.cmd b/src/internal/internal.cmd index 9380ce4e..32df26e9 100644 --- a/src/internal/internal.cmd +++ b/src/internal/internal.cmd @@ -33,8 +33,10 @@ msbuild internal_t.proj -p:Configuration=%_C% -nologo -warnaserror -bl:%_L%\inte @rd /s/q "..\..\build\internal" 2> nul @del "..\..\build\artifacts\WixBuildTools.TestSupport.*.nupkg" 2> nul @del "..\..\build\artifacts\WixBuildTools.TestSupport.Native.*.nupkg" 2> nul +@del "..\..\build\artifacts\WixToolset.BaseBuildTasks.Sources.*.nupkg" 2> nul @rd /s/q "%USERPROFILE%\.nuget\packages\wixbuildtools.testsupport" 2> nul @rd /s/q "%USERPROFILE%\.nuget\packages\wixbuildtools.testsupport.native" 2> nul +@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.basebuildtasks.sources" 2> nul @exit /b :end -- cgit v1.2.3-55-g6feb