From d76532b128e4e187fd9ac5e1d018638dcf8876ec Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 4 Oct 2022 05:29:47 -0700
Subject: Modernize Util.wixext build

---
 src/ext/Util/be/utilbe.v3.ncrunchproject          |  5 +++++
 src/ext/Util/util.cmd                             | 25 ++++++++++++++++++++++-
 src/ext/Util/wixext/WixToolset.Util.wixext.csproj | 11 +++++-----
 src/testresultfilelist.txt                        |  1 +
 4 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 src/ext/Util/be/utilbe.v3.ncrunchproject

diff --git a/src/ext/Util/be/utilbe.v3.ncrunchproject b/src/ext/Util/be/utilbe.v3.ncrunchproject
new file mode 100644
index 00000000..319cd523
--- /dev/null
+++ b/src/ext/Util/be/utilbe.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/src/ext/Util/util.cmd b/src/ext/Util/util.cmd
index 0ae8851d..aad9c65c 100644
--- a/src/ext/Util/util.cmd
+++ b/src/ext/Util/util.cmd
@@ -2,20 +2,43 @@
 @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\Util.wixext\%_C%
+
+:: Clean
+
+@if "%_INC%"=="" call :clean
+@if NOT "%_CLEAN%"=="" goto :end
+
 @echo Building ext\Util %_C% using %_N%
 
 :: Build
 msbuild -Restore -p:Configuration=%_C% || exit /b
 
 :: Test
-dotnet test -c %_C% --no-build test\WixToolsetTest.Util || exit /b
+dotnet test ^
+ %_B%\net6.0\WixToolsetTest.Util.dll ^
+ --nologo -l "trx;LogFileName=%_L%\TestResults\util.wixext.trx" || exit /b
 
 :: Pack
 msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Util.wixext.csproj || exit /b
 
+@goto :end
+
+:clean
+@rd /s/q "..\..\build\Util.wixext" 2> nul
+@del "..\..\build\artifacts\WixToolset.Util.wixext.*.nupkg" 2> nul
+@del "%_L%\TestResults\util.wixext.trx" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.util.wixext" 2> nul
+@exit /b
+
+:end
 @popd
 @endlocal
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
index 9a09ae82..82e1886b 100644
--- a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
@@ -11,11 +11,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="$(OutputPath)..\util.wixlib" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(NCrunch)'=='' ">
-    <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
+    <ProjectReference Include="..\wixlib\util.wixproj"
+                      OutputItemType="EmbeddedResource"
+                      ReferenceOutputAssembly="false"
+                      SkipGetTargetFrameworkProperties="true"
+                      />
+    <EmbeddedResource Include="$(OutputPath)..\util.wixlib" Condition=" '$(NCrunch)'=='1' " />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/testresultfilelist.txt b/src/testresultfilelist.txt
index d3981c6e..43e5df11 100644
--- a/src/testresultfilelist.txt
+++ b/src/testresultfilelist.txt
@@ -8,5 +8,6 @@ build/logs/TestResults/WixToolsetTest.Bal.trx
 build/logs/TestResults/WixToolsetTest.BurnE2E.trx
 build/logs/TestResults/WixToolsetTest.Dnc.HostGenerator.trx
 build/logs/TestResults/WixToolsetTest.ManagedHost.trx
+build/logs/TestResults/util.wixext.trx
 build/logs/TestResults/WixToolsetTest.MsiE2E.trx
 build/logs/TestResults/WixToolsetTest.WixE2ETests.trx
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb