diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-11-02 19:43:20 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-11-02 19:49:33 -0600 |
commit | 20ea356b2c0b4ab4d29778b4958d5b363f735f1f (patch) | |
tree | 64be40843e541eebe37ea0ffb5d7cb996f3ae699 /src/test/examples/TestEngine/TestEngine.cpp | |
parent | 0031d5e8f859b342ac9860b7055bb738b6303ec0 (diff) | |
download | wix-20ea356b2c0b4ab4d29778b4958d5b363f735f1f.tar.gz wix-20ea356b2c0b4ab4d29778b4958d5b363f735f1f.tar.bz2 wix-20ea356b2c0b4ab4d29778b4958d5b363f735f1f.zip |
More .NET 5 updates.
Fix tests when running on machine with .NET 5.
Update frameworks for .NET Core MBA (3.1 vs 5.0).
Diffstat (limited to 'src/test/examples/TestEngine/TestEngine.cpp')
-rw-r--r-- | src/test/examples/TestEngine/TestEngine.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/test/examples/TestEngine/TestEngine.cpp b/src/test/examples/TestEngine/TestEngine.cpp index a6a21174..4c7ec1c3 100644 --- a/src/test/examples/TestEngine/TestEngine.cpp +++ b/src/test/examples/TestEngine/TestEngine.cpp | |||
@@ -69,11 +69,19 @@ LExit: | |||
69 | } | 69 | } |
70 | 70 | ||
71 | HRESULT TestEngine::Log( | 71 | HRESULT TestEngine::Log( |
72 | __in BOOTSTRAPPER_LOG_LEVEL level, | ||
72 | __in LPCWSTR wzMessage | 73 | __in LPCWSTR wzMessage |
73 | ) | 74 | ) |
74 | { | 75 | { |
75 | LogStringLine(REPORT_STANDARD, "%ls", wzMessage); | 76 | switch (level) |
76 | return ConsoleWriteLine(CONSOLE_COLOR_NORMAL, "%ls", wzMessage); | 77 | { |
78 | case BOOTSTRAPPER_LOG_LEVEL_NONE: | ||
79 | case BOOTSTRAPPER_LOG_LEVEL_DEBUG: | ||
80 | return S_OK; | ||
81 | default: | ||
82 | LogStringLine(REPORT_STANDARD, "%ls", wzMessage); | ||
83 | return ConsoleWriteLine(CONSOLE_COLOR_NORMAL, "%ls", wzMessage); | ||
84 | } | ||
77 | } | 85 | } |
78 | 86 | ||
79 | HRESULT TestEngine::RunApplication() | 87 | HRESULT TestEngine::RunApplication() |
@@ -169,7 +177,7 @@ HRESULT TestEngine::BAEngineLog( | |||
169 | __in BAENGINE_LOG_RESULTS* /*pResults*/ | 177 | __in BAENGINE_LOG_RESULTS* /*pResults*/ |
170 | ) | 178 | ) |
171 | { | 179 | { |
172 | return Log(pArgs->wzMessage); | 180 | return Log(pArgs->level, pArgs->wzMessage); |
173 | } | 181 | } |
174 | 182 | ||
175 | HRESULT TestEngine::BAEngineQuit( | 183 | HRESULT TestEngine::BAEngineQuit( |