From 20ea356b2c0b4ab4d29778b4958d5b363f735f1f Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 2 Nov 2020 19:43:20 -0600 Subject: More .NET 5 updates. Fix tests when running on machine with .NET 5. Update frameworks for .NET Core MBA (3.1 vs 5.0). --- src/test/examples/TestEngine/TestEngine.cpp | 14 +++++++++++--- src/test/examples/TestEngine/TestEngine.h | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'src/test/examples/TestEngine') 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: } HRESULT TestEngine::Log( + __in BOOTSTRAPPER_LOG_LEVEL level, __in LPCWSTR wzMessage ) { - LogStringLine(REPORT_STANDARD, "%ls", wzMessage); - return ConsoleWriteLine(CONSOLE_COLOR_NORMAL, "%ls", wzMessage); + switch (level) + { + case BOOTSTRAPPER_LOG_LEVEL_NONE: + case BOOTSTRAPPER_LOG_LEVEL_DEBUG: + return S_OK; + default: + LogStringLine(REPORT_STANDARD, "%ls", wzMessage); + return ConsoleWriteLine(CONSOLE_COLOR_NORMAL, "%ls", wzMessage); + } } HRESULT TestEngine::RunApplication() @@ -169,7 +177,7 @@ HRESULT TestEngine::BAEngineLog( __in BAENGINE_LOG_RESULTS* /*pResults*/ ) { - return Log(pArgs->wzMessage); + return Log(pArgs->level, pArgs->wzMessage); } HRESULT TestEngine::BAEngineQuit( diff --git a/src/test/examples/TestEngine/TestEngine.h b/src/test/examples/TestEngine/TestEngine.h index 14b69999..44e813bd 100644 --- a/src/test/examples/TestEngine/TestEngine.h +++ b/src/test/examples/TestEngine/TestEngine.h @@ -28,6 +28,7 @@ public: ); HRESULT Log( + __in BOOTSTRAPPER_LOG_LEVEL level, __in LPCWSTR wzMessage ); -- cgit v1.2.3-55-g6feb