From bb7b3dc1bc20629e04014b3f049cc30625a1a06c Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 16 May 2020 21:52:31 +1000 Subject: WIXFEAT:6164 Update to latest balutil. --- .../examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +- .../FullFramework2MBA/Example.FullFramework2MBA.csproj | 6 +++--- src/test/examples/FullFramework2MBA/packages.config | 2 +- .../FullFramework4MBA/Example.FullFramework4MBA.csproj | 2 +- src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj | 2 +- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 12 ++++++------ src/test/examples/TestEngine/TestEngine.cpp | 4 ++-- src/test/examples/TestEngine/packages.config | 6 +++--- src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/test/examples') diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index 326633ba..1224fa49 100644 --- a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj +++ b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj @@ -13,6 +13,6 @@ - + \ No newline at end of file diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj index c946fcde..d08565ff 100644 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -3,7 +3,7 @@ - + {CC4236FC-226E-4232-AB50-24CBEC4D314D} Example.FullFramework2MBA @@ -39,7 +39,7 @@ - ..\..\..\..\packages\WixToolset.Mba.Core.4.0.19\lib\net20\WixToolset.Mba.Core.dll + ..\..\..\..\packages\WixToolset.Mba.Core.4.0.22\lib\net20\WixToolset.Mba.Core.dll @@ -50,7 +50,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/test/examples/FullFramework2MBA/packages.config b/src/test/examples/FullFramework2MBA/packages.config index 4f9f88e6..1f2a91d9 100644 --- a/src/test/examples/FullFramework2MBA/packages.config +++ b/src/test/examples/FullFramework2MBA/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj index 9be3cc4a..51f7090f 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index 1d325b1b..dc013b68 100644 --- a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj +++ b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index b9425295..ef54389d 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,9 +1,9 @@ - - - + + + Debug @@ -68,8 +68,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + \ No newline at end of file diff --git a/src/test/examples/TestEngine/TestEngine.cpp b/src/test/examples/TestEngine/TestEngine.cpp index 7b7dafce..a6a21174 100644 --- a/src/test/examples/TestEngine/TestEngine.cpp +++ b/src/test/examples/TestEngine/TestEngine.cpp @@ -53,7 +53,7 @@ HRESULT TestEngine::LoadBA( m_pCreateResults->cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS); m_hBAModule = ::LoadLibraryExW(wzBAFilePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); - ExitOnNullWithLastError(m_hBAModule, hr, "Failed to load BA dll."); + ConsoleExitOnNullWithLastError(m_hBAModule, hr, CONSOLE_COLOR_RED, "Failed to load BA dll."); pfnCreate = (PFN_BOOTSTRAPPER_APPLICATION_CREATE)::GetProcAddress(m_hBAModule, "BootstrapperApplicationCreate"); ConsoleExitOnNull(pfnCreate, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to get address for BootstrapperApplicationCreate."); @@ -181,7 +181,7 @@ HRESULT TestEngine::BAEngineQuit( if (!::PostThreadMessageW(m_dwThreadId, WM_TESTENG_QUIT, static_cast(pArgs->dwExitCode), 0)) { - ExitWithLastError(hr, "Failed to post shutdown message."); + ConsoleExitWithLastError(hr, CONSOLE_COLOR_RED, "Failed to post shutdown message."); } LExit: diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config index 23b191d4..1b4c9487 100644 --- a/src/test/examples/TestEngine/packages.config +++ b/src/test/examples/TestEngine/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj index 3b559f9b..02d400ee 100644 --- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -11,6 +11,6 @@ - + \ No newline at end of file -- cgit v1.2.3-55-g6feb