diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-10-12 22:01:55 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-10-14 20:13:50 -0700 |
| commit | 07b3d459ea0a45cbef29b98d283edafbab26462a (patch) | |
| tree | 1e834882038ba3862f8acb7b60e7a4bfaef793fd /src/internal/internal.cmd | |
| parent | 5567239a9411aac769a34f2c65b80a523a577ad7 (diff) | |
| download | wix-07b3d459ea0a45cbef29b98d283edafbab26462a.tar.gz wix-07b3d459ea0a45cbef29b98d283edafbab26462a.tar.bz2 wix-07b3d459ea0a45cbef29b98d283edafbab26462a.zip | |
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
Diffstat (limited to 'src/internal/internal.cmd')
| -rw-r--r-- | src/internal/internal.cmd | 2 |
1 files changed, 2 insertions, 0 deletions
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 | |||
| 33 | @rd /s/q "..\..\build\internal" 2> nul | 33 | @rd /s/q "..\..\build\internal" 2> nul |
| 34 | @del "..\..\build\artifacts\WixBuildTools.TestSupport.*.nupkg" 2> nul | 34 | @del "..\..\build\artifacts\WixBuildTools.TestSupport.*.nupkg" 2> nul |
| 35 | @del "..\..\build\artifacts\WixBuildTools.TestSupport.Native.*.nupkg" 2> nul | 35 | @del "..\..\build\artifacts\WixBuildTools.TestSupport.Native.*.nupkg" 2> nul |
| 36 | @del "..\..\build\artifacts\WixToolset.BaseBuildTasks.Sources.*.nupkg" 2> nul | ||
| 36 | @rd /s/q "%USERPROFILE%\.nuget\packages\wixbuildtools.testsupport" 2> nul | 37 | @rd /s/q "%USERPROFILE%\.nuget\packages\wixbuildtools.testsupport" 2> nul |
| 37 | @rd /s/q "%USERPROFILE%\.nuget\packages\wixbuildtools.testsupport.native" 2> nul | 38 | @rd /s/q "%USERPROFILE%\.nuget\packages\wixbuildtools.testsupport.native" 2> nul |
| 39 | @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.basebuildtasks.sources" 2> nul | ||
| 38 | @exit /b | 40 | @exit /b |
| 39 | 41 | ||
| 40 | :end | 42 | :end |