diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-06-16 14:41:27 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-06-16 16:49:13 -0500 |
commit | 4d94ed9fd1d9cb69337134561c520a24a91b91b2 (patch) | |
tree | 494d91dce4eacffae5a0263a0d35892b80d10e73 | |
parent | 223606fcd02e6d15e065d1e108e17c8848d35f9f (diff) | |
download | wix-4d94ed9fd1d9cb69337134561c520a24a91b91b2.tar.gz wix-4d94ed9fd1d9cb69337134561c520a24a91b91b2.tar.bz2 wix-4d94ed9fd1d9cb69337134561c520a24a91b91b2.zip |
Use dotnet test on C++/CLI test projects to get trx logs.
-rw-r--r-- | src/api/api.cmd | 6 | ||||
-rw-r--r-- | src/api/burn/test/BalUtilUnitTest/BAFunctionsTests.cpp | 49 | ||||
-rw-r--r-- | src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj | 4 | ||||
-rw-r--r-- | src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj.filters | 12 | ||||
-rw-r--r-- | src/api/burn/test/BalUtilUnitTest/BootstrapperApplicationTests.cpp | 45 | ||||
-rw-r--r-- | src/api/burn/test/BalUtilUnitTest/TestBAFunctions.h | 10 | ||||
-rw-r--r-- | src/api/burn/test/BalUtilUnitTest/TestBootstrapperApplication.h | 9 | ||||
-rw-r--r-- | src/api/burn/test/BalUtilUnitTest/precomp.h | 14 | ||||
-rw-r--r-- | src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj | 2 | ||||
-rw-r--r-- | src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj.filters | 6 | ||||
-rw-r--r-- | src/api/burn/test/BextUtilUnitTest/BundleExtensionTests.cpp | 44 | ||||
-rw-r--r-- | src/api/burn/test/BextUtilUnitTest/TestBundleExtension.h | 9 | ||||
-rw-r--r-- | src/api/burn/test/BextUtilUnitTest/precomp.h | 8 | ||||
-rw-r--r-- | src/burn/burn.cmd | 6 | ||||
-rw-r--r-- | src/libs/libs.cmd | 6 | ||||
-rw-r--r-- | src/testresultfilelist.txt | 12 |
16 files changed, 222 insertions, 20 deletions
diff --git a/src/api/api.cmd b/src/api/api.cmd index ffc403d5..82c6ddf8 100644 --- a/src/api/api.cmd +++ b/src/api/api.cmd | |||
@@ -7,6 +7,8 @@ | |||
7 | @if /i "%1"=="release" set _C=Release | 7 | @if /i "%1"=="release" set _C=Release |
8 | @if not "%1"=="" shift & goto parse_args | 8 | @if not "%1"=="" shift & goto parse_args |
9 | 9 | ||
10 | @set _B=%~dp0..\..\build\api\%_C% | ||
11 | |||
10 | @echo Building api %_C% | 12 | @echo Building api %_C% |
11 | 13 | ||
12 | :: restore | 14 | :: restore |
@@ -17,8 +19,8 @@ msbuild api_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\api_bu | |||
17 | 19 | ||
18 | :: test | 20 | :: test |
19 | dotnet test burn\test\WixToolsetTest.Mba.Core -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Mba.Core.trx" || exit /b | 21 | dotnet test burn\test\WixToolsetTest.Mba.Core -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Mba.Core.trx" || exit /b |
20 | msbuild burn\test\BalUtilUnitTest -t:Test -p:Configuration=%_C% -nologo -p:CppCliTestResultsFile="%_L%\TestResults\BalUtilUnitTest.xunit2.xml" || exit /b | 22 | dotnet test %_B%\x86\BalUtilUnitTest.dll --nologo -l "trx;LogFileName=%_L%\TestResults\BalUtilUnitTest.trx" || exit /b |
21 | msbuild burn\test\BextUtilUnitTest -t:Test -p:Configuration=%_C% -nologo -p:CppCliTestResultsFile="%_L%\TestResults\BextUtilUnitTest.xunit2.xml" || exit /b | 23 | dotnet test %_B%\x86\BextUtilUnitTest.dll --nologo -l "trx;LogFileName=%_L%\TestResults\BextUtilUnitTest.trx" || exit /b |
22 | dotnet test wix\api_wix.sln -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\api_wix.trx" || exit /b | 24 | dotnet test wix\api_wix.sln -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\api_wix.trx" || exit /b |
23 | 25 | ||
24 | @popd | 26 | @popd |
diff --git a/src/api/burn/test/BalUtilUnitTest/BAFunctionsTests.cpp b/src/api/burn/test/BalUtilUnitTest/BAFunctionsTests.cpp new file mode 100644 index 00000000..9920564e --- /dev/null +++ b/src/api/burn/test/BalUtilUnitTest/BAFunctionsTests.cpp | |||
@@ -0,0 +1,49 @@ | |||
1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | ||
2 | |||
3 | #include "precomp.h" | ||
4 | |||
5 | using namespace System; | ||
6 | using namespace Xunit; | ||
7 | using namespace WixBuildTools::TestSupport; | ||
8 | using namespace WixBuildTools::TestSupport::XunitExtensions; | ||
9 | |||
10 | namespace BalUtilTests | ||
11 | { | ||
12 | public ref class BAFunctions | ||
13 | { | ||
14 | public: | ||
15 | [Fact] | ||
16 | void CanCreateTestBAFunctions() | ||
17 | { | ||
18 | HRESULT hr = S_OK; | ||
19 | BOOTSTRAPPER_CREATE_ARGS bootstrapperArgs = { }; | ||
20 | BOOTSTRAPPER_COMMAND bootstrapperCommand = { }; | ||
21 | BA_FUNCTIONS_CREATE_ARGS args = { }; | ||
22 | BA_FUNCTIONS_CREATE_RESULTS results = { }; | ||
23 | IBootstrapperEngine* pEngine = NULL; | ||
24 | IBAFunctions* pBAFunctions = NULL; | ||
25 | |||
26 | bootstrapperArgs.cbSize = sizeof(bootstrapperArgs); | ||
27 | bootstrapperArgs.pCommand = &bootstrapperCommand; | ||
28 | |||
29 | args.cbSize = sizeof(args); | ||
30 | args.pBootstrapperCreateArgs = &bootstrapperArgs; | ||
31 | |||
32 | results.cbSize = sizeof(results); | ||
33 | |||
34 | try | ||
35 | { | ||
36 | hr = BalInitializeFromCreateArgs(&bootstrapperArgs, &pEngine); | ||
37 | NativeAssert::Succeeded(hr, "Failed to create engine."); | ||
38 | |||
39 | hr = CreateBAFunctions(NULL, pEngine, &args, &results, &pBAFunctions); | ||
40 | NativeAssert::Succeeded(hr, "Failed to create BAFunctions."); | ||
41 | } | ||
42 | finally | ||
43 | { | ||
44 | ReleaseObject(pEngine); | ||
45 | ReleaseObject(pBAFunctions); | ||
46 | } | ||
47 | } | ||
48 | }; | ||
49 | } | ||
diff --git a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj index 113edeaa..d6c03a43 100644 --- a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj +++ b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj | |||
@@ -37,6 +37,8 @@ | |||
37 | </PropertyGroup> | 37 | </PropertyGroup> |
38 | 38 | ||
39 | <ItemGroup> | 39 | <ItemGroup> |
40 | <ClCompile Include="BAFunctionsTests.cpp" /> | ||
41 | <ClCompile Include="BootstrapperApplicationTests.cpp" /> | ||
40 | <ClCompile Include="precomp.cpp"> | 42 | <ClCompile Include="precomp.cpp"> |
41 | <PrecompiledHeader>Create</PrecompiledHeader> | 43 | <PrecompiledHeader>Create</PrecompiledHeader> |
42 | <!-- Warnings from referencing netstandard dlls --> | 44 | <!-- Warnings from referencing netstandard dlls --> |
@@ -48,6 +50,8 @@ | |||
48 | 50 | ||
49 | <ItemGroup> | 51 | <ItemGroup> |
50 | <ClInclude Include="precomp.h" /> | 52 | <ClInclude Include="precomp.h" /> |
53 | <ClInclude Include="TestBAFunctions.h" /> | ||
54 | <ClInclude Include="TestBootstrapperApplication.h" /> | ||
51 | </ItemGroup> | 55 | </ItemGroup> |
52 | 56 | ||
53 | <ItemGroup> | 57 | <ItemGroup> |
diff --git a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj.filters b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj.filters index 85f31076..0b3b60be 100644 --- a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj.filters +++ b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj.filters | |||
@@ -15,6 +15,12 @@ | |||
15 | </Filter> | 15 | </Filter> |
16 | </ItemGroup> | 16 | </ItemGroup> |
17 | <ItemGroup> | 17 | <ItemGroup> |
18 | <ClCompile Include="BAFunctionsTests.cpp"> | ||
19 | <Filter>Source Files</Filter> | ||
20 | </ClCompile> | ||
21 | <ClCompile Include="BootstrapperApplicationTests.cpp"> | ||
22 | <Filter>Source Files</Filter> | ||
23 | </ClCompile> | ||
18 | <ClCompile Include="precomp.cpp"> | 24 | <ClCompile Include="precomp.cpp"> |
19 | <Filter>Source Files</Filter> | 25 | <Filter>Source Files</Filter> |
20 | </ClCompile> | 26 | </ClCompile> |
@@ -29,5 +35,11 @@ | |||
29 | <ClInclude Include="precomp.h"> | 35 | <ClInclude Include="precomp.h"> |
30 | <Filter>Header Files</Filter> | 36 | <Filter>Header Files</Filter> |
31 | </ClInclude> | 37 | </ClInclude> |
38 | <ClInclude Include="TestBAFunctions.h"> | ||
39 | <Filter>Header Files</Filter> | ||
40 | </ClInclude> | ||
41 | <ClInclude Include="TestBootstrapperApplication.h"> | ||
42 | <Filter>Header Files</Filter> | ||
43 | </ClInclude> | ||
32 | </ItemGroup> | 44 | </ItemGroup> |
33 | </Project> \ No newline at end of file | 45 | </Project> \ No newline at end of file |
diff --git a/src/api/burn/test/BalUtilUnitTest/BootstrapperApplicationTests.cpp b/src/api/burn/test/BalUtilUnitTest/BootstrapperApplicationTests.cpp new file mode 100644 index 00000000..396682ee --- /dev/null +++ b/src/api/burn/test/BalUtilUnitTest/BootstrapperApplicationTests.cpp | |||
@@ -0,0 +1,45 @@ | |||
1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | ||
2 | |||
3 | #include "precomp.h" | ||
4 | |||
5 | using namespace System; | ||
6 | using namespace Xunit; | ||
7 | using namespace WixBuildTools::TestSupport; | ||
8 | using namespace WixBuildTools::TestSupport::XunitExtensions; | ||
9 | |||
10 | namespace BalUtilTests | ||
11 | { | ||
12 | public ref class BootstrapperApplication | ||
13 | { | ||
14 | public: | ||
15 | [Fact] | ||
16 | void CanCreateTestBootstrapperApplication() | ||
17 | { | ||
18 | HRESULT hr = S_OK; | ||
19 | BOOTSTRAPPER_CREATE_ARGS args = { }; | ||
20 | BOOTSTRAPPER_COMMAND command = { }; | ||
21 | BOOTSTRAPPER_CREATE_RESULTS results = { }; | ||
22 | IBootstrapperEngine* pEngine = NULL; | ||
23 | IBootstrapperApplication* pApplication = NULL; | ||
24 | |||
25 | args.cbSize = sizeof(args); | ||
26 | args.pCommand = &command; | ||
27 | |||
28 | results.cbSize = sizeof(results); | ||
29 | |||
30 | try | ||
31 | { | ||
32 | hr = BalInitializeFromCreateArgs(&args, &pEngine); | ||
33 | NativeAssert::Succeeded(hr, "Failed to create engine."); | ||
34 | |||
35 | hr = CreateBootstrapperApplication(pEngine, &args, &results, &pApplication); | ||
36 | NativeAssert::Succeeded(hr, "Failed to create BootstrapperApplication."); | ||
37 | } | ||
38 | finally | ||
39 | { | ||
40 | ReleaseObject(pEngine); | ||
41 | ReleaseObject(pApplication); | ||
42 | } | ||
43 | } | ||
44 | }; | ||
45 | } | ||
diff --git a/src/api/burn/test/BalUtilUnitTest/TestBAFunctions.h b/src/api/burn/test/BalUtilUnitTest/TestBAFunctions.h new file mode 100644 index 00000000..41f36df8 --- /dev/null +++ b/src/api/burn/test/BalUtilUnitTest/TestBAFunctions.h | |||
@@ -0,0 +1,10 @@ | |||
1 | #pragma once | ||
2 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | ||
3 | |||
4 | HRESULT CreateBAFunctions( | ||
5 | __in HMODULE hModule, | ||
6 | __in IBootstrapperEngine* pEngine, | ||
7 | __in const BA_FUNCTIONS_CREATE_ARGS* pArgs, | ||
8 | __in BA_FUNCTIONS_CREATE_RESULTS* pResults, | ||
9 | __out IBAFunctions** ppApplication | ||
10 | ); | ||
diff --git a/src/api/burn/test/BalUtilUnitTest/TestBootstrapperApplication.h b/src/api/burn/test/BalUtilUnitTest/TestBootstrapperApplication.h new file mode 100644 index 00000000..c173e9ee --- /dev/null +++ b/src/api/burn/test/BalUtilUnitTest/TestBootstrapperApplication.h | |||
@@ -0,0 +1,9 @@ | |||
1 | #pragma once | ||
2 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | ||
3 | |||
4 | HRESULT CreateBootstrapperApplication( | ||
5 | __in IBootstrapperEngine* pEngine, | ||
6 | __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, | ||
7 | __inout BOOTSTRAPPER_CREATE_RESULTS* pResults, | ||
8 | __out IBootstrapperApplication** ppApplication | ||
9 | ); | ||
diff --git a/src/api/burn/test/BalUtilUnitTest/precomp.h b/src/api/burn/test/BalUtilUnitTest/precomp.h index ce893906..218cab68 100644 --- a/src/api/burn/test/BalUtilUnitTest/precomp.h +++ b/src/api/burn/test/BalUtilUnitTest/precomp.h | |||
@@ -18,11 +18,15 @@ | |||
18 | #include <BootstrapperEngine.h> | 18 | #include <BootstrapperEngine.h> |
19 | #include <BootstrapperApplication.h> | 19 | #include <BootstrapperApplication.h> |
20 | 20 | ||
21 | #include "IBootstrapperEngine.h" | 21 | #include <BAFunctions.h> |
22 | #include "IBootstrapperApplication.h" | 22 | #include <IBootstrapperEngine.h> |
23 | #include "balutil.h" | 23 | #include <IBootstrapperApplication.h> |
24 | #include "balretry.h" | 24 | #include <IBAFunctions.h> |
25 | #include "BAFunctions.h" | 25 | #include <balutil.h> |
26 | #include <balretry.h> | ||
27 | |||
28 | #include "TestBAFunctions.h" | ||
29 | #include "TestBootstrapperApplication.h" | ||
26 | 30 | ||
27 | #pragma managed | 31 | #pragma managed |
28 | #include <vcclr.h> | 32 | #include <vcclr.h> |
diff --git a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj index b24d1fad..c27fb442 100644 --- a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj +++ b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj | |||
@@ -36,6 +36,7 @@ | |||
36 | </PropertyGroup> | 36 | </PropertyGroup> |
37 | 37 | ||
38 | <ItemGroup> | 38 | <ItemGroup> |
39 | <ClCompile Include="BundleExtensionTests.cpp" /> | ||
39 | <ClCompile Include="precomp.cpp"> | 40 | <ClCompile Include="precomp.cpp"> |
40 | <PrecompiledHeader>Create</PrecompiledHeader> | 41 | <PrecompiledHeader>Create</PrecompiledHeader> |
41 | <!-- Warnings from referencing netstandard dlls --> | 42 | <!-- Warnings from referencing netstandard dlls --> |
@@ -46,6 +47,7 @@ | |||
46 | 47 | ||
47 | <ItemGroup> | 48 | <ItemGroup> |
48 | <ClInclude Include="precomp.h" /> | 49 | <ClInclude Include="precomp.h" /> |
50 | <ClInclude Include="TestBundleExtension.h" /> | ||
49 | </ItemGroup> | 51 | </ItemGroup> |
50 | 52 | ||
51 | <ItemGroup> | 53 | <ItemGroup> |
diff --git a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj.filters b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj.filters index f1711f81..73f2194d 100644 --- a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj.filters +++ b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj.filters | |||
@@ -15,6 +15,9 @@ | |||
15 | </Filter> | 15 | </Filter> |
16 | </ItemGroup> | 16 | </ItemGroup> |
17 | <ItemGroup> | 17 | <ItemGroup> |
18 | <ClCompile Include="BundleExtensionTests.cpp"> | ||
19 | <Filter>Source Files</Filter> | ||
20 | </ClCompile> | ||
18 | <ClCompile Include="precomp.cpp"> | 21 | <ClCompile Include="precomp.cpp"> |
19 | <Filter>Source Files</Filter> | 22 | <Filter>Source Files</Filter> |
20 | </ClCompile> | 23 | </ClCompile> |
@@ -26,5 +29,8 @@ | |||
26 | <ClInclude Include="precomp.h"> | 29 | <ClInclude Include="precomp.h"> |
27 | <Filter>Header Files</Filter> | 30 | <Filter>Header Files</Filter> |
28 | </ClInclude> | 31 | </ClInclude> |
32 | <ClInclude Include="TestBundleExtension.h"> | ||
33 | <Filter>Header Files</Filter> | ||
34 | </ClInclude> | ||
29 | </ItemGroup> | 35 | </ItemGroup> |
30 | </Project> \ No newline at end of file | 36 | </Project> \ No newline at end of file |
diff --git a/src/api/burn/test/BextUtilUnitTest/BundleExtensionTests.cpp b/src/api/burn/test/BextUtilUnitTest/BundleExtensionTests.cpp new file mode 100644 index 00000000..fde9d2b6 --- /dev/null +++ b/src/api/burn/test/BextUtilUnitTest/BundleExtensionTests.cpp | |||
@@ -0,0 +1,44 @@ | |||
1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | ||
2 | |||
3 | #include "precomp.h" | ||
4 | |||
5 | using namespace System; | ||
6 | using namespace Xunit; | ||
7 | using namespace WixBuildTools::TestSupport; | ||
8 | using namespace WixBuildTools::TestSupport::XunitExtensions; | ||
9 | |||
10 | namespace BextUtilTests | ||
11 | { | ||
12 | public ref class BundleExtension | ||
13 | { | ||
14 | public: | ||
15 | [Fact] | ||
16 | void CanCreateTestBundleExtension() | ||
17 | { | ||
18 | HRESULT hr = S_OK; | ||
19 | BUNDLE_EXTENSION_CREATE_ARGS args = { }; | ||
20 | BUNDLE_EXTENSION_CREATE_RESULTS results = { }; | ||
21 | IBundleExtensionEngine* pEngine = NULL; | ||
22 | IBundleExtension* pBundleExtension = NULL; | ||
23 | |||
24 | args.cbSize = sizeof(args); | ||
25 | args.wzBundleExtensionDataPath = L"test.xml"; | ||
26 | |||
27 | results.cbSize = sizeof(results); | ||
28 | |||
29 | try | ||
30 | { | ||
31 | hr = BextInitializeFromCreateArgs(&args, &pEngine); | ||
32 | NativeAssert::Succeeded(hr, "Failed to create engine."); | ||
33 | |||
34 | hr = TestBundleExtensionCreate(pEngine, &args, &results, &pBundleExtension); | ||
35 | NativeAssert::Succeeded(hr, "Failed to create BootstrapperApplication."); | ||
36 | } | ||
37 | finally | ||
38 | { | ||
39 | ReleaseObject(pEngine); | ||
40 | ReleaseObject(pBundleExtension); | ||
41 | } | ||
42 | } | ||
43 | }; | ||
44 | } | ||
diff --git a/src/api/burn/test/BextUtilUnitTest/TestBundleExtension.h b/src/api/burn/test/BextUtilUnitTest/TestBundleExtension.h new file mode 100644 index 00000000..5cfe8b39 --- /dev/null +++ b/src/api/burn/test/BextUtilUnitTest/TestBundleExtension.h | |||
@@ -0,0 +1,9 @@ | |||
1 | #pragma once | ||
2 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | ||
3 | |||
4 | HRESULT TestBundleExtensionCreate( | ||
5 | __in IBundleExtensionEngine* pEngine, | ||
6 | __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs, | ||
7 | __inout BUNDLE_EXTENSION_CREATE_RESULTS* pResults, | ||
8 | __out IBundleExtension** ppBundleExtension | ||
9 | ); | ||
diff --git a/src/api/burn/test/BextUtilUnitTest/precomp.h b/src/api/burn/test/BextUtilUnitTest/precomp.h index a6586f70..cf5256b8 100644 --- a/src/api/burn/test/BextUtilUnitTest/precomp.h +++ b/src/api/burn/test/BextUtilUnitTest/precomp.h | |||
@@ -11,9 +11,11 @@ | |||
11 | #include <BundleExtensionEngine.h> | 11 | #include <BundleExtensionEngine.h> |
12 | #include <BundleExtension.h> | 12 | #include <BundleExtension.h> |
13 | 13 | ||
14 | #include "IBundleExtensionEngine.h" | 14 | #include <IBundleExtensionEngine.h> |
15 | #include "IBundleExtension.h" | 15 | #include <IBundleExtension.h> |
16 | #include "bextutil.h" | 16 | #include <bextutil.h> |
17 | |||
18 | #include "TestBundleExtension.h" | ||
17 | 19 | ||
18 | #pragma managed | 20 | #pragma managed |
19 | #include <vcclr.h> | 21 | #include <vcclr.h> |
diff --git a/src/burn/burn.cmd b/src/burn/burn.cmd index 60640b08..127f9253 100644 --- a/src/burn/burn.cmd +++ b/src/burn/burn.cmd | |||
@@ -7,6 +7,8 @@ | |||
7 | @if /i "%1"=="release" set _C=Release | 7 | @if /i "%1"=="release" set _C=Release |
8 | @if not "%1"=="" shift & goto parse_args | 8 | @if not "%1"=="" shift & goto parse_args |
9 | 9 | ||
10 | @set _B=%~dp0..\..\build\burn\%_C% | ||
11 | |||
10 | @echo Building burn %_C% | 12 | @echo Building burn %_C% |
11 | 13 | ||
12 | :: burn | 14 | :: burn |
@@ -15,8 +17,8 @@ nuget restore || exit /b | |||
15 | 17 | ||
16 | msbuild burn_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\burn_build.binlog || exit /b | 18 | msbuild burn_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\burn_build.binlog || exit /b |
17 | 19 | ||
18 | msbuild test\BurnUnitTest -t:Test -p:Configuration=%_C% -p:Platform=Win32 -nologo -p:CppCliTestResultsFile="%_L%\TestResults\BurnUnitTest32.xunit2.xml" || exit /b | 20 | dotnet test %_B%\x86\BurnUnitTest.dll --nologo -l "trx;LogFileName=%_L%\TestResults\BurnUnitTest32.trx" || exit /b |
19 | msbuild test\BurnUnitTest -t:Test -p:Configuration=%_C% -p:Platform=x64 -nologo -p:CppCliTestResultsFile="%_L%\TestResults\BurnUnitTest64.xunit2.xml" || exit /b | 21 | dotnet test %_B%\x64\BurnUnitTest.dll --nologo -l "trx;LogFileName=%_L%\TestResults\BurnUnitTest64.trx" || exit /b |
20 | 22 | ||
21 | @popd | 23 | @popd |
22 | @endlocal | 24 | @endlocal |
diff --git a/src/libs/libs.cmd b/src/libs/libs.cmd index f44d88e4..e3107fbc 100644 --- a/src/libs/libs.cmd +++ b/src/libs/libs.cmd | |||
@@ -7,12 +7,14 @@ | |||
7 | @if /i "%1"=="release" set _C=Release | 7 | @if /i "%1"=="release" set _C=Release |
8 | @if not "%1"=="" shift & goto parse_args | 8 | @if not "%1"=="" shift & goto parse_args |
9 | 9 | ||
10 | @set _B=%~dp0..\..\build\libs\%_C% | ||
11 | |||
10 | @echo Building libs %_C% | 12 | @echo Building libs %_C% |
11 | 13 | ||
12 | msbuild -Restore libs_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\libs_build.binlog || exit /b | 14 | msbuild -Restore libs_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\libs_build.binlog || exit /b |
13 | 15 | ||
14 | msbuild dutil\test\DutilUnitTest -t:Test -p:Configuration=%_C% -p:Platform=Win32 -nologo -p:CppCliTestResultsFile="%_L%\TestResults\DutilUnitTest32.xunit2.xml" || exit /b | 16 | dotnet test %_B%\x86\DUtilUnitTest.dll --nologo -l "trx;LogFileName=%_L%\TestResults\DutilUnitTest32.trx" || exit /b |
15 | msbuild dutil\test\DutilUnitTest -t:Test -p:Configuration=%_C% -p:Platform=x64 -nologo -p:CppCliTestResultsFile="%_L%\TestResults\DutilUnitTest64.xunit2.xml" || exit /b | 17 | dotnet test %_B%\x64\DUtilUnitTest.dll --nologo -l "trx;LogFileName=%_L%\TestResults\DutilUnitTest64.trx" || exit /b |
16 | 18 | ||
17 | @popd | 19 | @popd |
18 | @endlocal | 20 | @endlocal |
diff --git a/src/testresultfilelist.txt b/src/testresultfilelist.txt index ca6e5a81..fa3a0734 100644 --- a/src/testresultfilelist.txt +++ b/src/testresultfilelist.txt | |||
@@ -1,10 +1,10 @@ | |||
1 | build/logs/TestResults/api_wix.trx | 1 | build/logs/TestResults/api_wix.trx |
2 | build/logs/TestResults/BalUtilUnitTest.xunit2.xml | 2 | build/logs/TestResults/BalUtilUnitTest.trx |
3 | build/logs/TestResults/BextUtilUnitTest.xunit2.xml | 3 | build/logs/TestResults/BextUtilUnitTest.trx |
4 | build/logs/TestResults/BurnUnitTest32.xunit2.xml | 4 | build/logs/TestResults/BurnUnitTest32.trx |
5 | build/logs/TestResults/BurnUnitTest64.xunit2.xml | 5 | build/logs/TestResults/BurnUnitTest64.trx |
6 | build/logs/TestResults/DutilUnitTest32.xunit2.xml | 6 | build/logs/TestResults/DutilUnitTest32.trx |
7 | build/logs/TestResults/DutilUnitTest64.xunit2.xml | 7 | build/logs/TestResults/DutilUnitTest64.trx |
8 | build/logs/TestResults/WixToolsetTest.Bal.trx | 8 | build/logs/TestResults/WixToolsetTest.Bal.trx |
9 | build/logs/TestResults/WixToolsetTest.BuildTasks.trx | 9 | build/logs/TestResults/WixToolsetTest.BuildTasks.trx |
10 | build/logs/TestResults/WixToolsetTest.BurnE2E.trx | 10 | build/logs/TestResults/WixToolsetTest.BurnE2E.trx |