aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ext/Util/be/utilbe.v3.ncrunchproject5
-rw-r--r--src/ext/Util/util.cmd25
-rw-r--r--src/ext/Util/wixext/WixToolset.Util.wixext.csproj11
-rw-r--r--src/testresultfilelist.txt1
4 files changed, 36 insertions, 6 deletions
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 @@
1<ProjectConfiguration>
2 <Settings>
3 <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
4 </Settings>
5</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 @@
2@pushd %~dp0 2@pushd %~dp0
3 3
4@set _C=Debug 4@set _C=Debug
5@set _L=%~dp0..\..\..\build\logs
6
5:parse_args 7:parse_args
6@if /i "%1"=="release" set _C=Release 8@if /i "%1"=="release" set _C=Release
9@if /i "%1"=="inc" set _INC=1
10@if /i "%1"=="clean" set _CLEAN=1
7@if not "%1"=="" shift & goto parse_args 11@if not "%1"=="" shift & goto parse_args
8 12
13@set _B=%~dp0..\..\..\build\Util.wixext\%_C%
14
15:: Clean
16
17@if "%_INC%"=="" call :clean
18@if NOT "%_CLEAN%"=="" goto :end
19
9@echo Building ext\Util %_C% using %_N% 20@echo Building ext\Util %_C% using %_N%
10 21
11:: Build 22:: Build
12msbuild -Restore -p:Configuration=%_C% || exit /b 23msbuild -Restore -p:Configuration=%_C% || exit /b
13 24
14:: Test 25:: Test
15dotnet test -c %_C% --no-build test\WixToolsetTest.Util || exit /b 26dotnet test ^
27 %_B%\net6.0\WixToolsetTest.Util.dll ^
28 --nologo -l "trx;LogFileName=%_L%\TestResults\util.wixext.trx" || exit /b
16 29
17:: Pack 30:: Pack
18msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Util.wixext.csproj || exit /b 31msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Util.wixext.csproj || exit /b
19 32
33@goto :end
34
35:clean
36@rd /s/q "..\..\build\Util.wixext" 2> nul
37@del "..\..\build\artifacts\WixToolset.Util.wixext.*.nupkg" 2> nul
38@del "%_L%\TestResults\util.wixext.trx" 2> nul
39@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.util.wixext" 2> nul
40@exit /b
41
42:end
20@popd 43@popd
21@endlocal 44@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 @@
11 </PropertyGroup> 11 </PropertyGroup>
12 12
13 <ItemGroup> 13 <ItemGroup>
14 <EmbeddedResource Include="$(OutputPath)..\util.wixlib" /> 14 <ProjectReference Include="..\wixlib\util.wixproj"
15 </ItemGroup> 15 OutputItemType="EmbeddedResource"
16 16 ReferenceOutputAssembly="false"
17 <ItemGroup Condition=" '$(NCrunch)'=='' "> 17 SkipGetTargetFrameworkProperties="true"
18 <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> 18 />
19 <EmbeddedResource Include="$(OutputPath)..\util.wixlib" Condition=" '$(NCrunch)'=='1' " />
19 </ItemGroup> 20 </ItemGroup>
20 21
21 <ItemGroup> 22 <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
8build/logs/TestResults/WixToolsetTest.BurnE2E.trx 8build/logs/TestResults/WixToolsetTest.BurnE2E.trx
9build/logs/TestResults/WixToolsetTest.Dnc.HostGenerator.trx 9build/logs/TestResults/WixToolsetTest.Dnc.HostGenerator.trx
10build/logs/TestResults/WixToolsetTest.ManagedHost.trx 10build/logs/TestResults/WixToolsetTest.ManagedHost.trx
11build/logs/TestResults/util.wixext.trx
11build/logs/TestResults/WixToolsetTest.MsiE2E.trx 12build/logs/TestResults/WixToolsetTest.MsiE2E.trx
12build/logs/TestResults/WixToolsetTest.WixE2ETests.trx \ No newline at end of file 13build/logs/TestResults/WixToolsetTest.WixE2ETests.trx \ No newline at end of file